diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1fb64726ab0f58e075ef643b54d545bb52c6d361..106e8857b38539e662eb4f41a357a4aef7105d9f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,6 +27,7 @@ variables: AZURE_SERVICE: indexer AZURE_BUILD_SUBDIR: provider/indexer-azure AZURE_TEST_SUBDIR: testing/indexer-test-azure + SERVICE_JAVA_VERSION: "17" include: - project: "osdu/platform/ci-cd-pipelines" diff --git a/NOTICE b/NOTICE index c1a21f80597269e32ab8a6c0a5ef08365b1bc1ef..99056763336c765896b36e349a1393fb1032a8c2 100644 --- a/NOTICE +++ b/NOTICE @@ -634,7 +634,7 @@ The following software have components provided under the terms of this license: - jakarta.inject (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/jakarta.inject) - java-cloudant (from https://cloudant.com) - javatuples (from http://www.javatuples.org) -- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250) +- javax.annotation API (from http://jcp.org/en/jsr/detail?id=250) - javax.inject (from http://code.google.com/p/atinject/, https://repo1.maven.org/maven2/org/glassfish/hk2/external/javax.inject) - jersey-core-common (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-common) - jersey-core-server (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-server) @@ -857,7 +857,7 @@ The following software have components provided under the terms of this license: - Java Architecture for XML Binding (from http://jaxb.java.net/, https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api) - JavaBeans Activation Framework (from <http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp>, http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp, https://repo1.maven.org/maven2/com/sun/activation/javax.activation) - Servlet Specification 2.5 API (from http://jetty.mortbay.org, https://repo1.maven.org/maven2/org/mortbay/jetty/servlet-api-2.5) -- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250) +- javax.annotation API (from http://jcp.org/en/jsr/detail?id=250) ======================================================================== CDDL-1.1 @@ -871,7 +871,7 @@ The following software have components provided under the terms of this license: - JavaBeans Activation Framework (from <http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp>, http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp, https://repo1.maven.org/maven2/com/sun/activation/javax.activation) - JavaMail API (from https://repo1.maven.org/maven2/com/sun/mail/javax.mail) - Run Level Service (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-runlevel) -- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250) +- javax.annotation API (from http://jcp.org/en/jsr/detail?id=250) - tomcat-embed-core (from http://tomcat.apache.org/) ======================================================================== @@ -1016,7 +1016,7 @@ The following software have components provided under the terms of this license: - ServiceLocator Default Implementation (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-locator) - aopalliance-repackaged (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/aopalliance-repackaged) - jakarta.inject (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/jakarta.inject) -- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250) +- javax.annotation API (from http://jcp.org/en/jsr/detail?id=250) - jersey-container-servlet (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet) - jersey-container-servlet-core (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet-core) - jersey-core-client (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-client)