From dbd23e4b931370af60539875c6c524f1fbe8c6b6 Mon Sep 17 00:00:00 2001
From: Guillaume Caillet <cailletg@amazon.com>
Date: Fri, 22 Mar 2024 15:29:33 +0000
Subject: [PATCH] Spring 6 Migration - Code changes
---
.gitlab-ci.yml | 18 +
devops/gc/deploy/README.md | 1 -
devops/gc/deploy/templates/configmap.yaml | 6 +-
devops/gc/deploy/values.yaml | 1 -
pom.xml | 462 +++++++++---------
provider/storage-aws/pom.xml | 60 +--
...galComplianceChangeServiceAWSImplTest.java | 16 +-
.../aws/mongo/QueryRepositoryMongoTest.java | 3 +-
.../RecordsMetadataRepositoryMongoTest.java | 2 +
.../src/test/resources/application.properties | 5 +-
provider/storage-azure/pom.xml | 107 ++--
...tion.java => StorageAzureApplication.java} | 4 +-
.../azure/security/AADSecurityConfig.java | 58 +--
.../security/AzureIstioSecurityConfig.java | 29 +-
.../azure/api/SchemaEndToEndTest.java | 2 +-
provider/storage-gc/pom.xml | 38 +-
.../web/security/GSuiteSecurityConfig.java | 31 +-
provider/storage-ibm/pom.xml | 14 +-
.../ibm/app/StorageIBMApplication.java | 3 +-
.../provider/ibm/security/SecurityConfig.java | 36 +-
storage-core-plus/pom.xml | 67 +--
.../web/security/GSuiteSecurityConfig.java | 30 +-
storage-core/pom.xml | 372 +++++++-------
.../storage/util/GlobalExceptionMapper.java | 5 +-
.../osdu/storage/SecurityConfig.java | 29 --
.../osdu/storage/SecurityConfiguration.java | 51 ++
.../service/PersistenceServiceImplTest.java | 32 +-
testing/pom.xml | 16 +-
testing/storage-test-aws/pom.xml | 8 +-
testing/storage-test-core/pom.xml | 143 +++---
.../osdu/storage/util/TestUtils.java | 2 +-
testing/storage-test-gc/pom.xml | 2 +-
testing/storage-test-ibm/pom.xml | 9 +-
33 files changed, 848 insertions(+), 814 deletions(-)
rename provider/storage-azure/src/main/java/org/opengroup/osdu/storage/provider/azure/{StorageApplication.java => StorageAzureApplication.java} (93%)
delete mode 100644 storage-core/src/test/java/org/opengroup/osdu/storage/SecurityConfig.java
create mode 100644 storage-core/src/test/java/org/opengroup/osdu/storage/SecurityConfiguration.java
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f343990a..f22a8e082 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -183,6 +183,24 @@ eslint-sast:
- echo 'xargs -0rI {} $MAVEN_BUILD {} "$@" < $ALL_MAVEN_BUILD_DIRS_Z' >> $MAVEN_FOREACH
+ # Temporary fix for AWS Unit tests using Embedded MongoDB that requires libcrypto.so.1.1
+ - apt-get install -y build-essential wget
+ - mkdir $HOME/opt
+ - pushd $HOME/opt
+ - wget https://www.openssl.org/source/old/1.1.1/openssl-1.1.1w.tar.gz
+ - tar -zxvf openssl-1.1.1w.tar.gz
+ - cd openssl-1.1.1w
+ - ./config && make > make-openssl.log
+ - mkdir $HOME/opt/lib
+ - ls $HOME/opt/
+ - mv $HOME/opt/openssl-1.1.1w/libcrypto.so.1.1 $HOME/opt/lib/
+ - mv $HOME/opt/openssl-1.1.1w/libssl.so.1.1 $HOME/opt/lib/
+ - export LD_LIBRARY_PATH=$HOME/opt/lib:$LD_LIBRARY_PATH
+ - popd
+
+
+
+
download_plugins:
image: maven:3.8.3-openjdk-17-slim
stage: build
diff --git a/devops/gc/deploy/README.md b/devops/gc/deploy/README.md
index a7400605a..bc39a3fae 100644
--- a/devops/gc/deploy/README.md
+++ b/devops/gc/deploy/README.md
@@ -39,7 +39,6 @@ First you need to set variables in **values.yaml** file using any code editor. S
| Name | Description | Type | Default |Required |
|------|-------------|------|---------|---------|
**data.logLevel** | logging level | string | `ERROR` | yes
-**data.springProfilesActive** | active spring profile | string | `gcp` | yes
**data.defaultDataCountry** | Data storage region | string | `US` | yes
**data.storageServiceAccountEmail** | Storage service account email, used during OQM events processing | string | `storage@service.local` | yes
**data.entitlementsHost** | Entitlements service host address | string | `http://entitlements` | yes
diff --git a/devops/gc/deploy/templates/configmap.yaml b/devops/gc/deploy/templates/configmap.yaml
index 975e5632b..d71bcc7fb 100644
--- a/devops/gc/deploy/templates/configmap.yaml
+++ b/devops/gc/deploy/templates/configmap.yaml
@@ -13,7 +13,11 @@ data:
LOG_LEVEL: {{ .Values.data.logLevel | quote }}
PARTITION_HOST: {{ .Values.data.partitionHost | quote }}
STORAGE_SERVICE_ACCOUNT_EMAIL: {{ .Values.data.storageServiceAccountEmail | quote }}
- SPRING_PROFILES_ACTIVE: {{ .Values.data.springProfilesActive | quote }}
+ {{- if .Values.global.onPremEnabled }}
+ SPRING_PROFILES_ACTIVE: "anthos"
+ {{- else }}
+ SPRING_PROFILES_ACTIVE: "gcp"
+ {{- end }}
OPA_ENABLED: {{ .Values.data.opaEnabled | quote }}
OPA_ENDPOINT: {{ .Values.data.opaEndpoint | quote }}
{{- if .Values.data.redisStorageHost }}
diff --git a/devops/gc/deploy/values.yaml b/devops/gc/deploy/values.yaml
index 5b9f3849f..92f1a39e7 100644
--- a/devops/gc/deploy/values.yaml
+++ b/devops/gc/deploy/values.yaml
@@ -10,7 +10,6 @@ global:
data:
# configmaps
logLevel: "ERROR"
- springProfilesActive: "gcp"
defaultDataCountry: "US"
storageServiceAccountEmail: "storage@service.local"
entitlementsHost: "http://entitlements"
diff --git a/pom.xml b/pom.xml
index bff901f4a..0fac6398e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,239 +14,231 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.opengroup.osdu</groupId>
- <artifactId>os-storage</artifactId>
- <version>0.26.0-SNAPSHOT</version>
- <description>Root Storage Service project</description>
-
- <properties>
- <java.version>17</java.version>
- <maven.compiler.target>17</maven.compiler.target>
- <maven.compiler.source>17</maven.compiler.source>
- <docker.image.prefix>opendes</docker.image.prefix>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <os-core-common.version>0.26.0-rc5</os-core-common.version>
- <jackson-databind.version>2.14.0</jackson-databind.version>
- <jackson.version>2.14.0</jackson.version>
- <netty.version>4.1.51.Final</netty.version>
- <snakeyaml.version>2.0</snakeyaml.version>
- <commons-codec.version>1.14</commons-codec.version>
- <nimbusds.version>7.9</nimbusds.version>
- <woodstox-core.version>6.5.1</woodstox-core.version>
- <log4j2.version>2.22.0</log4j2.version>
- <openapi.version>1.6.14</openapi.version>
- <json-smart.version>2.5.0</json-smart.version>
- </properties>
-
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <packaging>pom</packaging>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-bom</artifactId>
- <version>${netty.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>2.7.17</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>com.nimbusds</groupId>
- <artifactId>nimbus-jose-jwt</artifactId>
- <version>${nimbusds.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-databind</artifactId>
- <version>${jackson-databind.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${commons-codec.version}</version>
- </dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>${snakeyaml.version}</version>
- </dependency>
- <dependency>
- <groupId>org.opengroup.osdu</groupId>
- <artifactId>os-core-common</artifactId>
- <version>${os-core-common.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.woodstox</groupId>
- <artifactId>woodstox-core</artifactId>
- <version>${woodstox-core.version}</version>
- </dependency>
- <dependency>
- <groupId>net.minidev</groupId>
- <artifactId>json-smart</artifactId>
- <version>${json-smart.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <version>5.7.11</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>1.18.28</version>
- </dependency>
-
-
- <!--Swagger-->
- <dependency>
- <groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-ui</artifactId>
- <version>${openapi.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-webmvc-core</artifactId>
- <version>${openapi.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.plugin</groupId>
- <artifactId>spring-plugin-core</artifactId>
- <version>2.0.0.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.plugin</groupId>
- <artifactId>spring-plugin-metadata</artifactId>
- <version>2.0.0.RELEASE</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.plugin</groupId>
- <artifactId>spring-plugin-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-
- <modules>
- <module>storage-core</module>
- <module>provider/storage-gc</module>
- <module>provider/storage-azure</module>
- <module>provider/storage-aws</module>
- <module>provider/storage-ibm</module>
- <module>storage-core-plus</module>
- </modules>
-
- <repositories>
- <repository>
- <id>${repo.releases.id}</id>
- <url>${repo.releases.url}</url>
- </repository>
- </repositories>
-
- <distributionManagement>
- <repository>
- <id>${publish.releases.id}</id>
- <url>${publish.releases.url}</url>
- </repository>
- <snapshotRepository>
- <id>${publish.snapshots.id}</id>
- <url>${publish.snapshots.url}</url>
- </snapshotRepository>
- </distributionManagement>
-
- <profiles>
- <profile>
- <id>Default</id>
- <activation>
- <property>
- <name>!repo.releases.id</name>
- </property>
- </activation>
- <properties>
- <repo.releases.id>community-maven-repo</repo.releases.id>
- <publish.snapshots.id>community-maven-via-job-token</publish.snapshots.id>
- <publish.releases.id>community-maven-via-job-token</publish.releases.id>
- <repo.releases.url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</repo.releases.url>
- <publish.snapshots.url>https://community.opengroup.org/api/v4/projects/44/packages/maven</publish.snapshots.url>
- <publish.releases.url>https://community.opengroup.org/api/v4/projects/44/packages/maven</publish.releases.url>
- </properties>
- </profile>
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>3.0.0</version>
-
- <executions>
- <execution>
- <id>build-info</id>
- <goals>
- <goal>build-info</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>pl.project13.maven</groupId>
- <artifactId>git-commit-id-plugin</artifactId>
- <version>4.0.5</version>
- <executions>
- <execution>
- <goals>
- <goal>revision</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <verbose>true</verbose>
- <dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
- <generateGitPropertiesFile>true</generateGitPropertiesFile>
- <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
- </configuration>
- </plugin>
- </plugins>
- </build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.opengroup.osdu</groupId>
+ <artifactId>os-storage</artifactId>
+ <packaging>pom</packaging>
+ <version>0.26.0-SNAPSHOT</version>
+ <description>Root Storage Service project</description>
+
+ <properties>
+ <java.version>17</java.version>
+ <maven.compiler.target>17</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <docker.image.prefix>opendes</docker.image.prefix>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <os-core-common.version>0.26.0-rc2</os-core-common.version>
+ <netty.version>4.1.51.Final</netty.version>
+ <snakeyaml.version>2.0</snakeyaml.version>
+ <commons-codec.version>1.14</commons-codec.version>
+ <nimbusds.version>7.9</nimbusds.version>
+ <woodstox-core.version>6.5.1</woodstox-core.version>
+ <json-smart.version>2.5.0</json-smart.version>
+ <jackson.version>2.16.1</jackson.version>
+ <spring-framework-version>6.1.4</spring-framework-version>
+ <spring-boot.version>3.2.3</spring-boot.version>
+ <spring-security.version>6.2.2</spring-security.version>
+ </properties>
+
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-framework-bom</artifactId>
+ <version>${spring-framework-version}</version>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring-boot.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-bom</artifactId>
+ <version>${spring-security.version}</version>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.opengroup.osdu</groupId>
+ <artifactId>os-core-common-spring6</artifactId>
+ <version>${os-core-common.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-bom</artifactId>
+ <version>${jackson.version}</version>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-bom</artifactId>
+ <version>${netty.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>nimbus-jose-jwt</artifactId>
+ <version>${nimbusds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons-codec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>${snakeyaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
+ <version>${woodstox-core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ <version>${json-smart.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>1.18.28</version>
+ </dependency>
+
+
+ <!--Swagger-->
+ <dependency>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.springframework.plugin</groupId>
+ <artifactId>spring-plugin-core</artifactId>
+ <version>2.0.0.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.plugin</groupId>
+ <artifactId>spring-plugin-metadata</artifactId>
+ <version>2.0.0.RELEASE</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.plugin</groupId>
+ <artifactId>spring-plugin-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+ <modules>
+ <module>storage-core</module>
+ <module>storage-core-plus</module>
+ <module>provider/storage-aws</module>
+ <module>provider/storage-azure</module>
+ <module>provider/storage-gc</module>
+ <module>provider/storage-ibm</module>
+ </modules>
+
+ <repositories>
+ <repository>
+ <id>${repo.releases.id}</id>
+ <url>${repo.releases.url}</url>
+ </repository>
+ </repositories>
+
+ <distributionManagement>
+ <repository>
+ <id>${publish.releases.id}</id>
+ <url>${publish.releases.url}</url>
+ </repository>
+ <snapshotRepository>
+ <id>${publish.snapshots.id}</id>
+ <url>${publish.snapshots.url}</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <profiles>
+ <profile>
+ <id>Default</id>
+ <activation>
+ <property>
+ <name>!repo.releases.id</name>
+ </property>
+ </activation>
+ <properties>
+ <repo.releases.id>community-maven-repo</repo.releases.id>
+ <publish.snapshots.id>community-maven-via-job-token</publish.snapshots.id>
+ <publish.releases.id>community-maven-via-job-token</publish.releases.id>
+ <repo.releases.url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</repo.releases.url>
+ <publish.snapshots.url>https://community.opengroup.org/api/v4/projects/44/packages/maven
+ </publish.snapshots.url>
+ <publish.releases.url>https://community.opengroup.org/api/v4/projects/44/packages/maven
+ </publish.releases.url>
+ </properties>
+ </profile>
+ </profiles>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>3.0.0</version>
+
+ <executions>
+ <execution>
+ <id>build-info</id>
+ <goals>
+ <goal>build-info</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>pl.project13.maven</groupId>
+ <artifactId>git-commit-id-plugin</artifactId>
+ <version>4.0.5</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>revision</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <verbose>true</verbose>
+ <dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
+ <generateGitPropertiesFile>true</generateGitPropertiesFile>
+ <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties
+ </generateGitPropertiesFilename>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/provider/storage-aws/pom.xml b/provider/storage-aws/pom.xml
index 32d5355ad..4000f37db 100644
--- a/provider/storage-aws/pom.xml
+++ b/provider/storage-aws/pom.xml
@@ -39,28 +39,17 @@
<spring-webmvc.version>5.3.26</spring-webmvc.version>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opengroup.osdu</groupId>
- <artifactId>os-core-common</artifactId>
- <version>${os-core-common.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
<!-- Internal packages -->
<dependency>
<groupId>org.opengroup.osdu</groupId>
- <artifactId>os-core-common</artifactId>
+ <artifactId>os-core-common-spring6</artifactId>
</dependency>
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
- <version>0.26.0-rc2</version>
+ <version>0.26.0-spring6-rc1</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
@@ -95,33 +84,12 @@
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <version>${spring-webmvc.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <version>5.8.5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-core</artifactId>
- <version>9.0.85</version>
- </dependency>
<!-- Testing packages -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-inline</artifactId>
- <version>3.9.0</version>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>5.10.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -136,17 +104,29 @@
</dependency>
<dependency>
<groupId>de.flapdoodle.embed</groupId>
- <artifactId>de.flapdoodle.embed.mongo</artifactId>
+ <artifactId>de.flapdoodle.embed.mongo.spring31x</artifactId>
+ <version>4.11.0</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
+ <plugin>
+ <!-- Avoid errors like ` Mapping Parameter org.springframework.data.mapping.Parameter@8efd4ab3 does not have a name`-->
+ <!-- note that `spring-boot-starter-parent` (not used here) set also that option by default, see https://docs.spring.io/spring-boot/docs/current/maven-plugin/reference/htmlsingle/#using-->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.12.1</version>
+ <configuration>
+ <parameters>true</parameters>
+ </configuration>
+ </plugin>
+
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.2.3</version>
<executions>
<execution>
<goals>
@@ -162,7 +142,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.2.5</version>
<configuration>
<threadCount>1</threadCount>
</configuration>
diff --git a/provider/storage-aws/src/test/java/org/opengroup/osdu/storage/provider/aws/jobs/LegalComplianceChangeServiceAWSImplTest.java b/provider/storage-aws/src/test/java/org/opengroup/osdu/storage/provider/aws/jobs/LegalComplianceChangeServiceAWSImplTest.java
index aa1e7e836..1b535c53c 100644
--- a/provider/storage-aws/src/test/java/org/opengroup/osdu/storage/provider/aws/jobs/LegalComplianceChangeServiceAWSImplTest.java
+++ b/provider/storage-aws/src/test/java/org/opengroup/osdu/storage/provider/aws/jobs/LegalComplianceChangeServiceAWSImplTest.java
@@ -46,7 +46,7 @@ class LegalComplianceChangeServiceAWSImplTest {
private LegalComplianceChangeServiceAWSImpl service;
@Mock
- private IRecordsMetadataRepository repo;
+ private IRecordsMetadataRepository<String> recordsMetadataRepository;
@Mock
private IMessageBus storageMessageBus;
@@ -135,10 +135,10 @@ class LegalComplianceChangeServiceAWSImplTest {
expectedOutput.put(compliantRecordId, LegalCompliance.compliant);
// mock methods called
- Mockito.when(repo.queryByLegalTagName(Mockito.eq(incompliantTagName), Mockito.eq(500), Mockito.any()))
+ Mockito.when(recordsMetadataRepository.queryByLegalTagName(Mockito.eq(incompliantTagName), Mockito.eq(500), Mockito.any()))
.thenReturn(incompliantResult);
- Mockito.when(repo.queryByLegalTagName(Mockito.eq(compliantTagName), Mockito.eq(500), Mockito.any()))
+ Mockito.when(recordsMetadataRepository.queryByLegalTagName(Mockito.eq(compliantTagName), Mockito.eq(500), Mockito.any()))
.thenReturn(compliantResult);
ArgumentCaptor<PubSubInfo[]> pubSubArg = ArgumentCaptor.forClass(PubSubInfo[].class);
@@ -148,16 +148,16 @@ class LegalComplianceChangeServiceAWSImplTest {
// assert
// that create is called on the record returned for compliant
- Mockito.verify(repo, Mockito.times(1)).createOrUpdate(compliantRecordMetaDatas, Optional.empty());
+ Mockito.verify(recordsMetadataRepository, Mockito.times(1)).createOrUpdate(compliantRecordMetaDatas, Optional.empty());
// that storageMessageBus publishMessage is called with the right pubsubinfos
Mockito.verify(storageMessageBus, Mockito.times(2))
.publishMessage(Mockito.any(), pubSubArg.capture());
List<PubSubInfo[]> captured = pubSubArg.getAllValues();
- Object incompliantPubSubObj = captured.get(0);
- PubSubInfo incompliantPubSub = (PubSubInfo) incompliantPubSubObj;
- Object compliantPubSubObj = captured.get(1);
- PubSubInfo compliantPubSub = (PubSubInfo) compliantPubSubObj;
+ Object[] incompliantPubSubObj = captured.get(0);
+ PubSubInfo incompliantPubSub = (PubSubInfo) incompliantPubSubObj[0];
+ Object[] compliantPubSubObj = captured.get(1);
+ PubSubInfo compliantPubSub = (PubSubInfo) compliantPubSubObj[0];
Assert.assertEquals(incompliantPubSubInfos[0].getId(), incompliantPubSub.getId());
Assert.assertEquals(incompliantPubSubInfos[0].getOp(), incompliantPubSub.getOp());
diff --git a/provider/storage-aws/src/test/java/org/opengroup/osdu/storage/provider/aws/mongo/QueryRepositoryMongoTest.java b/provider/storage-aws/src/test/java/org/opengroup/osdu/storage/provider/aws/mongo/QueryRepositoryMongoTest.java
index af2a8e76b..baf78da26 100644
--- a/provider/storage-aws/src/test/java/org/opengroup/osdu/storage/provider/aws/mongo/QueryRepositoryMongoTest.java
+++ b/provider/storage-aws/src/test/java/org/opengroup/osdu/storage/provider/aws/mongo/QueryRepositoryMongoTest.java
@@ -16,7 +16,6 @@
package org.opengroup.osdu.storage.provider.aws.mongo;
-
import org.junit.jupiter.api.Test;
import org.opengroup.osdu.core.common.model.storage.DatastoreQueryResult;
import org.opengroup.osdu.storage.provider.aws.mongo.configuration.StorageTestConfig;
@@ -26,6 +25,7 @@ import org.opengroup.osdu.storage.provider.aws.mongo.util.RecordMetadataGenerato
import org.opengroup.osdu.storage.provider.aws.mongo.dto.RecordMetadataMongoDBDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest;
+import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import java.util.List;
@@ -37,6 +37,7 @@ import static org.junit.Assert.assertNull;
@DataMongoTest
@SpringJUnitConfig(classes = StorageTestConfig.class)
+@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
class QueryRepositoryMongoTest extends ParentUtil {
@Autowired
diff --git a/provider/storage-aws/src/test/java/org/opengroup/osdu/storage/provider/aws/mongo/RecordsMetadataRepositoryMongoTest.java b/provider/storage-aws/src/test/java/org/opengroup/osdu/storage/provider/aws/mongo/RecordsMetadataRepositoryMongoTest.java
index 84e0afa0f..e5c2e3cfe 100644
--- a/provider/storage-aws/src/test/java/org/opengroup/osdu/storage/provider/aws/mongo/RecordsMetadataRepositoryMongoTest.java
+++ b/provider/storage-aws/src/test/java/org/opengroup/osdu/storage/provider/aws/mongo/RecordsMetadataRepositoryMongoTest.java
@@ -27,6 +27,7 @@ import org.opengroup.osdu.storage.provider.aws.mongo.util.RecordMetadataGenerato
import org.opengroup.osdu.storage.provider.aws.mongo.dto.RecordMetadataMongoDBDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest;
+import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import java.util.AbstractMap;
@@ -42,6 +43,7 @@ import static org.junit.Assert.assertTrue;
@DataMongoTest
@SpringJUnitConfig(classes = StorageTestConfig.class)
+@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
class RecordsMetadataRepositoryMongoTest extends ParentUtil {
@Autowired
diff --git a/provider/storage-aws/src/test/resources/application.properties b/provider/storage-aws/src/test/resources/application.properties
index 31fdd1a33..d9ba9a7a9 100644
--- a/provider/storage-aws/src/test/resources/application.properties
+++ b/provider/storage-aws/src/test/resources/application.properties
@@ -1,12 +1,9 @@
-#embedded mongo
-#used for setting up necessary embedded mongo port
spring.data.mongodb.port=27019
-spring.mongodb.embedded.version=3.5.5
#testing context configuration
spring.main.allow-bean-definition-overriding=true
repository.implementation=mongodb
spring.profiles.active=noswagger
-spring.mongodb.embedded.version=3.5.5
+de.flapdoodle.mongodb.embedded.version=5.0.22
OSDU_TOPIC=${OSDU_STORAGE_TOPIC:records-changed}
diff --git a/provider/storage-azure/pom.xml b/provider/storage-azure/pom.xml
index 2a7d6d773..ed328cb1f 100644
--- a/provider/storage-azure/pom.xml
+++ b/provider/storage-azure/pom.xml
@@ -27,19 +27,19 @@
<artifactId>storage-azure</artifactId>
<description>Storage service on Azure</description>
<packaging>jar</packaging>
-
+
<properties>
<java.version>17</java.version>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
- <osdu.corelibazure.version>0.26.0-rc5</osdu.corelibazure.version>
+ <osdu.corelibazure.version>0.26.0-rc6</osdu.corelibazure.version>
<osdu.storage-core.version>0.26.0-SNAPSHOT</osdu.storage-core.version>
<junit.version>4.12</junit.version>
<mockito.version>1.10.19</mockito.version>
<nimbus-jose-jwt-azure.version>9.30.2</nimbus-jose-jwt-azure.version>
- <azure-storage-blob.version>12.10.2</azure-storage-blob.version>
- <azure-spring-data-cosmos.version>3.21.0</azure-spring-data-cosmos.version>
- <spring-webmvc.version>5.3.22</spring-webmvc.version>
+ <azure-storage-blob.version>12.25.2</azure-storage-blob.version>
+ <azure-spring-data-cosmos.version>5.9.1</azure-spring-data-cosmos.version>
+ <spring-webmvc.version>6.1.4</spring-webmvc.version>
<netty.version>4.1.101.Final</netty.version>
<woodstox-core.version>6.4.0</woodstox-core.version>
<argLine>
@@ -66,17 +66,17 @@
<scope>import</scope>
</dependency>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>2.7.17</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring-boot.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
<!-- Inherit managed dependencies from core-lib-azure -->
<dependency>
<groupId>org.opengroup.osdu</groupId>
- <artifactId>core-lib-azure</artifactId>
+ <artifactId>core-lib-azure-spring6</artifactId>
<version>${osdu.corelibazure.version}</version>
<type>pom</type>
<scope>import</scope>
@@ -96,47 +96,10 @@
<artifactId>azure-spring-data-cosmos</artifactId>
<version>${azure-spring-data-cosmos.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jul</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
- <dependency>
- <!--Azure core has xml deserialization issue after 1.34 due to headers not fetched from
- NettyToAzureCoreHttpHeadersWrapper class and fails in undelete/restore soft-deleted blobs path during record read
- If we use azure-core-http-netty there is no such issue and we get azure-core 1.35 which
- is the current version in core-lib-azure -->
- <!--Also refer to this issue for more details -->
- <!--https://community.opengroup.org/osdu/platform/system/lib/cloud/azure/os-core-lib-azure/-/issues/32 -->
- <artifactId>azure-core-http-netty</artifactId>
- <groupId>com.azure</groupId>
- <version>1.12.8</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/com.nimbusds/nimbus-jose-jwt -->
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
@@ -144,7 +107,8 @@
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
- <artifactId>azure-spring-boot-starter-active-directory</artifactId>
+ <artifactId>spring-cloud-azure-starter-active-directory</artifactId>
+ <version>5.10.0</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
@@ -185,7 +149,7 @@
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
- <artifactId>core-lib-azure</artifactId>
+ <artifactId>core-lib-azure-spring6</artifactId>
<version>${osdu.corelibazure.version}</version>
<exclusions>
<exclusion>
@@ -198,9 +162,14 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.36</version>
+ </dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
- <artifactId>os-core-common</artifactId>
+ <artifactId>os-core-common-spring6</artifactId>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
@@ -280,7 +249,11 @@
<artifactId>okio</artifactId>
<version>${okio.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>6.0.0</version>
+ </dependency>
</dependencies>
<build>
@@ -288,7 +261,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.2.3</version>
<executions>
<execution>
<goals>
@@ -296,7 +269,7 @@
</goals>
<configuration>
<classifier>spring-boot</classifier>
- <mainClass>org.opengroup.osdu.storage.provider.azure.StorageApplication</mainClass>
+ <mainClass>org.opengroup.osdu.storage.provider.azure.StorageAzureApplication</mainClass>
</configuration>
</execution>
</executions>
@@ -359,18 +332,18 @@
</excludes>
</configuration>
<executions>
- <execution>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>report</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
+ <execution>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>report</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
</plugins>
diff --git a/provider/storage-azure/src/main/java/org/opengroup/osdu/storage/provider/azure/StorageApplication.java b/provider/storage-azure/src/main/java/org/opengroup/osdu/storage/provider/azure/StorageAzureApplication.java
similarity index 93%
rename from provider/storage-azure/src/main/java/org/opengroup/osdu/storage/provider/azure/StorageApplication.java
rename to provider/storage-azure/src/main/java/org/opengroup/osdu/storage/provider/azure/StorageAzureApplication.java
index 9875197f8..ae877c8ef 100644
--- a/provider/storage-azure/src/main/java/org/opengroup/osdu/storage/provider/azure/StorageApplication.java
+++ b/provider/storage-azure/src/main/java/org/opengroup/osdu/storage/provider/azure/StorageAzureApplication.java
@@ -34,10 +34,10 @@ import org.springframework.context.annotation.PropertySource;
)
@PropertySource("classpath:swagger.properties")
@SpringBootApplication
-public class StorageApplication {
+public class StorageAzureApplication {
public static void main(String[] args) {
- SpringApplication.run(StorageApplication.class, args);
+ SpringApplication.run(StorageAzureApplication.class, args);
}
}
diff --git a/provider/storage-azure/src/main/java/org/opengroup/osdu/storage/provider/azure/security/AADSecurityConfig.java b/provider/storage-azure/src/main/java/org/opengroup/osdu/storage/provider/azure/security/AADSecurityConfig.java
index d50bce003..748805db5 100644
--- a/provider/storage-azure/src/main/java/org/opengroup/osdu/storage/provider/azure/security/AADSecurityConfig.java
+++ b/provider/storage-azure/src/main/java/org/opengroup/osdu/storage/provider/azure/security/AADSecurityConfig.java
@@ -16,42 +16,44 @@ package org.opengroup.osdu.storage.provider.azure.security;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.context.annotation.Bean;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.web.SecurityFilterChain;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-
-import com.azure.spring.autoconfigure.aad.AADAppRoleStatelessAuthenticationFilter;
+import com.azure.spring.cloud.autoconfigure.implementation.aad.filter.AadAppRoleStatelessAuthenticationFilter;
@EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled = true)
+@EnableMethodSecurity
@ConditionalOnProperty(value = "azure.istio.auth.enabled", havingValue = "false", matchIfMissing = false)
-public class AADSecurityConfig extends WebSecurityConfigurerAdapter {
+public class AADSecurityConfig {
+
+ private static final String[] AUTH_ALLOWLIST = {"/", "/index.html",
+ "/api-docs.yaml",
+ "/api-docs/swagger-config",
+ "/api-docs/**",
+ "/configuration/security",
+ "/configuration/ui",
+ "/swagger",
+ "/swagger-ui.html",
+ "/swagger-ui/**",
+ "/swagger-resources/**",
+ "/webjars/**"
+ };
+
@Autowired
- private AADAppRoleStatelessAuthenticationFilter appRoleAuthFilter;
+ private AadAppRoleStatelessAuthenticationFilter appRoleAuthFilter;
- @Override
- protected void configure(HttpSecurity http) throws Exception {
- http
- .csrf().disable()
- .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.NEVER)
- .and()
- .authorizeRequests()
- .antMatchers("/", "/index.html",
- "/api-docs.yaml",
- "/api-docs/swagger-config",
- "/api-docs/**",
- "/configuration/security",
- "/configuration/ui",
- "/swagger",
- "/swagger-ui.html",
- "/swagger-ui/**",
- "/swagger-resources/**",
- "/webjars/**").permitAll()
- .anyRequest().authenticated()
- .and()
- .addFilterBefore(appRoleAuthFilter, UsernamePasswordAuthenticationFilter.class);
+ @Bean
+ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+ return http
+ .csrf(AbstractHttpConfigurer::disable)
+ .sessionManagement((sess) -> sess.sessionCreationPolicy(SessionCreationPolicy.NEVER))
+ .authorizeHttpRequests(request -> request.requestMatchers(AUTH_ALLOWLIST).permitAll())
+ .addFilterBefore(appRoleAuthFilter, UsernamePasswordAuthenticationFilter.class)
+ .build();
}
}
diff --git a/provider/storage-azure/src/main/java/org/opengroup/osdu/storage/provider/azure/security/AzureIstioSecurityConfig.java b/provider/storage-azure/src/main/java/org/opengroup/osdu/storage/provider/azure/security/AzureIstioSecurityConfig.java
index 1fe473f2a..8453334f8 100644
--- a/provider/storage-azure/src/main/java/org/opengroup/osdu/storage/provider/azure/security/AzureIstioSecurityConfig.java
+++ b/provider/storage-azure/src/main/java/org/opengroup/osdu/storage/provider/azure/security/AzureIstioSecurityConfig.java
@@ -14,22 +14,31 @@
package org.opengroup.osdu.storage.provider.azure.security;
-
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.web.SecurityFilterChain;
+import static org.springframework.security.config.Customizer.withDefaults;
+@Configuration
@EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled = true)
+@EnableMethodSecurity
@ConditionalOnProperty(value = "azure.istio.auth.enabled", havingValue = "true", matchIfMissing = true)
-public class AzureIstioSecurityConfig extends WebSecurityConfigurerAdapter {
+public class AzureIstioSecurityConfig {
- @Override
- protected void configure(HttpSecurity http) throws Exception {
- http.httpBasic().disable()
- .csrf().disable(); //AuthN is disabled. AuthN is handled by sidecar proxy
+ @Bean
+ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+ http
+ .cors(AbstractHttpConfigurer::disable)
+ .csrf(AbstractHttpConfigurer::disable)
+ .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+ .authorizeHttpRequests(authorize -> authorize.anyRequest().permitAll())
+ .httpBasic(withDefaults());
+ return http.build();
}
}
diff --git a/provider/storage-azure/src/test/java/org/opengroup/osdu/storage/provider/azure/api/SchemaEndToEndTest.java b/provider/storage-azure/src/test/java/org/opengroup/osdu/storage/provider/azure/api/SchemaEndToEndTest.java
index c1e6f31bc..fd9d7015b 100644
--- a/provider/storage-azure/src/test/java/org/opengroup/osdu/storage/provider/azure/api/SchemaEndToEndTest.java
+++ b/provider/storage-azure/src/test/java/org/opengroup/osdu/storage/provider/azure/api/SchemaEndToEndTest.java
@@ -14,7 +14,7 @@
package org.opengroup.osdu.storage.provider.azure.api;
-import com.azure.spring.autoconfigure.aad.UserPrincipal;
+import com.azure.spring.cloud.autoconfigure.implementation.aad.filter.UserPrincipal;
import com.nimbusds.jose.JWSAlgorithm;
import com.nimbusds.jose.JWSObject;
import com.nimbusds.jose.Payload;
diff --git a/provider/storage-gc/pom.xml b/provider/storage-gc/pom.xml
index 781dc5daa..955749fc1 100644
--- a/provider/storage-gc/pom.xml
+++ b/provider/storage-gc/pom.xml
@@ -35,29 +35,11 @@
<java.version>17</java.version>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
- <log4j.version>2.17.1</log4j.version>
- <spring-webmvc.version>5.3.22</spring-webmvc.version>
+ <spring-webmvc.version>6.1.3</spring-webmvc.version>
</properties>
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>2.7.17</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
@@ -76,8 +58,8 @@
<dependencies>
<dependency>
<groupId>org.opengroup.osdu</groupId>
- <artifactId>core-lib-gc</artifactId>
- <version>0.25.0</version>
+ <artifactId>core-lib-gc-spring6</artifactId>
+ <version>0.26.0-rc5</version>
</dependency>
<!-- Mappers -->
<dependency>
@@ -124,6 +106,13 @@
<artifactId>spring-webmvc</artifactId>
<version>${spring-webmvc.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
@@ -131,11 +120,12 @@
</dependency>
<!-- Testing packages -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>5.10.2</version>
<scope>test</scope>
</dependency>
+
</dependencies>
<build>
diff --git a/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/security/GSuiteSecurityConfig.java b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/security/GSuiteSecurityConfig.java
index c4b39b2da..8b0a1e930 100644
--- a/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/security/GSuiteSecurityConfig.java
+++ b/provider/storage-gc/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/security/GSuiteSecurityConfig.java
@@ -17,19 +17,32 @@
package org.opengroup.osdu.storage.provider.gcp.web.security;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.web.SecurityFilterChain;
+import static org.springframework.security.config.Customizer.withDefaults;
+
+@Configuration
@EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled = true)
-public class GSuiteSecurityConfig extends WebSecurityConfigurerAdapter {
+@EnableMethodSecurity
+public class GSuiteSecurityConfig {
+
- @Override
- protected void configure(HttpSecurity httpSecurity) throws Exception {
- httpSecurity
- .httpBasic().disable()
- .csrf().disable(); //disable default authN. AuthN handled by endpoints proxy
+ @Bean
+ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+ http
+ .cors(AbstractHttpConfigurer::disable)
+ .csrf(AbstractHttpConfigurer::disable)
+ .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+ .authorizeHttpRequests(authorize -> authorize.anyRequest().permitAll())
+ .httpBasic(withDefaults());
+ return http.build();
}
+
}
diff --git a/provider/storage-ibm/pom.xml b/provider/storage-ibm/pom.xml
index 5fe1c1624..85bba306b 100644
--- a/provider/storage-ibm/pom.xml
+++ b/provider/storage-ibm/pom.xml
@@ -29,7 +29,7 @@
<java.version>17</java.version>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
- <os-core-lib-ibm.version>0.25.0</os-core-lib-ibm.version>
+ <os-core-lib-ibm.version>0.26.0-rc8</os-core-lib-ibm.version>
<start-class>org.opengroup.osdu.storage.provider.ibm.app.StorageIBMApplication</start-class>
<jackson-dataformat-cbor.version>2.11.4</jackson-dataformat-cbor.version>
<tomcat-embed-core.version>9.0.70</tomcat-embed-core.version>
@@ -46,10 +46,17 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jcl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
+ <version>6.2.1</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
@@ -93,11 +100,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-core</artifactId>
- <version>${tomcat-embed-core.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
diff --git a/provider/storage-ibm/src/main/java/org/opengroup/osdu/storage/provider/ibm/app/StorageIBMApplication.java b/provider/storage-ibm/src/main/java/org/opengroup/osdu/storage/provider/ibm/app/StorageIBMApplication.java
index edf5f18c2..d99cae9bd 100644
--- a/provider/storage-ibm/src/main/java/org/opengroup/osdu/storage/provider/ibm/app/StorageIBMApplication.java
+++ b/provider/storage-ibm/src/main/java/org/opengroup/osdu/storage/provider/ibm/app/StorageIBMApplication.java
@@ -6,11 +6,12 @@ import jakarta.annotation.PostConstruct;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.PropertySource;
-@SpringBootApplication
+@SpringBootApplication(exclude = SecurityAutoConfiguration.class)
@PropertySource("classpath:swagger.properties")
@ComponentScan({"org.opengroup.osdu"})
public class StorageIBMApplication {
diff --git a/provider/storage-ibm/src/main/java/org/opengroup/osdu/storage/provider/ibm/security/SecurityConfig.java b/provider/storage-ibm/src/main/java/org/opengroup/osdu/storage/provider/ibm/security/SecurityConfig.java
index 29c2e46c9..080fd4173 100644
--- a/provider/storage-ibm/src/main/java/org/opengroup/osdu/storage/provider/ibm/security/SecurityConfig.java
+++ b/provider/storage-ibm/src/main/java/org/opengroup/osdu/storage/provider/ibm/security/SecurityConfig.java
@@ -3,26 +3,30 @@
package org.opengroup.osdu.storage.provider.ibm.security;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.web.SecurityFilterChain;
+import static org.springframework.security.config.Customizer.withDefaults;
+
+
+@Configuration
@EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled = true)
-public class SecurityConfig extends WebSecurityConfigurerAdapter {
- @Override
- protected void configure(HttpSecurity http) throws Exception {
+@EnableMethodSecurity
+public class SecurityConfig {
+ @Bean
+ public SecurityFilterChain defaultFilterChain(HttpSecurity http) throws Exception {
http
- .csrf().disable();
- // .authorizeRequests()
- // .antMatchers("/v2/api-docs",
- // "/health",
- // "/configuration/ui",
- // "/swagger-resources/**",
- // "/configuration/security",
- // "/swagger-ui.html",
- // "/webjars/**").permitAll()
- // .anyRequest().authenticated().and().oauth2ResourceServer().jwt();
+ .cors(AbstractHttpConfigurer::disable)
+ .csrf(AbstractHttpConfigurer::disable)
+ .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+ .authorizeHttpRequests(authorize -> authorize.anyRequest().permitAll())
+ .httpBasic(withDefaults());
+ return http.build();
}
}
diff --git a/storage-core-plus/pom.xml b/storage-core-plus/pom.xml
index e4aaf4c49..350c67b46 100644
--- a/storage-core-plus/pom.xml
+++ b/storage-core-plus/pom.xml
@@ -18,45 +18,57 @@
<java.version>17</java.version>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
- <log4j.version>2.17.1</log4j.version>
- <spring-webmvc.version>5.3.22</spring-webmvc.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${log4j.version}</version>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.9.1</version>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
- <version>${log4j.version}</version>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-framework-bom</artifactId>
+ <version>6.1.4</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
- <version>2.7.17</version>
+ <version>3.2.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
-
<dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>2.9.1</version>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-bom</artifactId>
+ <version>6.2.2</version>
+ <type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
-
+ <dependency>
+ <groupId>org.opengroup.osdu</groupId>
+ <artifactId>storage-core</artifactId>
+ <version>0.26.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-plus-common-lib</artifactId>
<version>0.24.0-rc3</version>
</dependency>
-
<!-- Mappers -->
<dependency>
<groupId>org.opengroup.osdu</groupId>
@@ -73,23 +85,6 @@
<artifactId>os-obm-core</artifactId>
<version>0.25.0-rc1</version>
</dependency>
-
-
- <dependency>
- <groupId>org.opengroup.osdu</groupId>
- <artifactId>storage-core</artifactId>
- <version>0.26.0-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>ch.qos.logback.contrib</groupId>
<artifactId>logback-json-classic</artifactId>
@@ -102,13 +97,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
- <version>${spring-webmvc.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+
<!-- Testing packages -->
<dependency>
<groupId>junit</groupId>
diff --git a/storage-core-plus/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/security/GSuiteSecurityConfig.java b/storage-core-plus/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/security/GSuiteSecurityConfig.java
index c4b39b2da..c24434461 100644
--- a/storage-core-plus/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/security/GSuiteSecurityConfig.java
+++ b/storage-core-plus/src/main/java/org/opengroup/osdu/storage/provider/gcp/web/security/GSuiteSecurityConfig.java
@@ -17,19 +17,31 @@
package org.opengroup.osdu.storage.provider.gcp.web.security;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.web.SecurityFilterChain;
+import static org.springframework.security.config.Customizer.withDefaults;
+
+@Configuration
@EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled = true)
-public class GSuiteSecurityConfig extends WebSecurityConfigurerAdapter {
+@EnableMethodSecurity
+public class GSuiteSecurityConfig {
- @Override
- protected void configure(HttpSecurity httpSecurity) throws Exception {
- httpSecurity
- .httpBasic().disable()
- .csrf().disable(); //disable default authN. AuthN handled by endpoints proxy
+ @Bean
+ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+ http
+ .cors(AbstractHttpConfigurer::disable)
+ .csrf(AbstractHttpConfigurer::disable)
+ .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+ .authorizeHttpRequests(authorize -> authorize.anyRequest().permitAll())
+ .httpBasic(withDefaults());
+ return http.build();
}
+
}
diff --git a/storage-core/pom.xml b/storage-core/pom.xml
index 027b70cd4..22ad58e05 100644
--- a/storage-core/pom.xml
+++ b/storage-core/pom.xml
@@ -14,219 +14,211 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>storage-core</artifactId>
- <description>Core project for the storage service</description>
- <packaging>jar</packaging>
-
- <parent>
- <groupId>org.opengroup.osdu</groupId>
- <artifactId>os-storage</artifactId>
- <version>0.26.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <properties>
- <java.version>17</java.version>
- <maven.compiler.target>17</maven.compiler.target>
- <maven.compiler.source>17</maven.compiler.source>
- <spring-webmvc.version>5.3.22</spring-webmvc.version>
- <argLine>
- --add-opens=java.base/java.util=ALL-UNNAMED
- --add-opens java.base/java.lang=ALL-UNNAMED
- --add-opens java.base/java.lang.reflect=ALL-UNNAMED
- --add-opens java.base/java.text=ALL-UNNAMED
- </argLine>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opengroup.osdu</groupId>
- <artifactId>os-core-common</artifactId>
- <version>${os-core-common.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </dependency>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>storage-core</artifactId>
+ <description>Core project for the storage service</description>
+ <packaging>jar</packaging>
+
+ <parent>
+ <groupId>org.opengroup.osdu</groupId>
+ <artifactId>os-storage</artifactId>
+ <version>0.26.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <properties>
+ <java.version>17</java.version>
+ <maven.compiler.target>17</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <argLine>
+ --add-opens=java.base/java.util=ALL-UNNAMED
+ --add-opens java.base/java.lang=ALL-UNNAMED
+ --add-opens java.base/java.lang.reflect=ALL-UNNAMED
+ --add-opens java.base/java.text=ALL-UNNAMED
+ </argLine>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.opengroup.osdu</groupId>
+ <artifactId>os-core-common-spring6</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.opengroup.osdu</groupId>
- <artifactId>os-core-common</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ </dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
- <version>5.8.5</version>
</dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-tomcat</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-security</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-security</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-validation</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-validation</artifactId>
+ </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>2.10.1</version>
- </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.10.1</version>
+ </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- <version>${spring-webmvc.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ </dependency>
- <dependency>
- <groupId>com.github.java-json-tools</groupId>
- <artifactId>json-patch</artifactId>
- <version>1.13</version>
- </dependency>
+ <dependency>
+ <groupId>com.github.java-json-tools</groupId>
+ <artifactId>json-patch</artifactId>
+ <version>1.13</version>
+ </dependency>
- <dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- <version>2.1.1</version>
- </dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>2.1.1</version>
+ </dependency>
- <dependency>
- <groupId>jakarta.inject</groupId>
- <artifactId>jakarta.inject-api</artifactId>
- <version>2.0.1</version>
- </dependency>
+ <dependency>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ <version>2.0.1</version>
+ </dependency>
- <dependency>
- <groupId>jakarta.validation</groupId>
- <artifactId>jakarta.validation-api</artifactId>
- <version>3.0.2</version>
- </dependency>
+ <dependency>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
+ <version>3.0.2</version>
+ </dependency>
- <dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
- <version>6.0.0</version>
- </dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>6.0.0</version>
+ </dependency>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>4.0.2</version>
- </dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>4.0.2</version>
+ </dependency>
- <!-- test dependencies -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- </dependency>
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-common</artifactId>
- <version>2.22.2</version>
- <scope>test</scope>
- </dependency>
- <!--<!– https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito2 –>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito2</artifactId>
- <version>2.0.2</version>
- <scope>test</scope>
- </dependency>-->
- <!-- https://mvnrepository.com/artifact/org.powermock/powermock-module-junit4 -->
+ <dependency>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-common</artifactId>
+ <version>2.22.2</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>2.0.2-beta</version>
- </dependency>
-
- <!--<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>4.11.0</version>
+ <version>5.11.0</version>
<scope>test</scope>
- </dependency>-->
+ </dependency>
+
+
+ <!--<dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>4.11.0</version>
+ <scope>test</scope>
+ </dependency>-->
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>3.0.0</version>
- <executions>
- <execution>
- <goals>
- <goal>repackage</goal>
- </goals>
- <configuration>
- <classifier>spring-boot</classifier>
- <mainClass>
- org.opengroup.osdu.storage.StorageApplication
- </mainClass>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
- <configuration>
- <argLine>@{argLine} --add-opens java.base/java.lang=ALL_UNNAMED</argLine>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.10</version>
- <configuration>
- <excludes></excludes>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>report</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- Avoid errors like ` Mapping Parameter org.springframework.data.mapping.Parameter@8efd4ab3 does not have a name`-->
+ <!-- note that `spring-boot-starter-parent` (not used here) set also that option by default, see https://docs.spring.io/spring-boot/docs/current/maven-plugin/reference/htmlsingle/#using-->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.12.1</version>
+ <configuration>
+ <parameters>true</parameters>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>3.2.3</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ <configuration>
+ <classifier>spring-boot</classifier>
+ <mainClass>
+ org.opengroup.osdu.storage.StorageApplication
+ </mainClass>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.2</version>
+ <configuration>
+ <argLine>@{argLine} --add-opens java.base/java.lang=ALL_UNNAMED</argLine>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>0.8.10</version>
+ <configuration>
+ <excludes></excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>report</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/storage-core/src/main/java/org/opengroup/osdu/storage/util/GlobalExceptionMapper.java b/storage-core/src/main/java/org/opengroup/osdu/storage/util/GlobalExceptionMapper.java
index 0419190f3..9ba3ae67f 100644
--- a/storage-core/src/main/java/org/opengroup/osdu/storage/util/GlobalExceptionMapper.java
+++ b/storage-core/src/main/java/org/opengroup/osdu/storage/util/GlobalExceptionMapper.java
@@ -42,6 +42,7 @@ import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
import org.springframework.http.ResponseEntity;
import org.springframework.http.converter.HttpMessageNotReadableException;
import org.springframework.lang.NonNull;
@@ -152,7 +153,7 @@ public class GlobalExceptionMapper extends ResponseEntityExceptionHandler {
@NonNull
protected ResponseEntity<Object> handleHttpRequestMethodNotSupported(@NonNull HttpRequestMethodNotSupportedException e,
@NonNull HttpHeaders headers,
- @NonNull HttpStatus status,
+ @NonNull HttpStatusCode status,
@NonNull WebRequest request) {
return this.getErrorResponse(
new AppException(org.apache.http.HttpStatus.SC_METHOD_NOT_ALLOWED, "Method not found.",
@@ -163,7 +164,7 @@ public class GlobalExceptionMapper extends ResponseEntityExceptionHandler {
@NonNull
protected ResponseEntity<Object> handleHttpMessageNotReadable(@NonNull HttpMessageNotReadableException e,
@NonNull HttpHeaders headers,
- @NonNull HttpStatus status,
+ @NonNull HttpStatusCode status,
@NonNull WebRequest request) {
if (e.getCause() instanceof ValueInstantiationException) {
return this.getErrorResponse(
diff --git a/storage-core/src/test/java/org/opengroup/osdu/storage/SecurityConfig.java b/storage-core/src/test/java/org/opengroup/osdu/storage/SecurityConfig.java
deleted file mode 100644
index 63c462359..000000000
--- a/storage-core/src/test/java/org/opengroup/osdu/storage/SecurityConfig.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2017-2023, Schlumberger
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.opengroup.osdu.storage;
-
-import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-
-@TestConfiguration
-@EnableGlobalMethodSecurity(prePostEnabled = true)
-public class SecurityConfig extends WebSecurityConfigurerAdapter {
- @Override
- protected void configure(HttpSecurity httpSecurity) throws Exception {
- httpSecurity.httpBasic().disable().csrf().disable();
- }
-}
diff --git a/storage-core/src/test/java/org/opengroup/osdu/storage/SecurityConfiguration.java b/storage-core/src/test/java/org/opengroup/osdu/storage/SecurityConfiguration.java
new file mode 100644
index 000000000..5d7c8ad97
--- /dev/null
+++ b/storage-core/src/test/java/org/opengroup/osdu/storage/SecurityConfiguration.java
@@ -0,0 +1,51 @@
+// Copyright 2017-2023, Schlumberger
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.opengroup.osdu.storage;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.web.SecurityFilterChain;
+
+import static org.springframework.security.config.Customizer.withDefaults;
+
+
+@Configuration
+@EnableWebSecurity
+@EnableMethodSecurity
+public class SecurityConfiguration {
+ private static final String[] AUTH_ALLOWLIST = {
+ "/records",
+ "/records/**",
+ };
+
+ @Bean
+ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+ http
+ .cors(AbstractHttpConfigurer::disable)
+ .csrf(AbstractHttpConfigurer::disable)
+ .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+ .authorizeHttpRequests(authorize -> authorize
+ .requestMatchers(AUTH_ALLOWLIST).permitAll()
+ .anyRequest().denyAll()
+ )
+ .httpBasic(withDefaults());
+ return http.build();
+ }
+}
diff --git a/storage-core/src/test/java/org/opengroup/osdu/storage/service/PersistenceServiceImplTest.java b/storage-core/src/test/java/org/opengroup/osdu/storage/service/PersistenceServiceImplTest.java
index e4a527870..5ef934a76 100644
--- a/storage-core/src/test/java/org/opengroup/osdu/storage/service/PersistenceServiceImplTest.java
+++ b/storage-core/src/test/java/org/opengroup/osdu/storage/service/PersistenceServiceImplTest.java
@@ -396,7 +396,7 @@ public class PersistenceServiceImplTest {
for (RecordMetadata metadata : recordMetadataList)
jsonPatchPerRecord.put(metadata, jsonPatchInput);
patchErrors = this.sut.patchRecordsMetadata(jsonPatchPerRecord, Optional.empty());
- verify(pubSubClient, times(1)).publishMessage(eq(headers), any());
+ verify(pubSubClient, times(1)).publishMessage(eq(headers), any(PubSubInfo[].class));
assertTrue(patchErrors.isEmpty());
}
@@ -410,7 +410,7 @@ public class PersistenceServiceImplTest {
for (RecordMetadata metadata : recordMetadataList)
jsonPatchPerRecord.put(metadata, jsonPatchInput);
patchErrors = this.sut.patchRecordsMetadata(jsonPatchPerRecord, Optional.empty());
- verify(pubSubClient, times(1)).publishMessage(eq(headers), any());
+ verify(pubSubClient, times(1)).publishMessage(eq(headers), any(PubSubInfo[].class));
assertTrue(patchErrors.isEmpty());
}
@@ -517,13 +517,15 @@ public class PersistenceServiceImplTest {
@SuppressWarnings("unchecked")
private void assertPubsubInfo(int successfullRecords, Object capturedPubsubList) {
-
- List<PubSubInfo> pubsubList = (ArrayList<PubSubInfo>) capturedPubsubList;
-
- assertEquals(successfullRecords, pubsubList.size());
-
- for (int i = 0; i < pubsubList.size(); i++) {
- PubSubInfo pubSubInfo = pubsubList.get(i);
+ List<PubSubInfo[]> pubsubList = (ArrayList<PubSubInfo[]>) capturedPubsubList;
+ // Captured variable arguments are inside an ArrayList of size 1
+ // if you find a better way to capture them, feel free to improve
+ assertEquals(1, pubsubList.size());
+ PubSubInfo[] innerList = pubsubList.get(0);
+
+ assertEquals(successfullRecords, innerList.length);
+ for (int i = 0; i < innerList.length; i++) {
+ PubSubInfo pubSubInfo = innerList[i];
assertEquals("anyKind", pubSubInfo.getKind());
assertEquals(i % 2 == 0 ? OperationType.create : OperationType.update, pubSubInfo.getOp());
assertNull(pubSubInfo.getPreviousVersionKind());
@@ -533,12 +535,16 @@ public class PersistenceServiceImplTest {
private void assertRecordChangedV2Info(int successfullRecords, Object capturedRecordChangedV2List) {
- List<RecordChangedV2> recordChangedV2s = (ArrayList<RecordChangedV2>) capturedRecordChangedV2List;
+ List<RecordChangedV2[]> recordChangedV2s = (ArrayList<RecordChangedV2[]>) capturedRecordChangedV2List;
+ // Captured variable arguments are inside an ArrayList of size 1
+ // if you find a better way to capture them, feel free to improve
+ assertEquals(1, recordChangedV2s.size());
+ RecordChangedV2[] innerList = recordChangedV2s.get(0);
- assertEquals(successfullRecords, recordChangedV2s.size());
+ assertEquals(successfullRecords, innerList.length);
- for (int i = 0; i < recordChangedV2s.size(); i++) {
- RecordChangedV2 recordChangedV2 = recordChangedV2s.get(i);
+ for (int i = 0; i < innerList.length; i++) {
+ RecordChangedV2 recordChangedV2 = innerList[i];
assertEquals("anyKind", recordChangedV2.getKind());
assertEquals(i % 2 == 0 ? OperationType.create : OperationType.update, recordChangedV2.getOp());
assertNull(recordChangedV2.getPreviousVersionKind());
diff --git a/testing/pom.xml b/testing/pom.xml
index 77c1c2d00..7661c04b0 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -35,20 +35,20 @@
<module>storage-test-azure</module>
<module>storage-test-gc</module>
<module>storage-test-ibm</module>
- <module>storage-test-baremetal</module>
- </modules>
+ <module>storage-test-baremetal</module>
+ </modules>
<properties>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
- <os-core-common.version>0.25.0</os-core-common.version>
+ <os-core-common.version>0.26.0-rc2</os-core-common.version>
<java.version>17</java.version>
- <log4j.version>2.17.1</log4j.version>
- <jackson.version>2.13.2</jackson.version>
- <jackson-databind.version>2.13.2.2</jackson-databind.version>
- <maven-surefire-plugin.version>3.0.0-M3</maven-surefire-plugin.version>
+ <log4j.version>2.23.0</log4j.version>
+ <jackson.version>2.16.1</jackson.version>
+ <jackson-databind.version>2.16.1</jackson-databind.version>
+ <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
<argLine>
- --add-opens java.base/java.lang=ALL-UNNAMED
+ --add-opens java.base/java.lang=ALL-UNNAMED
</argLine>
</properties>
diff --git a/testing/storage-test-aws/pom.xml b/testing/storage-test-aws/pom.xml
index e971051aa..3f188507a 100644
--- a/testing/storage-test-aws/pom.xml
+++ b/testing/storage-test-aws/pom.xml
@@ -41,12 +41,12 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
- <version>0.26.0-rc2</version>
+ <version>0.26.0-spring6-rc1</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
- <artifactId>os-core-common</artifactId>
+ <artifactId>os-core-common-spring6</artifactId>
<version>${os-core-common.version}</version>
</dependency>
@@ -80,7 +80,7 @@
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
- <version>0.9.1</version>
+ <version>0.12.5</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -91,7 +91,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5.2</version>
+ <version>4.5.14</version>
<scope>runtime</scope>
</dependency>
diff --git a/testing/storage-test-core/pom.xml b/testing/storage-test-core/pom.xml
index 5402d4a45..5f6044cdc 100644
--- a/testing/storage-test-core/pom.xml
+++ b/testing/storage-test-core/pom.xml
@@ -14,13 +14,14 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>os-storage-testing</artifactId>
- <groupId>org.opengroup.osdu</groupId>
- <version>0.26.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>os-storage-testing</artifactId>
+ <groupId>org.opengroup.osdu</groupId>
+ <version>0.26.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opengroup.osdu.storage</groupId>
@@ -36,65 +37,75 @@
<project.main.basedir>${project.basedir}</project.main.basedir>
</properties>
- <dependencies>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- <version>1.19.4</version>
- </dependency>
- <dependency>
- <groupId>io.jsonwebtoken</groupId>
- <artifactId>jjwt</artifactId>
- <version>0.9.1</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>1.18.26</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/junit/junit -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- </dependency>
- <dependency>
- <groupId>au.com.dius</groupId>
- <artifactId>pact-jvm-provider-junit_2.12</artifactId>
- <version>3.5.5</version>
- </dependency>
- <dependency>
- <groupId>org.opengroup.osdu</groupId>
- <artifactId>os-core-common</artifactId>
- <version>${os-core-common.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents.client5</groupId>
- <artifactId>httpclient5</artifactId>
- <version>5.2.1</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>2.9.1</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>1.19.4</version>
+ </dependency>
+ <dependency>
+ <groupId>io.jsonwebtoken</groupId>
+ <artifactId>jjwt</artifactId>
+ <version>0.9.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>1.18.30</version>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/junit/junit -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13.2</version>
+ </dependency>
+ <!-- <dependency>-->
+ <!-- <groupId>au.com.dius</groupId>-->
+ <!-- <artifactId>pact-jvm-provider-junit_2.12</artifactId>-->
+ <!-- <version>3.6.15</version>-->
+ <!-- </dependency>-->
+ <dependency>
+ <groupId>org.opengroup.osdu</groupId>
+ <artifactId>os-core-common-spring6</artifactId>
+ <version>${os-core-common.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.14.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
+ <version>5.2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
+ <version>3.1.0</version>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/testing/storage-test-core/src/main/java/org/opengroup/osdu/storage/util/TestUtils.java b/testing/storage-test-core/src/main/java/org/opengroup/osdu/storage/util/TestUtils.java
index 455b09446..3c09686e7 100644
--- a/testing/storage-test-core/src/main/java/org/opengroup/osdu/storage/util/TestUtils.java
+++ b/testing/storage-test-core/src/main/java/org/opengroup/osdu/storage/util/TestUtils.java
@@ -15,7 +15,7 @@
package org.opengroup.osdu.storage.util;
import com.google.gson.Gson;
-import org.apache.commons.lang.NotImplementedException;
+import org.apache.commons.lang3.NotImplementedException;
import org.apache.hc.client5.http.config.ConnectionConfig;
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
diff --git a/testing/storage-test-gc/pom.xml b/testing/storage-test-gc/pom.xml
index edc7fd7ba..6994f9467 100644
--- a/testing/storage-test-gc/pom.xml
+++ b/testing/storage-test-gc/pom.xml
@@ -79,7 +79,7 @@
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
- <version>0.9.1</version>
+ <version>0.12.5</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/testing/storage-test-ibm/pom.xml b/testing/storage-test-ibm/pom.xml
index f6d5cd71b..b6468d4e2 100644
--- a/testing/storage-test-ibm/pom.xml
+++ b/testing/storage-test-ibm/pom.xml
@@ -36,7 +36,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.main.basedir>${project.basedir}</project.main.basedir>
<MY_TENANT>opendes</MY_TENANT>
- <os-core-lib-ibm.version>0.25.0</os-core-lib-ibm.version>
+ <os-core-lib-ibm.version>0.26.0-rc8</os-core-lib-ibm.version>
</properties>
<dependencies>
<!-- Internal packages -->
@@ -54,9 +54,12 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
- <artifactId>os-core-common</artifactId>
- <version>0.25.0</version>
+ <artifactId>os-core-common-spring6</artifactId>
+ <version>${os-core-common.version}</version>
+ <scope>compile</scope>
</dependency>
+ <!-- https://mvnrepository.com/artifact/jakarta.json/jakarta.json-api -->
+
<!-- third party Apache 2.0 license packages -->
<dependency>
--
GitLab