diff --git a/NOTICE b/NOTICE index 6ab1f0017fd2705e2608a32fcae170f2404424db..5f4557dd8a2257a8ff3a44ad5e0f0bf11f28b889 100644 --- a/NOTICE +++ b/NOTICE @@ -358,7 +358,6 @@ The following software have components provided under the terms of this license: - io.grpc:grpc-services (from https://github.com/grpc/grpc-java) - io.grpc:grpc-stub (from https://github.com/grpc/grpc-java) - io.grpc:grpc-xds (from https://github.com/grpc/grpc-java) -- ion-java (from https://github.com/amzn/ion-java/, https://github.com/amznlabs/ion-java/) - jackson-databind (from http://github.com/FasterXML/jackson, http://wiki.fasterxml.com/JacksonHome, https://github.com/FasterXML/jackson) - java-cloudant (from https://cloudant.com) - javatuples (from http://www.javatuples.org) @@ -384,6 +383,7 @@ The following software have components provided under the terms of this license: - proto-google-iam-v1 (from https://github.com/googleapis/googleapis, https://github.com/googleapis/java-iam/proto-google-iam-v1, https://github.com/googleapis/sdk-platform-java) - resilience4j (from https://github.com/resilience4j/resilience4j, https://resilience4j.readme.io, ttps://resilience4j.readme.io) - snappy-java (from https://github.com/xerial/snappy-java) +- software.amazon.ion:ion-java (from https://github.com/amzn/ion-java/) - spring-boot-loader (from https://spring.io/projects/spring-boot) - spring-security-oauth2-client (from http://spring.io/spring-security, https://spring.io/projects/spring-security, https://spring.io/spring-security) - spring-security-oauth2-core (from http://spring.io/spring-security, https://spring.io/projects/spring-security, https://spring.io/spring-security) @@ -556,13 +556,9 @@ EPL-1.0 The following software have components provided under the terms of this license: - AspectJ Weaver (from http://www.aspectj.org, https://www.eclipse.org/aspectj/) -- JUnit Jupiter (Aggregator) (from https://junit.org/junit5/) - JUnit Jupiter API (from http://junit.org/junit5/, https://junit.org/junit5/) - JUnit Jupiter Engine (from http://junit.org/junit5/, https://junit.org/junit5/) - JUnit Jupiter Params (from http://junit.org/junit5/, https://junit.org/junit5/) -- JUnit Platform Engine API (from http://junit.org/junit5/, https://junit.org/junit5/) -- Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) -- Jakarta Validation API (from https://beanvalidation.org) - Jetty :: Utilities (from http://jetty.mortbay.org, http://www.eclipse.org/jetty, https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util, https://repo1.maven.org/maven2/org/mortbay/jetty/jetty-util) - Logback Contrib :: JSON :: Classic (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-json-classic) - Logback Contrib :: JSON :: Core (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-json-core) @@ -603,7 +599,6 @@ GPL-2.0-only The following software have components provided under the terms of this license: - Cobertura (from http://cobertura.sourceforge.net) -- Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) - tomcat-embed-core (from http://tomcat.apache.org/) ======================================================================== @@ -627,13 +622,6 @@ The following software have components provided under the terms of this license: - javax.annotation API (from http://jcp.org/en/jsr/detail?id=250) - tomcat-embed-core (from http://tomcat.apache.org/) -======================================================================== -GPL-3.0-only -======================================================================== -The following software have components provided under the terms of this license: - -- Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) - ======================================================================== GPL-3.0-or-later ======================================================================== @@ -829,6 +817,14 @@ The following software have components provided under the terms of this license: - Guava: Google Core Libraries for Java (from http://code.google.com/p/guava-libraries, https://github.com/google/guava, https://repo1.maven.org/maven2/com/google/guava/guava) - Netty/Codec (from https://repo1.maven.org/maven2/io/netty/netty-codec) +======================================================================== +gpl-2.0-classpath +======================================================================== +The following software have components provided under the terms of this license: + +- Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) +- Jakarta Validation API (from https://beanvalidation.org) + ======================================================================== proprietary-license ======================================================================== diff --git a/provider/legal-azure/pom.xml b/provider/legal-azure/pom.xml index 04ebf1f12be7692be1b3d0bcd00fea3f237270ae..672dbe16a2f664d4529224f9b291e1d55790016c 100644 --- a/provider/legal-azure/pom.xml +++ b/provider/legal-azure/pom.xml @@ -31,7 +31,7 @@ <azure.appservice.plan /> <azure.appservice.appname /> <azure.appservice.subscription /> - <osdu.corelibazure.version>0.25.0</osdu.corelibazure.version> + <osdu.corelibazure.version>0.26.0-rc5</osdu.corelibazure.version> <osdu.legal-core.version>0.26.0-SNAPSHOT</osdu.legal-core.version> <javax.inject.version>1</javax.inject.version> <javax.servlet-api.version>4.0.1</javax.servlet-api.version>