diff --git a/NOTICE b/NOTICE
index 1228d4f784c317acd239cd241f7651f0cd3f70a1..898d373bc003636b1513f156c8750d7a37c3380b 100644
--- a/NOTICE
+++ b/NOTICE
@@ -326,7 +326,6 @@ The following software have components provided under the terms of this license:
- Apache Ant Launcher (from https://ant.apache.org/)
- Apache Commons BeanUtils (from http://commons.apache.org/proper/commons-beanutils/, https://commons.apache.org/proper/commons-beanutils/, https://repo1.maven.org/maven2/commons-beanutils/commons-beanutils)
- Apache Commons Codec (from http://commons.apache.org/proper/commons-codec/, https://commons.apache.org/proper/commons-codec/)
-- Apache Commons Collections (from https://commons.apache.org/proper/commons-collections/)
- Apache Commons IO (from http://commons.apache.org/io/, https://commons.apache.org/proper/commons-io/, https://repo1.maven.org/maven2/commons-io/commons-io)
- Apache Commons Lang (from https://commons.apache.org/proper/commons-lang/)
- Apache Commons Logging (from http://commons.apache.org/logging/, http://commons.apache.org/proper/commons-logging/)
@@ -335,8 +334,10 @@ The following software have components provided under the terms of this license:
- Apache Groovy (from http://groovy-lang.org, http://groovy.codehaus.org/, https://groovy-lang.org)
- Apache HTTP transport v2 for the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-apache-v2)
- Apache HttpAsyncClient (from http://hc.apache.org/httpcomponents-asyncclient)
-- Apache HttpClient (from http://hc.apache.org/httpcomponents-client, http://hc.apache.org/httpcomponents-client-ga)
+- Apache HttpClient (from http://hc.apache.org/httpcomponents-client, http://hc.apache.org/httpcomponents-client-ga, https://repo1.maven.org/maven2/org/apache/httpcomponents/client5/httpclient5)
- Apache HttpClient Cache (from http://hc.apache.org/httpcomponents-client, http://hc.apache.org/httpcomponents-client-ga)
+- Apache HttpComponents Core HTTP/1.1 (from https://repo1.maven.org/maven2/org/apache/httpcomponents/core5/httpcore5)
+- Apache HttpComponents Core HTTP/2 (from https://repo1.maven.org/maven2/org/apache/httpcomponents/core5/httpcore5-h2)
- Apache HttpCore (from http://hc.apache.org/httpcomponents-core-ga, http://hc.apache.org/httpcomponents-core-ga/, http://hc.apache.org/httpcomponents-core/)
- Apache HttpCore NIO (from http://hc.apache.org/httpcomponents-core-ga, http://hc.apache.org/httpcomponents-core/)
- Apache Log4j API (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api)
@@ -421,10 +422,10 @@ The following software have components provided under the terms of this license:
- JBoss Marshalling River (from https://repo1.maven.org/maven2/org/jboss/marshalling/jboss-marshalling-river)
- JCIP Annotations under Apache License (from http://stephenc.github.com/jcip-annotations)
- JDOM
+- JJWT :: Legacy Transitive Dependency Jar (from https://repo1.maven.org/maven2/io/jsonwebtoken/jjwt)
- JMES Path Query library (from https://aws.amazon.com/sdkforjava)
- JOpt Simple (from http://jopt-simple.github.io/jopt-simple, http://pholser.github.io/jopt-simple)
- JSON Small and Fast Parser (from https://repo1.maven.org/maven2/net/minidev/json-smart, https://urielch.github.io/)
-- JSON Web Token support for the JVM (from https://github.com/jwtk/jjwt)
- JSON library from Android SDK (from http://developer.android.com/sdk)
- JSON.simple (from http://code.google.com/p/json-simple/)
- JSONassert (from http://github.com/skyscreamer/yoga, https://github.com/skyscreamer/JSONassert)
@@ -450,7 +451,6 @@ The following software have components provided under the terms of this license:
- Java Libraries for Amazon Simple WorkFlow (from https://github.com/aws/aws-swf-flow-library)
- Java Native Access (from https://github.com/java-native-access/jna, https://github.com/twall/jna)
- Java Native Access Platform (from https://github.com/java-native-access/jna)
-- Java UUID Generator (from http://wiki.fasterxml.com/JugHome)
- JavaBeans Activation Framework (from <http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp>, http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp, https://repo1.maven.org/maven2/com/sun/activation/javax.activation)
- Javassist (from http://www.javassist.org/)
- JetBrains Java Annotations (from https://github.com/JetBrains/java-annotations)
@@ -499,7 +499,7 @@ The following software have components provided under the terms of this license:
- Microsoft Azure Java Core Library (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure Netty HTTP Client Library (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure SDK for SQL API of Azure Cosmos DB Service (from https://github.com/Azure/azure-sdk-for-java)
-- Mockito (from http://mockito.org, http://www.mockito.org, https://github.com/mockito/mockito)
+- Mockito (from http://mockito.org, https://github.com/mockito/mockito)
- Mojo's Maven plugin for Cobertura (from http://mojo.codehaus.org/cobertura-maven-plugin/)
- MongoDB Driver (from https://www.mongodb.com/)
- MongoDB Java Driver (from http://mongodb.org/, http://www.mongodb.org, https://www.mongodb.com/)
@@ -608,13 +608,12 @@ The following software have components provided under the terms of this license:
- aalto-xml (from https://github.com/FasterXML/aalto-xml, https://repo1.maven.org/maven2/com/fasterxml/aalto-xml)
- aggs-matrix-stats (from https://github.com/elastic/elasticsearch, https://github.com/elastic/elasticsearch.git)
- compiler (from http://github.com/spullara/mustache.java)
-- documentdb-bulkexecutor (from http://azure.microsoft.com/en-us/services/documentdb/)
-- elasticsearch (from https://github.com/elastic/elasticsearch, https://github.com/elastic/elasticsearch.git, https://repo1.maven.org/maven2/org/elasticsearch/elasticsearch)
-- elasticsearch-cli (from https://github.com/elastic/elasticsearch, https://github.com/elastic/elasticsearch.git)
-- elasticsearch-core (from https://github.com/elastic/elasticsearch, https://github.com/elastic/elasticsearch.git)
+- elasticsearch (from https://github.com/elastic/elasticsearch, https://repo1.maven.org/maven2/org/elasticsearch/elasticsearch)
+- elasticsearch-cli (from https://github.com/elastic/elasticsearch)
+- elasticsearch-core (from https://github.com/elastic/elasticsearch)
- elasticsearch-geo (from https://github.com/elastic/elasticsearch, https://github.com/elastic/elasticsearch.git)
-- elasticsearch-secure-sm (from https://github.com/elastic/elasticsearch, https://github.com/elastic/elasticsearch.git)
-- elasticsearch-x-content (from https://github.com/elastic/elasticsearch, https://github.com/elastic/elasticsearch.git)
+- elasticsearch-secure-sm (from https://github.com/elastic/elasticsearch)
+- elasticsearch-x-content (from https://github.com/elastic/elasticsearch)
- error-prone annotations (from https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations)
- io.grpc:grpc-alts (from https://github.com/grpc/grpc-java)
- io.grpc:grpc-api (from https://github.com/grpc/grpc-java)
@@ -757,7 +756,6 @@ The following software have components provided under the terms of this license:
- Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
-- Mockito (from http://mockito.org, http://www.mockito.org, https://github.com/mockito/mockito)
- Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http)
- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils, https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils)
- Protocol Buffer Java API (from http://code.google.com/p/protobuf, https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java)
@@ -1168,7 +1166,7 @@ The following software have components provided under the terms of this license:
- Microsoft Azure client library for KeyVault Secrets (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure common module for Storage (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure internal Avro module for Storage (from https://github.com/Azure/azure-sdk-for-java)
-- Mockito (from http://mockito.org, http://www.mockito.org, https://github.com/mockito/mockito)
+- Mockito (from http://mockito.org, https://github.com/mockito/mockito)
- MongoDB Java Driver (from http://mongodb.org/, http://www.mongodb.org, https://www.mongodb.com/)
- Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http)
- Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common)
@@ -1180,8 +1178,6 @@ The following software have components provided under the terms of this license:
- Spring Data for Azure Cosmos DB SQL API (from https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/cosmos/azure-spring-data-cosmos)
- ThreeTen backport (from https://github.com/ThreeTen/threetenbp, https://www.threeten.org/threetenbp)
- adal4j (from https://github.com/AzureAD/azure-activedirectory-library-for-java)
-- azure-documentdb (from http://azure.microsoft.com/en-us/services/documentdb/, https://azure.microsoft.com/en-us/services/cosmos-db/)
-- documentdb-bulkexecutor (from http://azure.microsoft.com/en-us/services/documentdb/)
- jersey-container-servlet (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet)
- jersey-container-servlet-core (from https://repo1.maven.org/maven2/org/glassfish/jersey/containers/jersey-container-servlet-core)
- jersey-core-client (from https://repo1.maven.org/maven2/org/glassfish/jersey/core/jersey-client)
@@ -1193,6 +1189,7 @@ The following software have components provided under the terms of this license:
- jersey-media-json-jackson (from https://repo1.maven.org/maven2/org/glassfish/jersey/media/jersey-media-json-jackson)
- jersey-spring5 (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-spring5)
- micrometer-core (from https://github.com/micrometer-metrics/micrometer)
+- mockito-inline (from http://mockito.org, https://github.com/mockito/mockito)
- mockito-junit-jupiter (from https://github.com/mockito/mockito)
- msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java)
- msal4j-persistence-extension (from https://github.com/AzureAD/microsoft-authentication-extensions-for-java)
@@ -1243,7 +1240,7 @@ SunPro
The following software have components provided under the terms of this license:
- Lucene Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core)
-- elasticsearch-core (from https://github.com/elastic/elasticsearch, https://github.com/elastic/elasticsearch.git)
+- elasticsearch-core (from https://github.com/elastic/elasticsearch)
========================================================================
W3C
diff --git a/devops/gc/deploy/templates/deployment.yaml b/devops/gc/deploy/templates/deployment.yaml
index 9df366d0c2d008a85fd5ea59606d2b5d6e40c670..67a8eff91033e08f587d7e4b756ee4dac1fc2771 100644
--- a/devops/gc/deploy/templates/deployment.yaml
+++ b/devops/gc/deploy/templates/deployment.yaml
@@ -9,7 +9,7 @@ spec:
selector:
matchLabels:
app: {{ .Values.conf.appName | quote }}
- replicas: 1
+ replicas: {{ .Values.conf.replicas }}
template:
metadata:
labels:
diff --git a/devops/gc/deploy/values.yaml b/devops/gc/deploy/values.yaml
index a5e0dd84cf454af10a67f9d29a73281d1da99315..5f5143d606ce596a0a681caf669909064b18c005 100644
--- a/devops/gc/deploy/values.yaml
+++ b/devops/gc/deploy/values.yaml
@@ -37,6 +37,7 @@ conf:
keycloakSecretName: "indexer-keycloak-secret"
rabbitmqSecretName: "rabbitmq-secret"
indexerRedisSecretName: "indexer-redis-secret"
+ replicas: 1
istio:
proxyCPU: "10m"
diff --git a/indexer-core/pom.xml b/indexer-core/pom.xml
index d5b855a9fa9f446b546274d3a72d41a83edac52a..967dee2e8028b344deda1fa469741faef41e9e5e 100644
--- a/indexer-core/pom.xml
+++ b/indexer-core/pom.xml
@@ -4,12 +4,12 @@
<parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-service</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>indexer-core</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
<name>indexer-core</name>
<description>Indexer Service Core</description>
<packaging>jar</packaging>
@@ -19,7 +19,7 @@
<gson.version>2.9.1</gson.version>
<netty.version>4.1.70.Final</netty.version>
<spring-webmvc.version>5.3.22</spring-webmvc.version>
- <os-core-common.version>0.22.0-rc4</os-core-common.version>
+ <os-core-common.version>0.24.0</os-core-common.version>
</properties>
<dependencyManagement>
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/model/SearchRequest.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/model/SearchRequest.java
index 7af9c3089fc993054b851ada52fd1cac79aed410..11931468c14f583deda5b30dbd64c8b1573e9ace 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/model/SearchRequest.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/model/SearchRequest.java
@@ -33,5 +33,5 @@ public class SearchRequest {
private String cursor;
private List<String> returnedFields;
private SortQuery sort;
- private boolean trackTotalCount = true;
+ private boolean trackTotalCount;
}
diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageServiceImpl.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageServiceImpl.java
index cfcf8ce96187e5918a133e31800ea6731f609263..fecc1082db1ee0103ac986bfd83a025831c6a68f 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageServiceImpl.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/service/StorageServiceImpl.java
@@ -147,8 +147,9 @@ public class StorageServiceImpl implements StorageService {
}
try {
Records records = this.objectMapper.readValue(response.getBody(), Records.class);
- ids.removeAll(records.getRecords().stream().map(Records.Entity::getId).collect(Collectors.toList()));
- records.setNotFound(ids);
+ List<String> notFoundRecordIds = new ArrayList<>(ids);
+ notFoundRecordIds.removeAll(records.getRecords().stream().map(Records.Entity::getId).collect(Collectors.toList()));
+ records.setNotFound(notFoundRecordIds);
return records;
} catch (JsonProcessingException e) {
throw new AppException(RequestStatus.INVALID_RECORD, "Invalid request", "Successful Storage service response with wrong json", e);
diff --git a/indexer-core/src/test/java/org/opengroup/osdu/indexer/service/StorageServiceImplTest.java b/indexer-core/src/test/java/org/opengroup/osdu/indexer/service/StorageServiceImplTest.java
index 437f8714f53d299f09f6da9d80e5c3169edd77e6..07220cddc238631f73078ca3b455517ae0231947 100644
--- a/indexer-core/src/test/java/org/opengroup/osdu/indexer/service/StorageServiceImplTest.java
+++ b/indexer-core/src/test/java/org/opengroup/osdu/indexer/service/StorageServiceImplTest.java
@@ -190,6 +190,43 @@ public class StorageServiceImplTest {
@Test
public void should_returnStorageRecords_givenRecordIds_getValidStorageRecordsTest() throws URISyntaxException {
+ String validDataFromStorage = "{\"records\":[{\"id\":\"tenant1:doc:1dbf528e0e0549cab7a08f29fbfc8465\", \"version\":1, \"kind\":\"tenant:test:test:1.0.0\"}," +
+ "{\"id\":\"tenant1:doc:15e790a69beb4d789b1f979e2af2e813\", \"version\":1, \"kind\":\"tenant:test:test:1.0.0\"}]}";
+
+ HttpResponse httpResponse = mock(HttpResponse.class);
+ when(httpResponse.getBody()).thenReturn(validDataFromStorage);
+
+ when(configurationProperties.getStorageQueryRecordHost()).thenReturn("storageUrl");
+ when(this.httpClientHandler.sendRequest(any(), any())).thenReturn(httpResponse);
+ List<String> idsCopy = new ArrayList<>();
+ idsCopy.addAll(ids);
+ Records storageRecords = this.sut.getStorageRecords(idsCopy);
+
+ assertEquals(2, storageRecords.getRecords().size());
+ assertEquals(0, storageRecords.getNotFound().size());
+ }
+
+ @Test
+ public void should_returnStorageRecords_givenRecordIds_allFound_getValidStorageRecordsTest() throws URISyntaxException {
+
+ String validDataFromStorage = "{\"records\":[]}";
+
+ HttpResponse httpResponse = mock(HttpResponse.class);
+ when(httpResponse.getBody()).thenReturn(validDataFromStorage);
+
+ when(configurationProperties.getStorageQueryRecordHost()).thenReturn("storageUrl");
+ when(this.httpClientHandler.sendRequest(any(), any())).thenReturn(httpResponse);
+ List<String> idsCopy = new ArrayList<>();
+ idsCopy.addAll(ids);
+ Records storageRecords = this.sut.getStorageRecords(idsCopy);
+
+ assertEquals(0, storageRecords.getRecords().size());
+ assertEquals(2, storageRecords.getNotFound().size());
+ }
+
+ @Test
+ public void should_returnStorageRecords_givenRecordIds_noneFound_getValidStorageRecordsTest() throws URISyntaxException {
+
String validDataFromStorage = "{\"records\":[{\"id\":\"tenant1:doc:1dbf528e0e0549cab7a08f29fbfc8465\", \"version\":1, \"kind\":\"tenant:test:test:1.0.0\"}]}";
HttpResponse httpResponse = mock(HttpResponse.class);
diff --git a/pom.xml b/pom.xml
index e6a56d41f75b35889b2442566a30c022421d704f..bcc3fc0f696610d4a79c297975729391e2a0ce66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-service</artifactId>
<packaging>pom</packaging>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
<description>Indexer Service</description>
<properties>
@@ -13,7 +13,7 @@
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<spring-cloud.version>Greenwich.SR2</spring-cloud.version>
- <os-core-common.version>0.22.0-rc4</os-core-common.version>
+ <os-core-common.version>0.24.0</os-core-common.version>
<snakeyaml.version>2.0</snakeyaml.version>
<hibernate-validator.version>6.1.5.Final</hibernate-validator.version>
<jackson-databind.version>2.14.1</jackson-databind.version>
diff --git a/provider/indexer-aws/pom.xml b/provider/indexer-aws/pom.xml
index ff19a8b93fdebccb9eeef0dd8c8ccfb664318834..4cb5a47e98ce0a8a9261192852b5ef0ec570316f 100644
--- a/provider/indexer-aws/pom.xml
+++ b/provider/indexer-aws/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-service</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -26,7 +26,7 @@
<artifactId>indexer-aws</artifactId>
<description>Indexer service on AWS</description>
<packaging>jar</packaging>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
<properties>
<aws.version>1.11.1018</aws.version>
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-core</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
diff --git a/provider/indexer-azure/pom.xml b/provider/indexer-azure/pom.xml
index ff7b1c6d14370ede34d08210ad19f95cdd732968..0792afbb0035eeabcdd791fc7eac88305ba46740 100644
--- a/provider/indexer-azure/pom.xml
+++ b/provider/indexer-azure/pom.xml
@@ -21,12 +21,12 @@
<parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-service</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>indexer-azure</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
<name>indexer-azure</name>
<description>Indexer Service Azure</description>
<packaging>jar</packaging>
@@ -39,16 +39,16 @@
<azure.appservice.subscription />
<log4j.version>2.17.1</log4j.version>
<nimbus-jose-jwt.version>8.20.2</nimbus-jose-jwt.version>
- <indexer-core.version>0.24.0-SNAPSHOT</indexer-core.version>
+ <indexer-core.version>0.25.0-SNAPSHOT</indexer-core.version>
<spring-security-jwt.version>1.1.1.RELEASE</spring-security-jwt.version>
- <osdu.corelibazure.version>0.20.0-rc5</osdu.corelibazure.version>
- <os-core-common.version>0.22.0-rc4</os-core-common.version>
+ <osdu.corelibazure.version>0.24.0</osdu.corelibazure.version>
+ <os-core-common.version>0.24.0</os-core-common.version>
<reactor-netty.version>0.9.12.RELEASE</reactor-netty.version>
<java-jwt.version>3.8.1</java-jwt.version>
<mockito.version>3.11.2</mockito.version>
<cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
<spring-security-oauth2.version>2.3.6.RELEASE</spring-security-oauth2.version>
- <netty.version>4.1.96.Final</netty.version>
+ <netty.version>4.1.98.Final</netty.version>
<reactor-netty.version>1.0.7</reactor-netty.version>
<reactor-core.version>3.4.24</reactor-core.version>
<oauth2-oidc-sdk.version>6.5</oauth2-oidc-sdk.version>
@@ -198,6 +198,10 @@
<artifactId>azure-core</artifactId>
<groupId>com.azure</groupId>
</exclusion>
+ <exclusion>
+ <groupId>com.microsoft.azure</groupId>
+ <artifactId>documentdb-bulkexecutor</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/provider/indexer-gc/pom.xml b/provider/indexer-gc/pom.xml
index 71d68ae51c7112026d797158ea67243791808a72..ce19b5b93afea327d54976dd7c9b8829b48430dd 100644
--- a/provider/indexer-gc/pom.xml
+++ b/provider/indexer-gc/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-service</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>indexer-gc</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
<name>indexer-gc</name>
<description>Indexer Service Google Cloud</description>
<packaging>jar</packaging>
@@ -39,12 +39,12 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-gc</artifactId>
- <version>0.21.0</version>
+ <version>0.24.0</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-core</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
<!-- excluded due to runtime conflict with latest core-lib-gc transient dependencies -->
<exclusions>
<exclusion>
@@ -159,7 +159,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>oqm</artifactId>
- <version>0.21.0</version>
+ <version>0.24.0</version>
</dependency>
</dependencies>
diff --git a/provider/indexer-ibm/pom.xml b/provider/indexer-ibm/pom.xml
index 829094f3ae49bd7efb96e90375bd8691a22ded27..c51705e0fa6ba835f38bec87f39d4e9b07ca7f17 100644
--- a/provider/indexer-ibm/pom.xml
+++ b/provider/indexer-ibm/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-service</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -32,7 +32,7 @@
<properties>
<tomcat.embed.core.version>9.0.69</tomcat.embed.core.version>
- <os-core-lib-ibm.version>0.16.0-rc1</os-core-lib-ibm.version>
+ <os-core-lib-ibm.version>0.24.0</os-core-lib-ibm.version>
<spring-webmvc.version>5.3.22</spring-webmvc.version>
<jackson-databind.version>2.13.4.2</jackson-databind.version>
<jackson.version>2.13.4</jackson.version>
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-core</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
diff --git a/testing/indexer-test-aws/pom.xml b/testing/indexer-test-aws/pom.xml
index 0200b4d13ad4753153be27fc33a0dcedbc844f31..d6efd8b3effc5904236aef70f4a61f629617fa1f 100644
--- a/testing/indexer-test-aws/pom.xml
+++ b/testing/indexer-test-aws/pom.xml
@@ -21,13 +21,13 @@
<parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>indexer-test</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-aws</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
@@ -51,14 +51,14 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-core</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
</dependency>
<!-- AWS specific packages -->
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
- <version>0.21.0</version>
+ <version>0.24.0</version>
</dependency>
<!-- Testing -->
diff --git a/testing/indexer-test-azure/pom.xml b/testing/indexer-test-azure/pom.xml
index 6fb94347753eacbc2626f84981cf8590d79bf894..2f7914662e7f8a04d6c1691d4b206e7877df4250 100644
--- a/testing/indexer-test-azure/pom.xml
+++ b/testing/indexer-test-azure/pom.xml
@@ -21,13 +21,13 @@
<parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>indexer-test</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-azure</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
@@ -36,7 +36,7 @@
<cucumber.version>1.2.5</cucumber.version>
<junit.jupiter.version>5.6.0</junit.jupiter.version>
<elasticsearch.version>7.8.1</elasticsearch.version>
- <os-core-common.version>0.14.0-rc8</os-core-common.version>
+ <os-core-common.version>0.24.0</os-core-common.version>
<jackson.version>2.13.2</jackson.version>
<argLine>
--add-opens java.base/java.lang=ALL-UNNAMED
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-core</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -78,7 +78,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-azure</artifactId>
- <version>0.12.0-rc10</version>
+ <version>0.24.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -94,17 +94,17 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>4.1.50.Final</version>
+ <version>4.1.90.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
- <version>4.1.15.Final</version>
+ <version>4.1.90.Final</version>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
- <version>1.2.0</version>
+ <version>1.13.1</version>
</dependency>
<!-- Testing -->
diff --git a/testing/indexer-test-baremetal/pom.xml b/testing/indexer-test-baremetal/pom.xml
index 56ebb186e8e1ace9fbadd0c30e8c87f85a1d108e..8c0027470cacac91af6c35348e77b6554a82130b 100644
--- a/testing/indexer-test-baremetal/pom.xml
+++ b/testing/indexer-test-baremetal/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>indexer-test</artifactId>
<groupId>org.opengroup.osdu</groupId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-core</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
diff --git a/testing/indexer-test-core/pom.xml b/testing/indexer-test-core/pom.xml
index 936a8b5ddf959eae2101e3d81b5a61f771e2c5ea..2dd470dbd97d6635dbc41a063a0a915b10bbee0e 100644
--- a/testing/indexer-test-core/pom.xml
+++ b/testing/indexer-test-core/pom.xml
@@ -5,19 +5,19 @@
<parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>indexer-test</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-core</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
<properties>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<cucumber.version>1.2.5</cucumber.version>
- <os-core-common.version>0.14.0-rc8</os-core-common.version>
+ <os-core-common.version>0.24.0</os-core-common.version>
<jackson-databind.version>2.13.2.2</jackson-databind.version>
<jackson.version>2.13.2</jackson.version>
</properties>
diff --git a/testing/indexer-test-gc/pom.xml b/testing/indexer-test-gc/pom.xml
index e2cf947ca5bbaccb24cf496f8522ca8c862d68d5..8b85bc93fd7e9cdd39e32741df07426bf38aabac 100644
--- a/testing/indexer-test-gc/pom.xml
+++ b/testing/indexer-test-gc/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>indexer-test</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-gc</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-core</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
</dependency>
<!-- Cucumber -->
diff --git a/testing/indexer-test-ibm/pom.xml b/testing/indexer-test-ibm/pom.xml
index 2b855293d5b833a8496ebe2a10bbe6641c7b3d6e..376cd66ed6da6f21cee0217ffe109bd1122bbc58 100644
--- a/testing/indexer-test-ibm/pom.xml
+++ b/testing/indexer-test-ibm/pom.xml
@@ -6,20 +6,20 @@
<parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>indexer-test</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-ibm</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<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.13.0</os-core-lib-ibm.version>
+ <os-core-lib-ibm.version>0.24.0</os-core-lib-ibm.version>
<argLine>
--add-opens java.base/java.lang=ALL-UNNAMED
--add-opens=java.base/java.util=ALL-UNNAMED
@@ -45,13 +45,13 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-core</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
- <version>0.14.0-rc8</version>
+ <version>0.24.0</version>
</dependency>
<dependency>
diff --git a/testing/pom.xml b/testing/pom.xml
index e2b37af411dcfec1830c2b5d4b870e27697ce8c8..382be620df71984959592db29dfb84ec3cf335e9 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.opengroup.osdu</groupId>
<artifactId>indexer-test</artifactId>
- <version>0.24.0-SNAPSHOT</version>
+ <version>0.25.0-SNAPSHOT</version>
<description>Indexer Service Integration Test Root Project</description>
<properties>
<spring.version>5.3.23</spring.version>