diff --git a/NOTICE b/NOTICE
index c1260c2ed201f3b1c1d11a0b5531ee7f47f97aa2..ba660d15cb89c88996877bb1896366da540dfdc0 100644
--- a/NOTICE
+++ b/NOTICE
@@ -67,7 +67,7 @@ The following software have components provided under the terms of this license:
- Byte Buddy (without dependencies) (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy)
- Byte Buddy Java agent (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent)
- ClassMate (from http://github.com/cowtowncoder/java-classmate)
-- Cloud Key Management Service (KMS) API v1-rev20240801-2.0.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms)
+- Cloud Key Management Service (KMS) API v1-rev20240918-2.0.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms)
- Collections (from https://repo1.maven.org/maven2/commons-collections/commons-collections)
- Commons Digester (from http://commons.apache.org/digester/)
- Converter: Jackson (from https://github.com/square/retrofit, https://repo1.maven.org/maven2/com/squareup/retrofit2/converter-jackson)
@@ -94,7 +94,7 @@ The following software have components provided under the terms of this license:
- Guava ListenableFuture only (from https://repo1.maven.org/maven2/com/google/guava/listenablefuture)
- 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)
- HTTP functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty)
-- Hibernate Validator (from http://hibernate.org/validator, https://repo1.maven.org/maven2/org/hibernate/hibernate-validator, https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator)
+- Hibernate Validator (from https://hibernate.org/validator, https://repo1.maven.org/maven2/org/hibernate/hibernate-validator, https://repo1.maven.org/maven2/org/hibernate/validator/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)
@@ -104,6 +104,9 @@ The following software have components provided under the terms of this license:
- J2ObjC Annotations (from https://github.com/google/j2objc/)
- JBoss Logging 3 (from http://www.jboss.org)
- JCIP Annotations under Apache License (from http://stephenc.github.com/jcip-annotations)
+- JJWT :: API (from https://repo1.maven.org/maven2/io/jsonwebtoken/jjwt-api)
+- JJWT :: Extensions :: Jackson (from https://repo1.maven.org/maven2/io/jsonwebtoken/jjwt-jackson)
+- JJWT :: Impl (from https://repo1.maven.org/maven2/io/jsonwebtoken/jjwt-impl)
- JJWT :: Legacy Transitive Dependency Jar (from https://repo1.maven.org/maven2/io/jsonwebtoken/jjwt)
- JMES Path Query library (from https://aws.amazon.com/sdkforjava)
- JSON Small and Fast Parser (from https://repo1.maven.org/maven2/net/minidev/json-smart, https://urielch.github.io/)
@@ -214,7 +217,6 @@ The following software have components provided under the terms of this license:
- Spring Boot Test (from http://projects.spring.io/spring-boot/, https://spring.io/projects/spring-boot)
- Spring Boot Test Auto-Configure (from http://projects.spring.io/spring-boot/, https://spring.io/projects/spring-boot)
- Spring Boot Test Starter (from http://projects.spring.io/spring-boot/, https://spring.io/projects/spring-boot)
-- Spring Boot Tomcat Starter (from http://projects.spring.io/spring-boot/, https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-tomcat, https://spring.io/projects/spring-boot)
- Spring Boot Validation Starter (from http://projects.spring.io/spring-boot/, https://projects.spring.io/spring-boot/, https://spring.io/projects/spring-boot)
- Spring Boot Web Starter (from http://projects.spring.io/spring-boot/, https://spring.io/projects/spring-boot)
- Spring Commons Logging Bridge (from https://github.com/spring-projects/spring-framework)
@@ -261,7 +263,6 @@ The following software have components provided under the terms of this license:
- 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.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)
- jose4j (from https://bitbucket.org/b_c/jose4j/)
- json-path (from http://code.google.com/p/json-path/, https://github.com/jayway/JsonPath)
@@ -299,7 +300,6 @@ The following software have components provided under the terms of this license:
- tomcat-annotations-api (from http://tomcat.apache.org/, https://tomcat.apache.org/)
- tomcat-embed-core (from http://tomcat.apache.org/)
- tomcat-embed-el (from http://tomcat.apache.org/, https://tomcat.apache.org/)
-- tomcat-embed-websocket (from http://tomcat.apache.org/, https://tomcat.apache.org/)
========================================================================
BSD-2-Clause
@@ -382,7 +382,7 @@ 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)
- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
-- Hibernate Validator (from http://hibernate.org/validator, https://repo1.maven.org/maven2/org/hibernate/hibernate-validator, https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator)
+- Hibernate Validator (from https://hibernate.org/validator, https://repo1.maven.org/maven2/org/hibernate/hibernate-validator, https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator)
- LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
- Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common)
- RabbitMQ Java Client (from http://www.rabbitmq.com, https://www.rabbitmq.com)
@@ -532,9 +532,6 @@ MIT
The following software have components provided under the terms of this license:
- Animal Sniffer Annotations (from https://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-annotations)
-- Apache HttpClient Cache (from http://hc.apache.org/httpcomponents-client, http://hc.apache.org/httpcomponents-client-ga)
-- Apache Log4j API (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api)
-- Apache Log4j to SLF4J Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-to-slf4j)
- Azure Java Client Authentication Library for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
- Azure Java Client Runtime for ARM (from https://github.com/Azure/autorest-clientruntime-for-java)
- Azure Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
@@ -593,6 +590,13 @@ The following software have components provided under the terms of this license:
- msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java)
- msal4j-persistence-extension (from https://github.com/AzureAD/microsoft-authentication-extensions-for-java, https://github.com/AzureAD/microsoft-authentication-library-for-java)
+========================================================================
+MPL-1.1
+========================================================================
+The following software have components provided under the terms of this license:
+
+- Javassist (from http://www.javassist.org/, https://www.javassist.org/)
+
========================================================================
MPL-2.0
========================================================================
diff --git a/pom.xml b/pom.xml
index dda978bee3ee9c028c098943c993e06e6f8081d1..0fb194209daed38bad3e324e09b36c36ddb7fb71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,14 +29,14 @@
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <openapi.version>2.3.0</openapi.version>
- <os-core-common-spring6.version>0.26.0-rc2</os-core-common-spring6.version>
+ <openapi.version>2.6.0</openapi.version>
+ <os-core-common.version>3.0.0</os-core-common.version>
<gson.version>2.8.9</gson.version>
<json-smart.version>2.5.0</json-smart.version>
<netty.version>4.1.97.Final</netty.version>
<guava.version>32.1.2-jre</guava.version>
- <spring-boot.version>3.3.1</spring-boot.version>
- <spring-security.version>6.3.1</spring-security.version>
+ <spring-boot.version>3.3.4</spring-boot.version>
+ <spring-security.version>6.3.3</spring-security.version>
<argLine>
--add-opens=java.base/java.util=ALL-UNNAMED
--add-opens java.base/java.lang=ALL-UNNAMED
@@ -85,8 +85,8 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
- <artifactId>os-core-common-spring6</artifactId>
- <version>${os-core-common-spring6.version}</version>
+ <artifactId>os-core-common</artifactId>
+ <version>${os-core-common.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/provider/register-aws/pom.xml b/provider/register-aws/pom.xml
index 1f02843d68c39b85f0a10f497643b7339f98720e..0c1f2163508dcd7e7253e98ee8c6e039e072c8ae 100644
--- a/provider/register-aws/pom.xml
+++ b/provider/register-aws/pom.xml
@@ -30,6 +30,7 @@
<properties>
<jackson-databind.version>2.16.1</jackson-databind.version>
<jackson.version>2.16.1</jackson.version>
+ <springframework.version>6.1.13</springframework.version>
</properties>
<dependencyManagement>
@@ -43,8 +44,8 @@
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
- <artifactId>os-core-common-spring6</artifactId>
- <version>${os-core-common-spring6.version}</version>
+ <artifactId>os-core-common</artifactId>
+ <version>${os-core-common.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -60,7 +61,7 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
- <version>0.26.0-spring6-rc2</version>
+ <version>3.0.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -82,10 +83,20 @@
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${jackson.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>6.1.10</version>
+ <version>${springframework.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
@@ -102,7 +113,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>register-core</artifactId>
- <version>0.28.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -111,12 +122,7 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>6.1.10</version>
- </dependency>
-
+
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
@@ -163,7 +169,7 @@
<version>5.2.0</version>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
diff --git a/provider/register-azure/pom.xml b/provider/register-azure/pom.xml
index dbdedee093e085ec6539775656d395e7766b81f3..b871935f46dc2606d8fabc594f88be01b41401c6 100644
--- a/provider/register-azure/pom.xml
+++ b/provider/register-azure/pom.xml
@@ -78,8 +78,8 @@
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
- <artifactId>os-core-common-spring6</artifactId>
- <version>${os-core-common-spring6.version}</version>
+ <artifactId>os-core-common</artifactId>
+ <version>${os-core-common.version}</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
diff --git a/provider/register-ibm/pom.xml b/provider/register-ibm/pom.xml
index 4b11bf2f4751c6b8f27e9a835f53b55e4f7abc10..71438fdabe781e8041e3c58bd01540047569edb8 100644
--- a/provider/register-ibm/pom.xml
+++ b/provider/register-ibm/pom.xml
@@ -71,8 +71,8 @@
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
- <artifactId>os-core-common-spring6</artifactId>
- <version>${os-core-common-spring6.version}</version>
+ <artifactId>os-core-common</artifactId>
+ <version>${os-core-common.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
diff --git a/register-core-plus/pom.xml b/register-core-plus/pom.xml
index 22b08b530a121b96334266d905ab98cfefbe3920..85147c21afef5079b2263905427d4d3ce566f224 100644
--- a/register-core-plus/pom.xml
+++ b/register-core-plus/pom.xml
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-plus-common-lib</artifactId>
- <version>0.27.0-rc1</version>
+ <version>0.27.0-rc3</version>
</dependency>
<dependency>
diff --git a/register-core/pom.xml b/register-core/pom.xml
index a75eb8479e01cad026f185c73d55efac056bf749..272bf64f42742471a727e04bb1b50abac1d23199 100644
--- a/register-core/pom.xml
+++ b/register-core/pom.xml
@@ -50,6 +50,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
+ <version>${spring-boot.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
@@ -61,6 +62,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.12.1.GA</version>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
@@ -80,8 +86,8 @@
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
- <artifactId>os-core-common-spring6</artifactId>
- <version>${os-core-common-spring6.version}</version>
+ <artifactId>os-core-common</artifactId>
+ <version>${os-core-common.version}</version>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>