diff --git a/provider/indexer-gcp/maven/settings.xml b/provider/indexer-gcp/maven/settings.xml
index 601aa71ea3679d558de22b4e530c9dc2a9467f7f..b7a15a01004e3079c32548b080a7c49d2861d9df 100644
--- a/provider/indexer-gcp/maven/settings.xml
+++ b/provider/indexer-gcp/maven/settings.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
- <servers>
- <server>
- <id>dev-azure-com-slb-des-ext-collaboration-os-core</id>
- <username>os-core</username>
- <!-- Treat this auth token like a password. Do not share it with anyone, including Microsoft support. -->
- <!-- The generated token expires on or before 10/8/2019 -->
- <password>${VSTS_FEED_TOKEN}</password>
- </server>
- </servers>
-</settings>
\ No newline at end of file
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+ <servers>
+ <server>
+ <id>os-core</id>
+ <username>slb-des-ext-collaboration</username>
+ <!-- Treat this auth token like a password. Do not share it with anyone, including Microsoft support. -->
+ <!-- The generated token expires on or before 11/14/2019 -->
+ <password>${VSTS_FEED_TOKEN}</password>
+ </server>
+ </servers>
+</settings>
diff --git a/testing/indexer-test-aws/src/test/java/org/opengroup/osdu/step_definitions/index/deleteschema/RunTest.java b/testing/indexer-test-aws/src/test/java/org/opengroup/osdu/step_definitions/index/deleteschema/RunTest.java
deleted file mode 100644
index dfbef4e74912db354e955162d0718a5319dfad71..0000000000000000000000000000000000000000
--- a/testing/indexer-test-aws/src/test/java/org/opengroup/osdu/step_definitions/index/deleteschema/RunTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright © Amazon Web Services
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.opengroup.osdu.step_definitions.index.deleteschema;
-
-import cucumber.api.CucumberOptions;
-import cucumber.api.junit.Cucumber;
-import org.junit.runner.RunWith;
-
-@RunWith(Cucumber.class)
-@CucumberOptions(
- features = "classpath:features/delete/Delete.feature",
- glue={"classpath:org.opengroup.osdu.step_definitions/index/deleteschema"},
- format = {"pretty", "junit:target/cucumber-reports/TEST-deleteschema.xml"})
-public class RunTest {
-}
\ No newline at end of file
diff --git a/testing/indexer-test-aws/src/test/java/org/opengroup/osdu/step_definitions/index/deleteschema/Steps.java b/testing/indexer-test-aws/src/test/java/org/opengroup/osdu/step_definitions/index/deleteschema/Steps.java
deleted file mode 100644
index 6df3c3e803f4b95ab28b129f95f410d2bb9cd189..0000000000000000000000000000000000000000
--- a/testing/indexer-test-aws/src/test/java/org/opengroup/osdu/step_definitions/index/deleteschema/Steps.java
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright © Amazon Web Services
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.opengroup.osdu.step_definitions.index.deleteschema;
-
-import cucumber.api.Scenario;
-import cucumber.api.java.Before;
-import org.opengroup.osdu.common.DeleteSchemaSteps;
-import org.opengroup.osdu.util.AWSHTTPClient;
-
-import cucumber.api.DataTable;
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
-import org.opengroup.osdu.util.ElasticUtils;
-import org.opengroup.osdu.util.ElasticUtilsAws;
-
-import java.util.List;
-
-public class Steps extends DeleteSchemaSteps {
-
- public Steps() {
- super(new AWSHTTPClient(), new ElasticUtilsAws());
- }
-
- @Before
- public void before(Scenario scenario) {
- this.scenario = scenario;
- this.httpClient = new AWSHTTPClient();
- }
-
- @Given("^the elastic search is initialized with the following data$")
- public void the_elastic_search_is_initialized_with_the_following_data(DataTable dataTable) throws Throwable {
- super.the_elastic_search_is_initialized_with_the_following_data(dataTable);
- }
-
- @When("^I send a delete request with \"([^\"]*)\"$")
- public void i_send_a_delete_request_with(String kind) throws Throwable {
- super.i_send_a_delete_request_with(kind);
- }
-
- @Then("^the index should get delete and I should get (\\d+) response$")
- public void the_index_should_get_delete_and_I_should_get_response(int code) throws Throwable {
- super.the_index_should_get_delete_and_I_should_get_response(code);
- }
-
- @Then("^I should get ([^\"]*) response with reason: \"(.*?)\", message: \"(.*?)\" and errors: \"(.*?)\"$")
- public void i_should_get_response_with_reason_message_and_errors(List<Integer> codes, String type, String msg,
- String error) throws Throwable {
- super.i_should_get_response_with_reason_message_and_errors(codes, type, msg, error);
- }
-
-}
diff --git a/testing/indexer-test-aws/src/test/java/org/opengroup/osdu/step_definitions/index/getschema/RunTest.java b/testing/indexer-test-aws/src/test/java/org/opengroup/osdu/step_definitions/index/getschema/RunTest.java
deleted file mode 100644
index 1e5f81d9aaed6097b89bf033b5582678a783877b..0000000000000000000000000000000000000000
--- a/testing/indexer-test-aws/src/test/java/org/opengroup/osdu/step_definitions/index/getschema/RunTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright © Amazon Web Services
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.opengroup.osdu.step_definitions.index.getschema;
-
-import cucumber.api.CucumberOptions;
-import cucumber.api.junit.Cucumber;
-import org.junit.runner.RunWith;
-
-
-@RunWith(Cucumber.class)
-@CucumberOptions(
- features = "classpath:features/kindschema/KindSchema.feature",
- glue = {"classpath:org.opengroup.osdu.step_definitions/index/getschema"},
- format = {"pretty", "junit:target/cucumber-reports/TEST-getschema.xml"})
-public class RunTest {
-}
\ No newline at end of file
diff --git a/testing/indexer-test-aws/src/test/java/org/opengroup/osdu/step_definitions/index/getschema/Steps.java b/testing/indexer-test-aws/src/test/java/org/opengroup/osdu/step_definitions/index/getschema/Steps.java
deleted file mode 100644
index 94ec2070e649314960eea64730aaa816180a60aa..0000000000000000000000000000000000000000
--- a/testing/indexer-test-aws/src/test/java/org/opengroup/osdu/step_definitions/index/getschema/Steps.java
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright © Amazon Web Services
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.opengroup.osdu.step_definitions.index.getschema;
-
-import org.opengroup.osdu.common.GetSchemaSteps;
-import org.opengroup.osdu.util.AWSHTTPClient;
-
-import cucumber.api.Scenario;
-import cucumber.api.java.Before;
-import cucumber.api.DataTable;
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
-import org.opengroup.osdu.util.ElasticUtilsAws;
-
-public class Steps extends GetSchemaSteps {
- public Steps() {
- super(new AWSHTTPClient(), new ElasticUtilsAws());
- }
-
- @Before
- public void before(Scenario scenario) {
- this.scenario = scenario;
- this.httpClient = new AWSHTTPClient();
- }
-
- @Given("^the elastic search is initialized with the following data$")
- public void the_elastic_search_is_initialized_with_the_following_data(DataTable dataTable) throws Throwable {
- super.the_elastic_search_is_initialized_with_the_following_data(dataTable);
- }
-
- @When("^I send get schema request with \"([^\"]*)\"$")
- public void i_send_get_schema_request_with(String kind) throws Throwable {
- super.i_send_get_schema_request_with(kind);
- }
-
- @When("^I send request to tenant \"(.*?)\"$")
- public void i_send_request_to_tenant(String tenant) throws Throwable {
- super.i_send_request_to_tenant(tenant);
- }
-
- @Then("^I should get ([^\"]*) response with reason: \"(.*?)\", message: \"(.*?)\" and errors: \"(.*?)\"$")
- public void i_should_get_response_with_reason_message_and_errors(int responseCode, String type, String msg,
- String error) throws Throwable {
- super.i_should_get_response_with_reason_message_and_errors(responseCode, type, msg, error);
- }
-
- @Then("^I should get (\\d+) status with response \"(.*?)\"$")
- public void i_should_get_status_with_response(int statusCode, String response) throws Throwable {
- super.i_should_get_status_with_response(statusCode, response);
- }
-
-}
\ No newline at end of file
diff --git a/testing/indexer-test-gcp/src/test/java/org/opengroup/osdu/step_definitions/index/deleteschema/RunTest.java b/testing/indexer-test-gcp/src/test/java/org/opengroup/osdu/step_definitions/index/deleteschema/RunTest.java
deleted file mode 100644
index b04eb1b3079df08037ce32ada4f8f007c941e410..0000000000000000000000000000000000000000
--- a/testing/indexer-test-gcp/src/test/java/org/opengroup/osdu/step_definitions/index/deleteschema/RunTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.opengroup.osdu.step_definitions.index.deleteschema;
-
-import cucumber.api.CucumberOptions;
-import cucumber.api.junit.Cucumber;
-import org.junit.runner.RunWith;
-
-@RunWith(Cucumber.class)
-@CucumberOptions(
- features = "classpath:features/delete/Delete.feature",
- glue={"classpath:org.opengroup.osdu.step_definitions/index/deleteschema"},
- format = {"pretty", "junit:target/cucumber-reports/TEST-deleteschema.xml"})
-public class RunTest {
-}
\ No newline at end of file
diff --git a/testing/indexer-test-gcp/src/test/java/org/opengroup/osdu/step_definitions/index/deleteschema/Steps.java b/testing/indexer-test-gcp/src/test/java/org/opengroup/osdu/step_definitions/index/deleteschema/Steps.java
deleted file mode 100644
index 344d597375249c43a2db50cea58ec6177e1346d3..0000000000000000000000000000000000000000
--- a/testing/indexer-test-gcp/src/test/java/org/opengroup/osdu/step_definitions/index/deleteschema/Steps.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.opengroup.osdu.step_definitions.index.deleteschema;
-
-import cucumber.api.Scenario;
-import cucumber.api.java.Before;
-import org.opengroup.osdu.common.DeleteSchemaSteps;
-import org.opengroup.osdu.util.GCPHTTPClient;
-
-import cucumber.api.DataTable;
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
-
-import java.util.List;
-
-public class Steps extends DeleteSchemaSteps {
-
- public Steps() {
- super(new GCPHTTPClient());
- }
-
- @Before
- public void before(Scenario scenario) {
- this.scenario = scenario;
- this.httpClient = new GCPHTTPClient();
- }
-
- @Given("^the elastic search is initialized with the following data$")
- public void the_elastic_search_is_initialized_with_the_following_data(DataTable dataTable) throws Throwable {
- super.the_elastic_search_is_initialized_with_the_following_data(dataTable);
- }
-
- @When("^I send a delete request with \"([^\"]*)\"$")
- public void i_send_a_delete_request_with(String kind) throws Throwable {
- super.i_send_a_delete_request_with(kind);
- }
-
- @Then("^the index should get delete and I should get (\\d+) response$")
- public void the_index_should_get_delete_and_I_should_get_response(int code) throws Throwable {
- super.the_index_should_get_delete_and_I_should_get_response(code);
- }
-
- @Then("^I should get ([^\"]*) response with reason: \"(.*?)\", message: \"(.*?)\" and errors: \"(.*?)\"$")
- public void i_should_get_response_with_reason_message_and_errors(List<Integer> codes, String type, String msg,
- String error) throws Throwable {
- super.i_should_get_response_with_reason_message_and_errors(codes, type, msg, error);
- }
-
-}
diff --git a/testing/indexer-test-gcp/src/test/java/org/opengroup/osdu/step_definitions/index/getschema/RunTest.java b/testing/indexer-test-gcp/src/test/java/org/opengroup/osdu/step_definitions/index/getschema/RunTest.java
deleted file mode 100644
index b60b4a1c581517f89f6e0b447738847cb2f75872..0000000000000000000000000000000000000000
--- a/testing/indexer-test-gcp/src/test/java/org/opengroup/osdu/step_definitions/index/getschema/RunTest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.opengroup.osdu.step_definitions.index.getschema;
-
-import cucumber.api.CucumberOptions;
-import cucumber.api.junit.Cucumber;
-import org.junit.runner.RunWith;
-
-
-@RunWith(Cucumber.class)
-@CucumberOptions(
- features = "classpath:features/kindschema/KindSchema.feature",
- glue = {"classpath:org.opengroup.osdu.step_definitions/index/getschema"},
- format = {"pretty", "junit:target/cucumber-reports/TEST-getschema.xml"})
-public class RunTest {
-}
\ No newline at end of file
diff --git a/testing/indexer-test-gcp/src/test/java/org/opengroup/osdu/step_definitions/index/getschema/Steps.java b/testing/indexer-test-gcp/src/test/java/org/opengroup/osdu/step_definitions/index/getschema/Steps.java
deleted file mode 100644
index 349f6163f72cf6719526e011c210a8f55a0596a0..0000000000000000000000000000000000000000
--- a/testing/indexer-test-gcp/src/test/java/org/opengroup/osdu/step_definitions/index/getschema/Steps.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.opengroup.osdu.step_definitions.index.getschema;
-
-import org.opengroup.osdu.common.GetSchemaSteps;
-import org.opengroup.osdu.util.GCPHTTPClient;
-
-import cucumber.api.Scenario;
-import cucumber.api.java.Before;
-import cucumber.api.DataTable;
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
-
-public class Steps extends GetSchemaSteps {
- public Steps() {
- super(new GCPHTTPClient());
- }
-
- @Before
- public void before(Scenario scenario) {
- this.scenario = scenario;
- this.httpClient = new GCPHTTPClient();
- }
-
- @Given("^the elastic search is initialized with the following data$")
- public void the_elastic_search_is_initialized_with_the_following_data(DataTable dataTable) throws Throwable {
- super.the_elastic_search_is_initialized_with_the_following_data(dataTable);
- }
-
- @When("^I send get schema request with \"([^\"]*)\"$")
- public void i_send_get_schema_request_with(String kind) throws Throwable {
- super.i_send_get_schema_request_with(kind);
- }
-
- @When("^I send request to tenant \"(.*?)\"$")
- public void i_send_request_to_tenant(String tenant) throws Throwable {
- super.i_send_request_to_tenant(tenant);
- }
-
- @Then("^I should get ([^\"]*) response with reason: \"(.*?)\", message: \"(.*?)\" and errors: \"(.*?)\"$")
- public void i_should_get_response_with_reason_message_and_errors(int responseCode, String type, String msg,
- String error) throws Throwable {
- super.i_should_get_response_with_reason_message_and_errors(responseCode, type, msg, error);
- }
-
- @Then("^I should get (\\d+) status with response \"(.*?)\"$")
- public void i_should_get_status_with_response(int statusCode, String response) throws Throwable {
- super.i_should_get_status_with_response(statusCode, response);
- }
-
-}
\ No newline at end of file
diff --git a/testing/maven/settings.xml b/testing/maven/settings.xml
index 601aa71ea3679d558de22b4e530c9dc2a9467f7f..b7a15a01004e3079c32548b080a7c49d2861d9df 100644
--- a/testing/maven/settings.xml
+++ b/testing/maven/settings.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
- <servers>
- <server>
- <id>dev-azure-com-slb-des-ext-collaboration-os-core</id>
- <username>os-core</username>
- <!-- Treat this auth token like a password. Do not share it with anyone, including Microsoft support. -->
- <!-- The generated token expires on or before 10/8/2019 -->
- <password>${VSTS_FEED_TOKEN}</password>
- </server>
- </servers>
-</settings>
\ No newline at end of file
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+ <servers>
+ <server>
+ <id>os-core</id>
+ <username>slb-des-ext-collaboration</username>
+ <!-- Treat this auth token like a password. Do not share it with anyone, including Microsoft support. -->
+ <!-- The generated token expires on or before 11/14/2019 -->
+ <password>${VSTS_FEED_TOKEN}</password>
+ </server>
+ </servers>
+</settings>