diff --git a/NOTICE b/NOTICE index f1d7d980c7973b816c3c65cefafdd112179da4ed..bd1b89cd851943faabcdbd804b85a787355f41c2 100644 --- a/NOTICE +++ b/NOTICE @@ -56,7 +56,6 @@ The following software have components provided under the terms of this license: - Adapter: RxJava (from https://github.com/square/retrofit) - Animal Sniffer Annotations (from https://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-annotations) - Apache Commons BeanUtils (from http://commons.apache.org/proper/commons-beanutils/, https://commons.apache.org/proper/commons-beanutils/, https://repo1.maven.org/maven2/commons-beanutils/commons-beanutils) -- Apache Commons CLI (from https://commons.apache.org/proper/commons-cli/, https://repo1.maven.org/maven2/commons-cli/commons-cli) - Apache Commons Codec (from http://commons.apache.org/proper/commons-codec/, https://commons.apache.org/proper/commons-codec/) - Apache Commons Collections (from https://commons.apache.org/proper/commons-collections/) - Apache Commons Compress (from http://commons.apache.org/compress/, http://commons.apache.org/proper/commons-compress/, https://commons.apache.org/proper/commons-compress/) @@ -100,8 +99,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 Cloud Core (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core, https://github.com/googleapis/java-core, https://repo1.maven.org/maven2/com/google/cloud/google-cloud-core) -- Google Cloud Core HTTP (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-http, https://github.com/googleapis/google-cloud-java, https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-http, https://github.com/googleapis/java-core) -- Google Cloud Core gRPC (from https://github.com/googleapis/google-cloud-java, https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-grpc, https://github.com/googleapis/java-core) +- Google Cloud Core HTTP (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-http, https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-http, https://github.com/googleapis/java-core, https://repo1.maven.org/maven2/com/google/cloud/google-cloud-core-http) +- Google Cloud Core gRPC (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-grpc, https://github.com/googleapis/java-core, https://repo1.maven.org/maven2/com/google/cloud/google-cloud-core-grpc) - Google Cloud Datastore (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore, https://github.com/googleapis/java-datastore) - Google Cloud IAM Service Account Credentials (from https://github.com/googleapis/google-cloud-java, https://github.com/googleapis/java-iamcredentials) - Google Cloud Logging (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-logging, https://github.com/googleapis/java-logging) @@ -116,6 +115,7 @@ The following software have components provided under the terms of this license: - HTTP functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty) - HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/) - Hibernate Validator (from https://repo1.maven.org/maven2/org/hibernate/hibernate-validator, https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator) +- Hibernate Validator Engine - Relocation Artifact (from https://repo1.maven.org/maven2/org/hibernate/hibernate-validator) - HikariCP (from https://github.com/brettwooldridge/HikariCP) - Hop (from https://github.com/rabbitmq/hop, https://www.rabbitmq.com) - IBM COS Java SDK for Amazon S3 (from https://github.com/ibm/ibm-cos-sdk-java) @@ -299,7 +299,6 @@ The following software have components provided under the terms of this license: - jackson-databind (from http://github.com/FasterXML/jackson, http://wiki.fasterxml.com/JacksonHome, https://github.com/FasterXML/jackson) - jakarta.inject (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/jakarta.inject) - java-cloudant (from https://cloudant.com) -- javaparser-core (from https://repo1.maven.org/maven2/com/github/javaparser/javaparser-core) - javatuples (from http://www.javatuples.org) - 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) @@ -384,7 +383,6 @@ The following software have components provided under the terms of this license: - HK2 core module (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-core) - Hamcrest (from http://hamcrest.org/JavaHamcrest/) - Hamcrest Core (from http://hamcrest.org/, http://hamcrest.org/JavaHamcrest/, https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core) -- Jackson module: Afterburner (from http://wiki.fasterxml.com/JacksonHome, https://github.com/FasterXML/jackson-modules-base) - Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://github.com/jakartaee/jaf-api, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api) - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) - Jakarta RESTful WS API (from https://github.com/eclipse-ee4j/jaxrs-api) @@ -514,9 +512,6 @@ 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/) -- Eclipse Xbase Runtime Library (from https://repo1.maven.org/maven2/org/eclipse/xtext/org.eclipse.xtext.xbase.lib, https://www.eclipse.org/Xtext/) -- Eclipse Xtend Active Annotations Library (from https://www.eclipse.org/Xtext/) -- Eclipse Xtend Runtime Library (from https://repo1.maven.org/maven2/org/eclipse/xtend/org.eclipse.xtend.lib, https://www.eclipse.org/Xtext/) - 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/) @@ -619,6 +614,7 @@ The following software have components provided under the terms of this license: - Expression Language 3.0 API (from http://uel-spec.java.net, http://uel.java.net) - HK2 Implementation Utilities (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-utils) - HK2 core module (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-core) +- Jackson-core (from http://wiki.fasterxml.com/JacksonHome, https://github.com/FasterXML/jackson-core) - Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://github.com/jakartaee/jaf-api, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api) - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) - Jakarta Bean Validation API (from https://beanvalidation.org) @@ -705,22 +701,9 @@ LGPL-2.1-or-later The following software have components provided under the terms of this license: - Java Native Access (from https://github.com/java-native-access/jna, https://github.com/twall/jna) +- Java Native Access Platform (from https://github.com/java-native-access/jna) - Javassist (from http://www.javassist.org/) -======================================================================== -LGPL-3.0-only -======================================================================== -The following software have components provided under the terms of this license: - -- javaparser-core (from https://repo1.maven.org/maven2/com/github/javaparser/javaparser-core) - -======================================================================== -LGPL-3.0-or-later -======================================================================== -The following software have components provided under the terms of this license: - -- javaparser-core (from https://repo1.maven.org/maven2/com/github/javaparser/javaparser-core) - ======================================================================== MIT ======================================================================== @@ -742,6 +725,7 @@ The following software have components provided under the terms of this license: - Checker Qual (from https://checkerframework.org) - ClassGraph (from https://github.com/classgraph/classgraph) - JUL to SLF4J bridge (from http://www.slf4j.org) +- Jackson-core (from http://wiki.fasterxml.com/JacksonHome, https://github.com/FasterXML/jackson-core) - Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec) - Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java) - Java JWT (from http://www.jwt.io, https://github.com/auth0/java-jwt) diff --git a/pom.xml b/pom.xml index 816e0877a7cc426eee7f1fbbbd2aa70a316e06a3..2268e1c9a67e76e5ebe098918aec84a72b9b8015 100644 --- a/pom.xml +++ b/pom.xml @@ -47,6 +47,13 @@ <dependencyManagement> <dependencies> + <dependency> + <groupId>com.fasterxml.jackson</groupId> + <artifactId>jackson-bom</artifactId> + <version>2.14.2</version> + <type>pom</type> + <scope>import</scope> + </dependency> <dependency> <groupId> org.apache.logging.log4j</groupId> <artifactId>log4j-bom</artifactId> @@ -57,7 +64,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>2.7.7</version> + <version>2.7.10</version> <type>pom</type> <scope>import</scope> </dependency> @@ -110,7 +117,7 @@ <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> - <version>1.33</version> + <version>2.0</version> </dependency> <!-- swagger dependency --> <!-- <dependency> diff --git a/provider/register-aws/pom.xml b/provider/register-aws/pom.xml index c981514576dcc4669a8e52f1ed7fcd9d64a4ee07..9151efabb7d88e3a700651fabe8b81c13fd6481f 100644 --- a/provider/register-aws/pom.xml +++ b/provider/register-aws/pom.xml @@ -33,8 +33,8 @@ <aws.version>1.11.1018</aws.version> <log4j2.version>2.17.1</log4j2.version> <os-core-common.version>0.19.0</os-core-common.version> - <jackson-databind.version>2.13.2.2</jackson-databind.version> - <jackson.version>2.13.2</jackson.version> + <jackson-databind.version>2.14.2</jackson-databind.version> + <jackson.version>2.14.2</jackson.version> <spring-webmvc.version>5.3.24</spring-webmvc.version> </properties> @@ -113,6 +113,11 @@ <artifactId>jackson-annotations</artifactId> <version>${jackson.version}</version> </dependency> + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-yaml</artifactId> + <version>${jackson.version}</version> + </dependency> <dependency> <groupId>org.opengroup.osdu.core.aws</groupId> <artifactId>os-core-lib-aws</artifactId> diff --git a/provider/register-azure/pom.xml b/provider/register-azure/pom.xml index 6593e5bf75a868cc0a03236accbd70bb2ee6cd95..eeaba56282cb4d63492ce57a3fbb2ddbf81110a0 100644 --- a/provider/register-azure/pom.xml +++ b/provider/register-azure/pom.xml @@ -35,12 +35,22 @@ <mockito-junit-jupiter.version>2.23.0</mockito-junit-jupiter.version> <oauth2-oidc-sdk.version>6.5</oauth2-oidc-sdk.version> <woodstox-core.version>6.4.0</woodstox-core.version> - <jackson-databind.version>2.13.4.1</jackson-databind.version> - <jackson.version>2.13.2</jackson.version> + <hibernate-validator.version>5.3.6.Final</hibernate-validator.version> + <jackson-databind.version>2.14.2</jackson-databind.version> + <jackson.version>2.14.2</jackson.version> + <spring-webmvc.version>5.3.22</spring-webmvc.version> </properties> <dependencyManagement> <dependencies> + <!-- Inherit managed dependencies from core-lib-azure --> + <dependency> + <groupId>org.opengroup.osdu</groupId> + <artifactId>core-lib-azure</artifactId> + <version>${osdu.corelibazure.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> <dependency> <groupId>com.fasterxml.woodstox</groupId> <artifactId>woodstox-core</artifactId> @@ -49,6 +59,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> + <version>${hibernate-validator.version}</version> </dependency> </dependencies> </dependencyManagement> @@ -103,10 +114,12 @@ <artifactId>azure-spring-boot-starter-active-directory</artifactId> <version>3.14.0</version> </dependency> + <!-- Spring Dependencies --> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId> + <version>${spring-webmvc.version}</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> @@ -125,6 +138,7 @@ <dependency> <groupId>org.springframework.security</groupId> <artifactId>spring-security-oauth2-client</artifactId> + <version>5.7.5</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> diff --git a/provider/register-gc/pom.xml b/provider/register-gc/pom.xml index 19b6ab312d9a68447d3209295ea15df27c8fef97..42602e2fc25b2f7806490c68877c9c3ccdba724d 100644 --- a/provider/register-gc/pom.xml +++ b/provider/register-gc/pom.xml @@ -21,20 +21,8 @@ <version>0.21.0-SNAPSHOT</version> <description>Register service</description> - <properties> - <jackson-databind.version>2.13.2.2</jackson-databind.version> - <jackson.version>2.13.2</jackson.version> - </properties> - <dependencyManagement> <dependencies> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-dependencies</artifactId> - <version>2.7.7</version> - <type>pom</type> - <scope>import</scope> - </dependency> <dependency> <groupId>com.google.cloud</groupId> <artifactId>libraries-bom</artifactId> @@ -114,23 +102,6 @@ <version>3.12.0</version> <scope>test</scope> </dependency> - - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - <version>${jackson.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - <version>${jackson.version}</version> - </dependency> - </dependencies> <build> diff --git a/provider/register-ibm/pom.xml b/provider/register-ibm/pom.xml index 167fdebb7fdcc2dfd96042f38b9db8b91a341f9b..83aeaf404a78360a25855c1a0067bd58bb9ae48d 100644 --- a/provider/register-ibm/pom.xml +++ b/provider/register-ibm/pom.xml @@ -28,20 +28,13 @@ </parent> <properties> - <jackson.version>2.13.4</jackson.version> - <jackson-databind.version>2.13.4.2</jackson-databind.version> - <jackson-dataformat-cbor.version>2.13.0</jackson-dataformat-cbor.version> + <jackson.version>2.15.0-rc1</jackson.version> + <jackson-databind.version>2.14.2</jackson-databind.version> + <jackson-dataformat-cbor.version>2.14.2</jackson-dataformat-cbor.version> </properties> <dependencyManagement> <dependencies> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-dependencies</artifactId> - <version>2.7.7</version> - <type>pom</type> - <scope>import</scope> - </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> diff --git a/register-core/pom.xml b/register-core/pom.xml index 9ed689c3923fd2fa1f6265535a6842eb0757e2ba..2973b8f501bdd9fbc57304de6fdf3170bd2f5193 100644 --- a/register-core/pom.xml +++ b/register-core/pom.xml @@ -32,8 +32,8 @@ <properties> <netty.version>4.1.70.Final</netty.version> - <jackson-databind.version>2.13.4</jackson-databind.version> - <jackson.version>2.13.2</jackson.version> + <jackson-databind.version>2.14.2</jackson-databind.version> + <jackson.version>2.14.2</jackson.version> </properties> <dependencyManagement> @@ -121,7 +121,7 @@ <dependency> <groupId>com.reprezen.kaizen</groupId> <artifactId>openapi-parser</artifactId> - <version>4.0.1-201809050415</version> + <version>4.0.4</version> <exclusions> <exclusion> <groupId>com.google.guava</groupId> @@ -142,7 +142,7 @@ <dependency> <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-joda</artifactId> - <version>2.11.3</version> + <version>2.14.2</version> </dependency> <dependency> <groupId>joda-time</groupId> @@ -188,6 +188,11 @@ <artifactId>jackson-databind</artifactId> <version>${jackson-databind.version}</version> </dependency> + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-yaml</artifactId> + <version>${jackson.version}</version> + </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> diff --git a/testing/register-test-aws/pom.xml b/testing/register-test-aws/pom.xml index 48c1905d93373044b0d8771fe0e31e897d924b12..f7f302d02f751e7595eac5a7f23e00dbda1df626 100644 --- a/testing/register-test-aws/pom.xml +++ b/testing/register-test-aws/pom.xml @@ -36,8 +36,8 @@ <maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.source>1.8</maven.compiler.source> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <jackson-databind.version>2.13.2.2</jackson-databind.version> - <jackson.version>2.13.2</jackson.version> + <jackson-databind.version>2.15.0-rc1</jackson-databind.version> + <jackson.version>2.15.0-rc1</jackson.version> </properties> <dependencies> diff --git a/testing/register-test-core/pom.xml b/testing/register-test-core/pom.xml index 357397ec08706f9f0be37fc0517a87e40c1531b4..6d19b8e65883eb208bdc3ea61ef93fbbe33be88c 100644 --- a/testing/register-test-core/pom.xml +++ b/testing/register-test-core/pom.xml @@ -36,8 +36,8 @@ <maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.source>1.8</maven.compiler.source> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <jackson-databind.version>2.13.2.2</jackson-databind.version> - <jackson.version>2.13.2</jackson.version> + <jackson-databind.version>2.15.0-rc1</jackson-databind.version> + <jackson.version>2.15.0-rc1</jackson.version> </properties> <dependencies>