diff --git a/pom.xml b/pom.xml index a1b78727cf5afba9e6ce38bd19c57d8b4550d967..112b42cb481bc4e37f91c54d7db8d97d0fa39e3b 100644 --- a/pom.xml +++ b/pom.xml @@ -27,8 +27,8 @@ <maven.compiler.source>1.8</maven.compiler.source> <docker.image.prefix>opendes</docker.image.prefix> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <os-core-common.version>0.15.0</os-core-common.version> - <jackson-databind.version>2.13.4</jackson-databind.version> + <os-core-common.version>0.18.0-rc3</os-core-common.version> + <jackson-databind.version>2.13.4.1</jackson-databind.version> <jackson.version>2.13.2</jackson.version> <netty.version>4.1.51.Final</netty.version> <snakeyaml.version>1.31</snakeyaml.version> @@ -72,7 +72,7 @@ <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> - <version>2.1.18.RELEASE</version> + <version>2.7.2</version> <type>pom</type> <scope>import</scope> </dependency> diff --git a/provider/storage-aws/src/test/resources/application.properties b/provider/storage-aws/src/test/resources/application.properties index 405d1160adba1377e5341e3fd45a2427f2d8af16..9aa0c7448504d04c241bfe9b12df88c293d4e204 100644 --- a/provider/storage-aws/src/test/resources/application.properties +++ b/provider/storage-aws/src/test/resources/application.properties @@ -6,3 +6,4 @@ spring.data.mongodb.port=27019 spring.main.allow-bean-definition-overriding=true repository.implementation=mongodb spring.profiles.active=noswagger +spring.mongodb.embedded.version=3.5.5 diff --git a/provider/storage-byoc/pom.xml b/provider/storage-byoc/pom.xml index 855cccb83e6e5b8de0ec74bac322ee6726f56915..7b725c654c35776126d0a883a526273e543d6933 100644 --- a/provider/storage-byoc/pom.xml +++ b/provider/storage-byoc/pom.xml @@ -37,6 +37,16 @@ <groupId>org.opengroup.osdu</groupId> <artifactId>storage-core</artifactId> <version>0.18.0-SNAPSHOT</version> + <exclusions> + <exclusion> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-mockito</artifactId> + </exclusion> + <exclusion> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -45,12 +55,6 @@ <version>4.12</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.10.19</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-module-junit4</artifactId> diff --git a/provider/storage-ibm/pom.xml b/provider/storage-ibm/pom.xml index 6e66f3a4536cce650db41ba79850489c75533dfe..11bd7b75cf6de4c01531d52619abf5f757983e27 100644 --- a/provider/storage-ibm/pom.xml +++ b/provider/storage-ibm/pom.xml @@ -26,10 +26,9 @@ <packaging>jar</packaging> <properties> - <os-core-lib-ibm.version>0.16.0-rc1</os-core-lib-ibm.version> + <os-core-lib-ibm.version>0.17.0-rc4</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> - <spring-security-core.version>5.3.13.RELEASE</spring-security-core.version> <tomcat-embed-core.version>9.0.67</tomcat-embed-core.version> </properties> @@ -39,36 +38,11 @@ <groupId>org.opengroup.osdu</groupId> <artifactId>storage-core</artifactId> <version>0.18.0-SNAPSHOT</version> - <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-codec</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-core</artifactId> - <version>${spring-security-core.version}</version> </dependency> <dependency> <groupId>org.opengroup.osdu</groupId> <artifactId>os-core-lib-ibm</artifactId> <version>${os-core-lib-ibm.version}</version> - <exclusions> - <exclusion> - <groupId>io.netty</groupId> - <artifactId>netty-codec</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <artifactId>jackson-dataformat-cbor</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> diff --git a/testing/storage-test-ibm/pom.xml b/testing/storage-test-ibm/pom.xml index 8c125125e4ddf7badbf6f71a799764cabcd3cfa2..4f0924fe24f06a9f03fcbc6b91ea942c15e85f48 100644 --- a/testing/storage-test-ibm/pom.xml +++ b/testing/storage-test-ibm/pom.xml @@ -35,7 +35,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.13.0</os-core-lib-ibm.version> + <os-core-lib-ibm.version>0.17.0-rc4</os-core-lib-ibm.version> </properties> <dependencies> <!-- Internal packages --> @@ -54,7 +54,7 @@ <dependency> <groupId>org.opengroup.osdu</groupId> <artifactId>os-core-common</artifactId> - <version>0.13.0</version> + <version>0.18.0-rc3</version> </dependency> <!-- third party Apache 2.0 license packages -->