diff --git a/NOTICE b/NOTICE index 27df102c216b2e724ca81bbb4187fa77a7970549..0b5fada98444ddbe576d6583c48a41251d359172 100644 --- a/NOTICE +++ b/NOTICE @@ -17,7 +17,7 @@ The following software have components provided under the terms of this license: - Apache Commons CLI (from http://commons.apache.org/proper/commons-cli/) - Cobertura (from http://cobertura.sourceforge.net) - Default Plexus Container (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default) -- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils) +- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) - oro (from ) ======================================================================== @@ -302,8 +302,8 @@ The following software have components provided under the terms of this license: - Apache Commons Text (from https://commons.apache.org/proper/commons-text) - Apache Commons Validator (from http://commons.apache.org/proper/commons-validator/) - Apache Geronimo JMS Spec 2.0 (from http://geronimo.apache.org/maven/${siteId}/${version}) -- Apache Groovy (from http://groovy-lang.org) - Apache Groovy (from https://groovy-lang.org) +- Apache Groovy (from http://groovy-lang.org) - Apache Groovy (from https://groovy-lang.org) - Apache Log4j API (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api) - Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core) @@ -350,8 +350,8 @@ The following software have components provided under the terms of this license: - Google APIs Client Library for Java (from https://repo1.maven.org/maven2/com/google/api-client/google-api-client) - Google App Engine extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-appengine) - Google App Engine extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-appengine) -- Google Cloud Core (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core) -- Google Cloud Core (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core) +- Google Cloud Core (from https://github.com/googleapis/java-core) +- Google Cloud Core (from https://github.com/googleapis/java-core) - Google Cloud Core HTTP (from https://github.com/googleapis/java-core) - Google Cloud Core HTTP (from https://github.com/googleapis/java-core) - Google Cloud Core gRPC (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-grpc) @@ -393,19 +393,20 @@ The following software have components provided under the terms of this license: - JSON Web Token support for the JVM (from https://repo1.maven.org/maven2/io/jsonwebtoken/jjwt) - JSON library from Android SDK (from http://developer.android.com/sdk) - JSONassert (from https://github.com/skyscreamer/JSONassert) +- JSR107 API and SPI (from https://github.com/jsr107/jsr107spec) - Jackson (from http://jackson.codehaus.org) - Jackson 2 extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson2) - Jackson dataformat: CBOR (from http://github.com/FasterXML/jackson-dataformats-binary) -- Jackson datatype: JSR310 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jsr310) +- Jackson datatype: JSR310 (from http://wiki.fasterxml.com/JacksonModuleJSR310) - Jackson datatype: Joda (from https://github.com/FasterXML/jackson-datatype-joda) - Jackson datatype: jdk8 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jdk8) - Jackson extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson) -- Jackson module: JAXB Annotations (from https://github.com/FasterXML/jackson-modules-base) +- Jackson module: Afterburner (from https://github.com/FasterXML/jackson-modules-base) +- Jackson module: Old JAXB Annotations (javax.xml.bind) (from https://github.com/FasterXML/jackson-modules-base) - Jackson-annotations (from http://github.com/FasterXML/jackson) - Jackson-core (from https://github.com/FasterXML/jackson-core) - Jackson-dataformat-XML (from https://github.com/FasterXML/jackson-dataformat-xml) - Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson-dataformats-text) -- Jackson-module-Afterburner (from http://wiki.fasterxml.com/JacksonHome) - Jackson-module-parameter-names (from https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-parameter-names) - Jakarta Bean Validation API (from https://beanvalidation.org) - Jakarta Expression Language Implementation (from https://projects.eclipse.org/projects/ee4j.el) @@ -491,7 +492,7 @@ The following software have components provided under the terms of this license: - OpenCensus (from https://github.com/census-instrumentation/opencensus-java) - OpenCensus (from https://github.com/census-instrumentation/opencensus-java) - PWDB :: Database (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/database) -- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils) +- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) - Plexus Velocity Component (from ) - PowerMock (from http://www.powermock.org) - PowerMock (from http://www.powermock.org) @@ -536,7 +537,6 @@ The following software have components provided under the terms of this license: - asm (from http://asm.ow2.io/) - asm (from http://asm.ow2.io/) - asm (from http://asm.ow2.io/) -- aws-ssm-java-caching-client (from https://github.com/awslabs/aws-ssm-java-caching-client) - com.google.api.grpc:proto-google-cloud-datastore-v1 (from https://github.com/googleapis/googleapis) - com.google.api.grpc:proto-google-cloud-datastore-v1 (from https://github.com/googleapis/googleapis) - datastore-v1-proto-client (from https://repo1.maven.org/maven2/com/google/cloud/datastore/datastore-v1-proto-client) @@ -577,7 +577,7 @@ The following software have components provided under the terms of this license: - org.apiguardian:apiguardian-api (from https://github.com/apiguardian-team/apiguardian) - org.conscrypt:conscrypt-openjdk-uber (from https://conscrypt.org/) - org.opentest4j:opentest4j (from https://github.com/ota4j-team/opentest4j) -- org.xmlunit:xmlunit-core (from http://www.xmlunit.org/) +- org.xmlunit:xmlunit-core (from https://www.xmlunit.org/) - perfmark:perfmark-api (from https://github.com/perfmark/perfmark) - powermock-module-junit4-common (from https://repo1.maven.org/maven2/org/powermock/powermock-module-junit4-common) - project ':json-path' (from https://github.com/jayway/JsonPath) @@ -590,6 +590,11 @@ The following software have components provided under the terms of this license: - resilience4j (from https://resilience4j.readme.io) - resilience4j (from https://resilience4j.readme.io) - resilience4j (from https://resilience4j.readme.io) +- resilience4j (from https://resilience4j.readme.io) +- resilience4j (from https://resilience4j.readme.io) +- resilience4j (from https://github.com/resilience4j/resilience4j) +- resilience4j (from https://github.com/resilience4j/resilience4j) +- resilience4j (from https://resilience4j.readme.io) - rxjava (from https://github.com/ReactiveX/RxJava) - spring-boot (from https://spring.io/projects/spring-boot) - spring-boot-actuator (from https://spring.io/projects/spring-boot) @@ -598,6 +603,7 @@ The following software have components provided under the terms of this license: - spring-boot-dependencies (from https://spring.io/projects/spring-boot) - spring-boot-starter (from https://spring.io/projects/spring-boot) - spring-boot-starter-actuator (from https://spring.io/projects/spring-boot) +- spring-boot-starter-aop (from https://spring.io/projects/spring-boot) - spring-boot-starter-data-mongodb (from https://spring.io/projects/spring-boot) - spring-boot-starter-json (from https://spring.io/projects/spring-boot) - spring-boot-starter-logging (from https://spring.io/projects/spring-boot) @@ -609,14 +615,14 @@ The following software have components provided under the terms of this license: - spring-boot-starter-webflux (from https://spring.io/projects/spring-boot) - spring-boot-test (from https://spring.io/projects/spring-boot) - spring-boot-test-autoconfigure (from https://spring.io/projects/spring-boot) -- spring-security-config (from https://spring.io/projects/spring-security) -- spring-security-core (from https://spring.io/projects/spring-security) -- spring-security-oauth2-client (from https://spring.io/projects/spring-security) -- spring-security-oauth2-core (from https://spring.io/projects/spring-security) -- spring-security-oauth2-jose (from https://spring.io/projects/spring-security) -- spring-security-oauth2-resource-server (from https://spring.io/projects/spring-security) +- spring-security-config (from http://spring.io/spring-security) +- spring-security-core (from http://spring.io/spring-security) +- spring-security-oauth2-client (from http://spring.io/spring-security) +- spring-security-oauth2-core (from http://spring.io/spring-security) +- spring-security-oauth2-jose (from http://spring.io/spring-security) +- spring-security-oauth2-resource-server (from http://spring.io/spring-security) - spring-security-test (from http://spring.io/spring-security) -- spring-security-web (from https://spring.io/projects/spring-security) +- spring-security-web (from http://spring.io/spring-security) - springfox-core (from https://github.com/springfox/springfox) - springfox-schema (from https://github.com/springfox/springfox) - springfox-spi (from https://github.com/springfox/springfox) @@ -644,7 +650,7 @@ The following software have components provided under the terms of this license: - Hamcrest (from http://hamcrest.org/JavaHamcrest/) - Hamcrest Core (from http://hamcrest.org/) - HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/) -- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils) +- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) - Reflections (from http://github.com/ronmamo/reflections) - Stax2 API (from http://github.com/FasterXML/stax2-api) - ThreeTen backport (from https://www.threeten.org/threetenbp) @@ -679,7 +685,7 @@ The following software have components provided under the terms of this license: - Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java) - Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http) -- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils) +- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) - Protocol Buffers [Core] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java) - Protocol Buffers [Util] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util) - Reflections (from http://github.com/ronmamo/reflections) @@ -758,6 +764,7 @@ EPL-1.0 ======================================================================== The following software have components provided under the terms of this license: +- AspectJ Weaver (from https://www.eclipse.org/aspectj/) - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/) - JUnit Jupiter API (from https://junit.org/junit5/) - JUnit Jupiter Engine (from https://junit.org/junit5/) @@ -958,7 +965,7 @@ The following software have components provided under the terms of this license: - mockito-junit-jupiter (from https://github.com/mockito/mockito) - msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java) - msal4j-persistence-extension (from https://github.com/AzureAD/microsoft-authentication-extensions-for-java) -- spring-security-core (from https://spring.io/projects/spring-security) +- spring-security-core (from http://spring.io/spring-security) ======================================================================== MPL-1.1 @@ -993,7 +1000,7 @@ Public-Domain ======================================================================== The following software have components provided under the terms of this license: -- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils) +- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils) - Spongy Castle (from http://rtyley.github.io/spongycastle/) ======================================================================== diff --git a/pom.xml b/pom.xml index 0903767d9de29fade9bdd1ec274209bb764bd635..325891b3d262fb08db9ac8d1d51847143d808bd6 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ <maven.compiler.source>1.8</maven.compiler.source> <docker.image.prefix>opendes</docker.image.prefix> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <os-core-common.version>0.11.0-SNAPSHOT</os-core-common.version> + <os-core-common.version>0.11.0</os-core-common.version> <snakeyaml.version>1.26</snakeyaml.version> </properties> diff --git a/provider/legal-aws/pom.xml b/provider/legal-aws/pom.xml index b43b3e9f8ef7d56f7bf3b086d00c1af3aeccf097..eeec12e5b7aaaa54b9ce850e3062d34892c187d0 100644 --- a/provider/legal-aws/pom.xml +++ b/provider/legal-aws/pom.xml @@ -37,7 +37,7 @@ <dependency> <groupId>org.opengroup.osdu.core.aws</groupId> <artifactId>os-core-lib-aws</artifactId> - <version>0.11.0-SNAPSHOT</version> + <version>0.11.0</version> </dependency> <dependency> <groupId>org.opengroup.osdu</groupId> diff --git a/provider/legal-azure/pom.xml b/provider/legal-azure/pom.xml index 7add67b4e90024014ebe7e7157f2f7c2c482b5c1..be9aeb24e85b0d2c5f9018e752e8cdcb1dd8befd 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.10.0</osdu.corelibazure.version> + <osdu.corelibazure.version>0.11.0</osdu.corelibazure.version> <osdu.legal-core.version>0.11.0-SNAPSHOT</osdu.legal-core.version> <javax.inject.version>1</javax.inject.version> <javax.servlet-api.version>4.0.1</javax.servlet-api.version> diff --git a/provider/legal-gcp/pom.xml b/provider/legal-gcp/pom.xml index 04a899b7a223f72a71d135dbfafc9552948e5fe1..b9cd77c758c0bf32d419a5a274b925b33c07e036 100644 --- a/provider/legal-gcp/pom.xml +++ b/provider/legal-gcp/pom.xml @@ -34,7 +34,7 @@ <dependency> <groupId>org.opengroup.osdu</groupId> <artifactId>core-lib-gcp</artifactId> - <version>0.10.0</version> + <version>0.11.0</version> </dependency> <dependency> <groupId>javax.servlet</groupId> diff --git a/provider/legal-ibm/pom.xml b/provider/legal-ibm/pom.xml index ff59892bf46d2924a7ec18a5629dcf71706e56c7..69f6b56dfe7d2f3a83f9f818aed42791398597e9 100644 --- a/provider/legal-ibm/pom.xml +++ b/provider/legal-ibm/pom.xml @@ -11,7 +11,7 @@ <artifactId>legal-ibm</artifactId> <packaging>jar</packaging> <properties> - <os-core-lib-ibm.version>0.11.0-SNAPSHOT</os-core-lib-ibm.version> + <os-core-lib-ibm.version>0.11.0</os-core-lib-ibm.version> </properties> <dependencies> diff --git a/provider/legal-reference/pom.xml b/provider/legal-reference/pom.xml index 5c2244c39759d41f4e18c0b84e8657f7a909ad48..4c1efdaf1d5208b912bb8019821a32556ca092f2 100644 --- a/provider/legal-reference/pom.xml +++ b/provider/legal-reference/pom.xml @@ -35,7 +35,7 @@ <dependency> <groupId>org.opengroup.osdu</groupId> <artifactId>core-lib-gcp</artifactId> - <version>0.10.0</version> + <version>0.11.0</version> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -171,7 +171,7 @@ <dependency> <groupId>org.opengroup.osdu</groupId> <artifactId>core-lib-gcp</artifactId> - <version>0.10.0</version> + <version>0.11.0</version> <scope>compile</scope> </dependency> diff --git a/testing/legal-test-aws/pom.xml b/testing/legal-test-aws/pom.xml index bb7c48db726b4368c1642f1ef579ac5cc4b7f5f6..4cba9fd80732706a33c36766e053bf2bf2497aa5 100644 --- a/testing/legal-test-aws/pom.xml +++ b/testing/legal-test-aws/pom.xml @@ -45,7 +45,7 @@ <dependency> <groupId>org.opengroup.osdu.core.aws</groupId> <artifactId>os-core-lib-aws</artifactId> - <version>0.10.0</version> + <version>0.11.0</version> </dependency> <!-- AWS managed packages -->