diff --git a/devops/gc/pipeline/override-stages.yml b/devops/gc/pipeline/override-stages.yml
index e14557ddd5d4093b0d0a8a92a2c9d1214ec4217c..4da64870338f033683f3f1aae58a594fd6c7c1a6 100644
--- a/devops/gc/pipeline/override-stages.yml
+++ b/devops/gc/pipeline/override-stages.yml
@@ -2,6 +2,6 @@ variables:
GC_SERVICE: indexer
GC_VENDOR: gc
-gc-anthos-test:
+gc-baremetal-test:
variables:
- GC_VENDOR: anthos
+ GC_VENDOR: baremetal
diff --git a/indexer-core/pom.xml b/indexer-core/pom.xml
index b888f32f7dc8a12d46e2ff07887954dbb1da7af5..a1c214310ea96f1facf93048cbe323c96cc1cef7 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.21.0-SNAPSHOT</version>
+ <version>0.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>indexer-core</artifactId>
- <version>0.21.0-SNAPSHOT</version>
+ <version>0.22.0-SNAPSHOT</version>
<name>indexer-core</name>
<description>Indexer Service Core</description>
<packaging>jar</packaging>
diff --git a/pom.xml b/pom.xml
index 41919837141fd99c52bad08bf487f436c68e4721..ec6a3591728e53b25d631de71f83b81dba5420be 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.21.0-SNAPSHOT</version>
+ <version>0.22.0-SNAPSHOT</version>
<description>Indexer Service</description>
<properties>
diff --git a/provider/indexer-aws/pom.xml b/provider/indexer-aws/pom.xml
index 9836c17ca9691b8846dddce43635db3d626ad4ac..b2260ea5936e230c435272fa6cb1cec82cdb6a72 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.21.0-SNAPSHOT</version>
+ <version>0.22.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.21.0-SNAPSHOT</version>
+ <version>0.22.0-SNAPSHOT</version>
<properties>
<aws.version>1.11.1018</aws.version>
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-core</artifactId>
- <version>0.21.0-SNAPSHOT</version>
+ <version>0.22.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
diff --git a/provider/indexer-aws/src/main/resources/application.properties b/provider/indexer-aws/src/main/resources/application.properties
index c5c6ea7f91a86e817b90613a5c452d279b653bf6..a0d1a419f6a6aa71128963495390ae748e7e9649 100644
--- a/provider/indexer-aws/src/main/resources/application.properties
+++ b/provider/indexer-aws/src/main/resources/application.properties
@@ -45,7 +45,7 @@ aws.elasticache.cluster.schema.expiration=60
# AWS user agent variables
aws.disableUserAgent=${DISABLE_USER_AGENT}
-aws.osduVersion={OSDU_VERSION}
+aws.osduVersion=${OSDU_VERSION}
# Maximum size of cache value
MAX_CACHE_VALUE_SIZE=1000
diff --git a/provider/indexer-azure/pom.xml b/provider/indexer-azure/pom.xml
index 50d61b34398c62ce3c7047ec303b6d8f97f40877..9be42bd821dc93e11175b100279ab6a482b765e0 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.21.0-SNAPSHOT</version>
+ <version>0.22.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>indexer-azure</artifactId>
- <version>0.21.0-SNAPSHOT</version>
+ <version>0.22.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.20.2</nimbus-jose-jwt.version>
- <indexer-core.version>0.21.0-SNAPSHOT</indexer-core.version>
+ <indexer-core.version>0.22.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.21.0-rc4</os-core-common.version>
diff --git a/provider/indexer-gc/README.md b/provider/indexer-gc/README.md
index 40f0a3b857e18748efcf064cb99357ff2ddc97fb..22e77c33bbd094573845b7d5ad974792a0812ab0 100644
--- a/provider/indexer-gc/README.md
+++ b/provider/indexer-gc/README.md
@@ -21,9 +21,9 @@ These instructions will get you a copy of the project up and running on your loc
## Service Configuration
-### Anthos
+### Baremetal
-[Anthos service configuration](docs/anthos/README.md)
+[Baremetal service configuration](docs/baremetal/README.md)
### Google Cloud
@@ -57,9 +57,9 @@ In the current version, the mappers are equipped with several drivers to the sto
* GCloud SDK with java (latest version)
-### Anthos Service Configuration
+### Baremetal Service Configuration
-[Anthos service configuration](docs/anthos/README.md)
+[Baremetal service configuration](docs/baremetal/README.md)
### Google Cloud Service Configuration
@@ -161,9 +161,9 @@ $ (cd testing/indexer-test-core/ && mvn clean install)
This section describes how to run cloud OSDU E2E tests.
-### Anthos test configuration
+### Baremetal test configuration
-[Anthos service configuration](docs/anthos/README.md)
+[Baremetal service configuration](docs/baremetal/README.md)
### Google Cloud test configuration
diff --git a/provider/indexer-gc/cloudbuild/Dockerfile.cloudbuild b/provider/indexer-gc/cloudbuild/Dockerfile.cloudbuild
index 1827af1db5b63a0c720fd2700281274db33385b8..e0d0005b0a7260d465357bd05807ad099f1a6aee 100644
--- a/provider/indexer-gc/cloudbuild/Dockerfile.cloudbuild
+++ b/provider/indexer-gc/cloudbuild/Dockerfile.cloudbuild
@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk-alpine:8-latest
+FROM azul/zulu-openjdk:8-latest
WORKDIR /app
ARG PROVIDER_NAME
ENV PROVIDER_NAME $PROVIDER_NAME
diff --git a/provider/indexer-gc/docs/anthos/README.md b/provider/indexer-gc/docs/anthos/README.md
index c1ab582eb05c57bff35be5013b3b43a9f8fe9406..fd4b4c3bda463cd66d0abf591803f577fade610a 100644
--- a/provider/indexer-gc/docs/anthos/README.md
+++ b/provider/indexer-gc/docs/anthos/README.md
@@ -32,7 +32,7 @@ Defined in default application property file but possible to override:
| `STORAGE_HOST` | ex `https://storage.com` | Storage host | no | output of infrastructure deployment |
| `SCHEMA_BASE_HOST` | ex `https://schema.com` | Schema service host | no | output of infrastructure deployment |
-These variables define service behavior, and are used to switch between `anthos` or `gcp` environments, their overriding and usage in mixed mode was not tested.
+These variables define service behavior, and are used to switch between `baremetal` or `gcp` environments, their overriding and usage in mixed mode was not tested.
Usage of spring profiles is preferred.
| name | value | description | sensitive? | source |
@@ -263,5 +263,5 @@ Execute following command to build code and run all the integration tests:
```bash
# Note: this assumes that the environment variables for integration tests as outlined
# above are already exported in your environment.
-$ (cd testing/indexer-test-anthos/ && mvn clean test)
+$ (cd testing/indexer-test-baremetal/ && mvn clean test)
```
diff --git a/provider/indexer-gc/pom.xml b/provider/indexer-gc/pom.xml
index 54513c202ec58b097a8b1080ce7aaae4f5e02b64..afcc9d3d877bf68a4ce278321127eb8a0962392b 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.21.0-SNAPSHOT</version>
+ <version>0.22.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>indexer-gc</artifactId>
- <version>0.21.0-SNAPSHOT</version>
+ <version>0.22.0-SNAPSHOT</version>
<name>indexer-gc</name>
<description>Indexer Service Google Cloud</description>
<packaging>jar</packaging>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-core</artifactId>
- <version>0.21.0-SNAPSHOT</version>
+ <version>0.22.0-SNAPSHOT</version>
<!-- excluded due to runtime conflict with latest core-lib-gcp transient dependencies -->
<exclusions>
<exclusion>
diff --git a/provider/indexer-ibm/pom.xml b/provider/indexer-ibm/pom.xml
index 82d58bd58e8364de9c639bb2ae4b24433ae9b1d1..4ae8be12c5f7d879d936634dbcae0d78425925e5 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.21.0-SNAPSHOT</version>
+ <version>0.22.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-core</artifactId>
- <version>0.21.0-SNAPSHOT</version>
+ <version>0.22.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 de8b92b86ab78d93d3763a30abd352ad5ec49fbe..eea6223f48a398fd22d5fa7b227c3692d2c5350e 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.21.0-SNAPSHOT</version>
+ <version>0.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-aws</artifactId>
- <version>0.21.0-SNAPSHOT</version>
+ <version>0.22.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.21.0-SNAPSHOT</version>
+ <version>0.22.0-SNAPSHOT</version>
</dependency>
<!-- AWS specific packages -->
diff --git a/testing/indexer-test-azure/pom.xml b/testing/indexer-test-azure/pom.xml
index c636dad6ad94d6143ef73dbef89a7bcc0e753fb2..be6efd9ae228f9eacfccc671caef7e673e445afb 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.21.0-SNAPSHOT</version>
+ <version>0.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-azure</artifactId>
- <version>0.21.0-SNAPSHOT</version>
+ <version>0.22.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.21.0-SNAPSHOT</version>
+ <version>0.22.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
diff --git a/testing/indexer-test-anthos/pom.xml b/testing/indexer-test-baremetal/pom.xml
similarity index 95%
rename from testing/indexer-test-anthos/pom.xml
rename to testing/indexer-test-baremetal/pom.xml
index c1c1191aa79fadaff4e64c4c9deb6e6a91fbce22..de7cc1a6dc31ff4d6ddef8e1538bd3b9162fadef 100644
--- a/testing/indexer-test-anthos/pom.xml
+++ b/testing/indexer-test-baremetal/pom.xml
@@ -20,11 +20,11 @@
<parent>
<artifactId>indexer-test</artifactId>
<groupId>org.opengroup.osdu</groupId>
- <version>0.21.0-SNAPSHOT</version>
+ <version>0.22.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>indexer-test-anthos</artifactId>
+ <artifactId>indexer-test-baremetal</artifactId>
<properties>
<maven.compiler.target>1.8</maven.compiler.target>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-core</artifactId>
- <version>0.21.0-SNAPSHOT</version>
+ <version>0.22.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
diff --git a/testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/step_definitions/info/RunTest.java b/testing/indexer-test-baremetal/src/test/java/org/opengroup/osdu/step_definitions/info/RunTest.java
similarity index 100%
rename from testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/step_definitions/info/RunTest.java
rename to testing/indexer-test-baremetal/src/test/java/org/opengroup/osdu/step_definitions/info/RunTest.java
diff --git a/testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/step_definitions/info/Steps.java b/testing/indexer-test-baremetal/src/test/java/org/opengroup/osdu/step_definitions/info/Steps.java
similarity index 100%
rename from testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/step_definitions/info/Steps.java
rename to testing/indexer-test-baremetal/src/test/java/org/opengroup/osdu/step_definitions/info/Steps.java
diff --git a/testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/step_definitions/record/RunTest.java b/testing/indexer-test-baremetal/src/test/java/org/opengroup/osdu/step_definitions/record/RunTest.java
similarity index 100%
rename from testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/step_definitions/record/RunTest.java
rename to testing/indexer-test-baremetal/src/test/java/org/opengroup/osdu/step_definitions/record/RunTest.java
diff --git a/testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/step_definitions/record/Steps.java b/testing/indexer-test-baremetal/src/test/java/org/opengroup/osdu/step_definitions/record/Steps.java
similarity index 100%
rename from testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/step_definitions/record/Steps.java
rename to testing/indexer-test-baremetal/src/test/java/org/opengroup/osdu/step_definitions/record/Steps.java
diff --git a/testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/util/AnthosHTTPClient.java b/testing/indexer-test-baremetal/src/test/java/org/opengroup/osdu/util/AnthosHTTPClient.java
similarity index 100%
rename from testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/util/AnthosHTTPClient.java
rename to testing/indexer-test-baremetal/src/test/java/org/opengroup/osdu/util/AnthosHTTPClient.java
diff --git a/testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/util/OpenIDTokenProvider.java b/testing/indexer-test-baremetal/src/test/java/org/opengroup/osdu/util/OpenIDTokenProvider.java
similarity index 100%
rename from testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/util/OpenIDTokenProvider.java
rename to testing/indexer-test-baremetal/src/test/java/org/opengroup/osdu/util/OpenIDTokenProvider.java
diff --git a/testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/util/conf/AnthosConfig.java b/testing/indexer-test-baremetal/src/test/java/org/opengroup/osdu/util/conf/AnthosConfig.java
similarity index 100%
rename from testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/util/conf/AnthosConfig.java
rename to testing/indexer-test-baremetal/src/test/java/org/opengroup/osdu/util/conf/AnthosConfig.java
diff --git a/testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/util/conf/OpenIDProviderConfig.java b/testing/indexer-test-baremetal/src/test/java/org/opengroup/osdu/util/conf/OpenIDProviderConfig.java
similarity index 100%
rename from testing/indexer-test-anthos/src/test/java/org/opengroup/osdu/util/conf/OpenIDProviderConfig.java
rename to testing/indexer-test-baremetal/src/test/java/org/opengroup/osdu/util/conf/OpenIDProviderConfig.java
diff --git a/testing/indexer-test-anthos/src/test/java/resources/logback-test.xml b/testing/indexer-test-baremetal/src/test/java/resources/logback-test.xml
similarity index 100%
rename from testing/indexer-test-anthos/src/test/java/resources/logback-test.xml
rename to testing/indexer-test-baremetal/src/test/java/resources/logback-test.xml
diff --git a/testing/indexer-test-core/pom.xml b/testing/indexer-test-core/pom.xml
index c5e856334d3d9cb01b22885714b3841db7668a3e..f341d13b07788c46a4fd0671d36a21daf022abf3 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.21.0-SNAPSHOT</version>
+ <version>0.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-core</artifactId>
- <version>0.21.0-SNAPSHOT</version>
+ <version>0.22.0-SNAPSHOT</version>
<properties>
<maven.compiler.target>1.8</maven.compiler.target>
diff --git a/testing/indexer-test-gc/pom.xml b/testing/indexer-test-gc/pom.xml
index db3c4f41e71c5524572f9f433a4d7288532370e1..ab4cdaa78fda0605159fab207e9f2810f4dd8727 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.21.0-SNAPSHOT</version>
+ <version>0.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-gc</artifactId>
- <version>0.21.0-SNAPSHOT</version>
+ <version>0.22.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.21.0-SNAPSHOT</version>
+ <version>0.22.0-SNAPSHOT</version>
</dependency>
<!-- Cucumber -->
diff --git a/testing/indexer-test-ibm/pom.xml b/testing/indexer-test-ibm/pom.xml
index 6d27a4904bff803ef284949fd99b9730e0bd6f28..d9ef6e862725d616bf7b16d746fd02c48222d58d 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.21.0-SNAPSHOT</version>
+ <version>0.22.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-ibm</artifactId>
- <version>0.21.0-SNAPSHOT</version>
+ <version>0.22.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.21.0-SNAPSHOT</version>
+ <version>0.22.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/testing/pom.xml b/testing/pom.xml
index 0af155f036c2d6b01b7720d850d3555e49beef36..b16bb64b6bbd3047e482a31d492582735da64685 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.21.0-SNAPSHOT</version>
+ <version>0.22.0-SNAPSHOT</version>
<description>Indexer Service Integration Test Root Project</description>
<properties>
<spring.version>5.3.23</spring.version>
@@ -39,7 +39,7 @@
<module>indexer-test-aws</module>
<module>indexer-test-azure</module>
<module>indexer-test-ibm</module>
- <module>indexer-test-anthos</module>
+ <module>indexer-test-baremetal</module>
</modules>
<repositories>