diff --git a/.fossa.yml b/.fossa.yml
index 09b5fc51ab43d1499d01a0da799b7402cee5c50b..005b660973c55b1ecb92b77bff52c5159978f3db 100644
--- a/.fossa.yml
+++ b/.fossa.yml
@@ -32,7 +32,3 @@ analyze:
type: mvn
target: provider/indexer-ibm/pom.xml
path: .
- - name: indexer-reference
- type: mvn
- target: provider/indexer-reference/pom.xml
- path: .
diff --git a/NOTICE b/NOTICE
index a2af8a5f0244b1cad89d0c288e791f112f5b764f..e4a3f85ae0b774fe732f04431210c849b438911c 100644
--- a/NOTICE
+++ b/NOTICE
@@ -377,9 +377,11 @@ The following software have components provided under the terms of this license:
- ClassMate (from http://github.com/cowtowncoder/java-classmate)
- Cloud Key Management Service (KMS) API v1-rev20220407-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms)
- Cloud Key Management Service (KMS) API v1-rev20220617-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms)
+- Cloud Key Management Service (KMS) API v1-rev20220701-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms)
- Cloud Storage JSON API v1-rev20220604-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage)
- Cloud Storage JSON API v1-rev20220608-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage)
- Cloud Storage JSON API v1-rev20220705-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage)
+- Cloud Storage JSON API v1-rev20220705-2.0.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage)
- CloudWatch Metrics for AWS Java SDK (from https://aws.amazon.com/sdkforjava)
- Cobertura (from http://cobertura.sourceforge.net)
- Cobertura Limited Runtime (from http://cobertura.sourceforge.net)
@@ -1420,8 +1422,6 @@ The following software have components provided under the terms of this license:
========================================================================
unknown
========================================================================
-The following software have components provided under the terms of this license:
-
- Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs (from http://www.bouncycastle.org/java.html, https://maven.repository.redhat.com/ga/org/bouncycastle/bcpkix-jdk15on, https://www.bouncycastle.org/java.html)
- Bouncy Castle Provider (from http://www.bouncycastle.org/java.html, https://www.bouncycastle.org/java.html)
- Byte Buddy (without dependencies) (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy)
diff --git a/indexer-core/pom.xml b/indexer-core/pom.xml
index 1610d9e90a746b0bc994bbc8afd5b77334c6edd4..38bc8ede3e470380f9b83ab2287241ce6e1bd390 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.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>indexer-core</artifactId>
- <version>0.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
<name>indexer-core</name>
<description>Indexer Service Core</description>
<packaging>jar</packaging>
@@ -21,6 +21,7 @@
<netty.version>4.1.70.Final</netty.version>
<jackson-databind.version>2.13.2.2</jackson-databind.version>
<jackson.version>2.13.2</jackson.version>
+ <spring-webmvc.version>5.3.22</spring-webmvc.version>
</properties>
<dependencyManagement>
@@ -93,6 +94,11 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${spring-webmvc.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
diff --git a/pom.xml b/pom.xml
index 3907b9ac819906e948e7252025559435a8bd112f..a25f97f38f858a427647d57ecb5775ed22fe3628 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.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
<description>Indexer Service</description>
<properties>
diff --git a/provider/indexer-aws/pom.xml b/provider/indexer-aws/pom.xml
index 46286890938c950d1535aeb0fefe7f38c981b8fe..6dc92dc886154f9b9dfdfc1d7f4be1a558d6e28b 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.16.0-SNAPSHOT</version>
+ <version>0.17.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.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
<properties>
<aws.version>1.11.1018</aws.version>
@@ -34,6 +34,7 @@
<netty.version>4.1.51.Final</netty.version>
<jackson-databind.version>2.13.2.2</jackson-databind.version>
<jackson.version>2.13.2</jackson.version>
+ <spring-webmvc.version>5.3.22</spring-webmvc.version>
</properties>
<dependencyManagement>
@@ -65,7 +66,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-core</artifactId>
- <version>0.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
@@ -113,6 +114,11 @@
<artifactId>spring-security-oauth2-jose</artifactId>
<version>5.5.0</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${spring-webmvc.version}</version>
+ </dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
diff --git a/provider/indexer-azure/pom.xml b/provider/indexer-azure/pom.xml
index bd531416054177f557b65de1560435d1ed9dd98a..149bb96db03b11b74e45c0bb69622ceb734fd0a6 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.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>indexer-azure</artifactId>
- <version>0.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
<name>indexer-azure</name>
<description>Indexer Service Azure</description>
<packaging>jar</packaging>
@@ -39,7 +39,7 @@
<azure.appservice.subscription />
<log4j.version>2.17.1</log4j.version>
<nimbus-jose-jwt.version>8.2</nimbus-jose-jwt.version>
- <indexer-core.version>0.16.0-SNAPSHOT</indexer-core.version>
+ <indexer-core.version>0.17.0-SNAPSHOT</indexer-core.version>
<spring-security-jwt.version>1.1.1.RELEASE</spring-security-jwt.version>
<osdu.corelibazure.version>0.15.2</osdu.corelibazure.version>
<reactor-netty.version>0.9.12.RELEASE</reactor-netty.version>
@@ -54,6 +54,7 @@
<oauth2-oidc-sdk.version>6.5</oauth2-oidc-sdk.version>
<jackson-databind.version>2.13.2.2</jackson-databind.version>
<jackson.version>2.13.2</jackson.version>
+ <spring-webmvc.version>5.3.22</spring-webmvc.version>
</properties>
<dependencyManagement>
@@ -330,6 +331,11 @@
<artifactId>oauth2-oidc-sdk</artifactId>
<version>${oauth2-oidc-sdk.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${spring-webmvc.version}</version>
+ </dependency>
</dependencies>
diff --git a/provider/indexer-gcp/pom.xml b/provider/indexer-gcp/pom.xml
index 011a618f99bba5b42595777657594c1d33d9fa26..d31d420e9a84997bfdbac99d6bb555c5a8e3d68c 100644
--- a/provider/indexer-gcp/pom.xml
+++ b/provider/indexer-gcp/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-service</artifactId>
- <version>0.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>indexer-gcp</artifactId>
- <version>0.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
<name>indexer-gcp</name>
<description>Indexer Service GCP App Engine</description>
<packaging>jar</packaging>
@@ -24,7 +24,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-core</artifactId>
- <version>0.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
<!-- excluded due to runtime conflict with latest core-lib-gcp transient dependencies -->
<exclusions>
<exclusion>
@@ -126,6 +126,11 @@
<artifactId>logback-jackson</artifactId>
<version>0.1.5</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>5.3.22</version>
+ </dependency>
</dependencies>
<build>
diff --git a/provider/indexer-ibm/pom.xml b/provider/indexer-ibm/pom.xml
index 0d3326b4e8af00268aa567b7600e9249a4323ee0..c66e2182168c08bb7cfa3644a92cf7e5a50e0f64 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.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -32,8 +32,9 @@
<properties>
<tomcat.embed.core.version>9.0.54</tomcat.embed.core.version>
- <os-core-lib-ibm.version>0.16.0-rc1</os-core-lib-ibm.version>
- </properties>
+ <os-core-lib-ibm.version>0.16.0-rc1</os-core-lib-ibm.version>
+ <spring-webmvc.version>5.3.22</spring-webmvc.version>
+ </properties>
<profiles>
<profile>
@@ -54,7 +55,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-core</artifactId>
- <version>0.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
@@ -97,7 +98,12 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
+ <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-security</artifactId>
</dependency>
diff --git a/testing/indexer-test-anthos/pom.xml b/testing/indexer-test-anthos/pom.xml
index da0e04694198d3c210d9a6021c737548278211e5..1aecc91368ad453b8f87e9d82361db8b66a11aa3 100644
--- a/testing/indexer-test-anthos/pom.xml
+++ b/testing/indexer-test-anthos/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>indexer-test</artifactId>
<groupId>org.opengroup.osdu</groupId>
- <version>0.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-core</artifactId>
- <version>0.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
diff --git a/testing/indexer-test-aws/pom.xml b/testing/indexer-test-aws/pom.xml
index 08eb2ee5aae59ad99f793dca9682c6b8590bdf5e..3b1fe28b7c87e5cf216eafb2aab76a0125d689ea 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.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-aws</artifactId>
- <version>0.16.0-SNAPSHOT</version>
+ <version>0.17.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.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
</dependency>
<!-- AWS specific packages -->
diff --git a/testing/indexer-test-azure/pom.xml b/testing/indexer-test-azure/pom.xml
index efa8c10bb5cb69659d4489153256c857a9025530..583934d9541edb760870d5942eed84e1dc2612e9 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.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-azure</artifactId>
- <version>0.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-core</artifactId>
- <version>0.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
diff --git a/testing/indexer-test-core/pom.xml b/testing/indexer-test-core/pom.xml
index 893efe4c85eedf45c98b971470812ecf72f38882..630810847c18fa1b502cc309d0ae4a9138e3887e 100644
--- a/testing/indexer-test-core/pom.xml
+++ b/testing/indexer-test-core/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>indexer-test</artifactId>
- <version>0.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-core</artifactId>
- <version>0.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
<properties>
<maven.compiler.target>1.8</maven.compiler.target>
diff --git a/testing/indexer-test-gcp/pom.xml b/testing/indexer-test-gcp/pom.xml
index 708fd64870640d3cc8bad28ea8c822c07d82d140..9c57301cf8aa1c8896c962988814e56af6c00bcc 100644
--- a/testing/indexer-test-gcp/pom.xml
+++ b/testing/indexer-test-gcp/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>indexer-test</artifactId>
- <version>0.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-gcp</artifactId>
- <version>0.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-core</artifactId>
- <version>0.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
</dependency>
<!-- Cucumber -->
diff --git a/testing/indexer-test-ibm/pom.xml b/testing/indexer-test-ibm/pom.xml
index fa10dc9392a47a49154053a549f4764bb46d7173..621a5e31da0160a3e6847b30ac36a51de1c0f300 100644
--- a/testing/indexer-test-ibm/pom.xml
+++ b/testing/indexer-test-ibm/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>indexer-test</artifactId>
- <version>0.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-ibm</artifactId>
- <version>0.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-core</artifactId>
- <version>0.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/testing/pom.xml b/testing/pom.xml
index 372ec0d41185ca45aa7990749601a3f0261e9247..6938e65b88ea73592a1f57d8f90cbf107a0f8e4b 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.16.0-SNAPSHOT</version>
+ <version>0.17.0-SNAPSHOT</version>
<description>Indexer Service Integration Test Root Project</description>
<properties>
<spring.version>5.1.19.RELEASE</spring.version>