diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7b1a2f163abb0acf1b9709b4349a7c3454cb60a7..9165026206ceda393b9770368ad28547cee74a31 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -168,7 +168,7 @@ download_plugins: stage: build variables: APD_PACKAGE_REGISTRY_URL: "https://community.opengroup.org/api/v4/projects/1445/packages/maven" - APD_VERSION: "0.26.0-rc2" + APD_VERSION: "0.26.0" artifacts: paths: diff --git a/pom.xml b/pom.xml index 47dbac30610fd5f8867a2ece21c6786dd73b353d..52f356cb2e8f359b75a8a30574a0ae6ffcd50877 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ <log4j-core.version>2.17.1</log4j-core.version> <google-oauth-client.version>1.34.1</google-oauth-client.version> <commons-compress.version>1.21</commons-compress.version> - <osdu.oscorecommon.version>0.25.0</osdu.oscorecommon.version> + <osdu.oscorecommon.version>0.26.0</osdu.oscorecommon.version> <tomcat-embed-core.version>9.0.71</tomcat-embed-core.version> <openapi.version>1.6.14</openapi.version> <json-smart.version>2.5.0</json-smart.version> diff --git a/provider/search-aws/pom.xml b/provider/search-aws/pom.xml index 3514a201b238a11461dfdc3761c9ad85e3ec49d5..882e2d51b09c4d015e3135116c94ecc7873315df 100644 --- a/provider/search-aws/pom.xml +++ b/provider/search-aws/pom.xml @@ -61,7 +61,7 @@ <dependency> <groupId>org.opengroup.osdu.core.aws</groupId> <artifactId>os-core-lib-aws</artifactId> - <version>0.26.0-rc3</version> + <version>0.26.0</version> </dependency> <dependency> <groupId>org.opengroup.osdu</groupId> diff --git a/provider/search-azure/pom.xml b/provider/search-azure/pom.xml index 8b6ac4b0635a1f7d7a78ccd3e741c102fb14096e..81d46f02e37e777060985e339ded1234d6e65fe7 100644 --- a/provider/search-azure/pom.xml +++ b/provider/search-azure/pom.xml @@ -35,7 +35,7 @@ <failOnMissingWebXml>false</failOnMissingWebXml> <project.main.basedir>${project.parent.basedir}</project.main.basedir> <springboot.version>2.1.7.RELEASE</springboot.version> - <osdu.corelibazure.version>0.26.0-rc5</osdu.corelibazure.version> + <osdu.corelibazure.version>0.26.0</osdu.corelibazure.version> <osdu.search-core.version>0.27.0-SNAPSHOT</osdu.search-core.version> <spatial4j.version>0.7</spatial4j.version> <reactor-netty.version>1.1.14</reactor-netty.version> diff --git a/provider/search-gc/pom.xml b/provider/search-gc/pom.xml index 60a39ebc88aa2ca4f58e3a31a31a7e810614bbb3..6fb52e199ace2c2c8ab99f93655a1c4181b33cb9 100644 --- a/provider/search-gc/pom.xml +++ b/provider/search-gc/pom.xml @@ -69,7 +69,7 @@ <dependency> <groupId>org.opengroup.osdu</groupId> <artifactId>core-lib-gc</artifactId> - <version>0.25.0</version> + <version>0.26.0</version> </dependency> <dependency> <groupId>org.opengroup.osdu</groupId> diff --git a/provider/search-ibm/pom.xml b/provider/search-ibm/pom.xml index 8e644727b034e868723bb6b05fe92bdc4dcca259..f5758f0cb89b47fbd9157a97f80c04bf1e33ce8d 100644 --- a/provider/search-ibm/pom.xml +++ b/provider/search-ibm/pom.xml @@ -24,7 +24,7 @@ <properties> <tomcat.embed.core.version>9.0.69</tomcat.embed.core.version> - <os-core-lib-ibm.version>0.25.1</os-core-lib-ibm.version> + <os-core-lib-ibm.version>0.26.0</os-core-lib-ibm.version> <start-class>org.opengroup.osdu.search.provider.ibm.app.SearchIBMApplication</start-class> <spring-webmvc.version>5.3.22</spring-webmvc.version> <jackson-databind.version>2.15.2</jackson-databind.version> diff --git a/search-core-plus/pom.xml b/search-core-plus/pom.xml index 23d1d3acf4e2560821c998503bd024eea10cf20e..0e023307a6ba865eccf2e09f41131cf9e5113f34 100644 --- a/search-core-plus/pom.xml +++ b/search-core-plus/pom.xml @@ -69,7 +69,7 @@ <dependency> <groupId>org.opengroup.osdu</groupId> <artifactId>apd-core</artifactId> - <version>0.26.0-rc2</version> + <version>0.26.0</version> </dependency> <dependency> <groupId>org.opengroup.osdu</groupId> diff --git a/testing/integration-tests/search-test-aws/pom.xml b/testing/integration-tests/search-test-aws/pom.xml index 54305c087d460b92a5ad2b1c25f38cb2f7fd7db2..206c0ccf4804802b1ff42f337317b881e0cc6771 100644 --- a/testing/integration-tests/search-test-aws/pom.xml +++ b/testing/integration-tests/search-test-aws/pom.xml @@ -47,7 +47,7 @@ <dependency> <groupId>org.opengroup.osdu.core.aws</groupId> <artifactId>os-core-lib-aws</artifactId> - <version>0.26.0-rc2</version> + <version>0.26.0</version> </dependency> <!-- Third party Apache 2.0 license packages --> <dependency> diff --git a/testing/integration-tests/search-test-azure/pom.xml b/testing/integration-tests/search-test-azure/pom.xml index fd6e828196bc170d3a366fb157b5249f67160af6..d561a5dc337a87ded3f6add1752b912bd404b472 100644 --- a/testing/integration-tests/search-test-azure/pom.xml +++ b/testing/integration-tests/search-test-azure/pom.xml @@ -108,7 +108,7 @@ <dependency> <groupId>org.opengroup.osdu</groupId> <artifactId>core-lib-azure</artifactId> - <version>0.26.0-rc5</version> + <version>0.26.0</version> <scope>test</scope> </dependency> <dependency> diff --git a/testing/integration-tests/search-test-core/pom.xml b/testing/integration-tests/search-test-core/pom.xml index 356b81cc3bd51bbb24f0022aa4b64ec915e13b5b..af41262625f7829353fe562f32e5bfabb4c0a755 100644 --- a/testing/integration-tests/search-test-core/pom.xml +++ b/testing/integration-tests/search-test-core/pom.xml @@ -19,7 +19,7 @@ <maven.compiler.source>17</maven.compiler.source> <cucumber.version>1.2.5</cucumber.version> <elasticsearch.version>7.8.1</elasticsearch.version> - <osdu.oscorecommon.version>0.25.0</osdu.oscorecommon.version> + <osdu.oscorecommon.version>0.26.0</osdu.oscorecommon.version> <jackson-databind.version>2.15.2</jackson-databind.version> <jackson.version>2.13.2</jackson.version> <argLine> diff --git a/testing/integration-tests/search-test-ibm/pom.xml b/testing/integration-tests/search-test-ibm/pom.xml index ac3c4c4d5303a22ed6c8dfa363b508342c42fa9e..5154e1c6c5b73a0725755121b7b2ad05ea4d3266 100644 --- a/testing/integration-tests/search-test-ibm/pom.xml +++ b/testing/integration-tests/search-test-ibm/pom.xml @@ -17,7 +17,7 @@ <maven.compiler.target>17</maven.compiler.target> <maven.compiler.source>17</maven.compiler.source> <cucumber.version>1.2.5</cucumber.version> - <os-core-lib-ibm.version>0.25.1</os-core-lib-ibm.version> + <os-core-lib-ibm.version>0.26.0</os-core-lib-ibm.version> <elasticsearch.version>7.8.1</elasticsearch.version> <argLine> --add-opens=java.base/java.util=ALL-UNNAMED