Merge branch 'master' into master-dev-merge

NOTICE

@@ -408,7 +408,6 @@ The following software have components provided under the terms of this license:
 - GAX (Google Api eXtensions) for Java (gRPC) (from <https://repo1.maven.org/maven2/com/google/api/gax-grpc>, https://repo1.maven.org/maven2/com/google/api/gax-grpc)
 - Hamcrest (from http://hamcrest.org/JavaHamcrest/)
 - Hamcrest Core (from http://hamcrest.org/, http://hamcrest.org/JavaHamcrest/, https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core)
-- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
 - Jodd BeanUtil (from http://jodd.org)
 - Jodd Core (from http://jodd.org)
 - Lucene Common Analyzers (from <https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common>, https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common)

testing/integration-tests/pom.xml

@@ -17,7 +17,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.opengroup.osdu</groupId>
-	<artifactId>os-search</artifactId>
+	<artifactId>os-search-testing</artifactId>
 	<version>0.21.0-SNAPSHOT</version>
 	<description>Search Service Integration Test Root Project</description>
 	<packaging>pom</packaging>

testing/integration-tests/search-test-anthos/pom.xml

@@ -19,7 +19,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>os-search</artifactId>
+        <artifactId>os-search-testing</artifactId>
         <groupId>org.opengroup.osdu</groupId>
         <version>0.21.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>

testing/integration-tests/search-test-aws/pom.xml

@@ -19,7 +19,7 @@
 
     <parent>
         <groupId>org.opengroup.osdu</groupId>
-        <artifactId>os-search</artifactId>
+        <artifactId>os-search-testing</artifactId>
         <version>0.21.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.opengroup.osdu.core.aws</groupId>
             <artifactId>os-core-lib-aws</artifactId>
-            <version>0.14.0-rc2</version>
+            <version>0.21.0-rc1</version>
         </dependency>
         <!-- Third party Apache 2.0 license packages -->
         <dependency>

testing/integration-tests/search-test-azure/pom.xml

@@ -20,7 +20,7 @@
 
     <parent>
         <groupId>org.opengroup.osdu</groupId>
-        <artifactId>os-search</artifactId>
+        <artifactId>os-search-testing</artifactId>
         <version>0.21.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

testing/integration-tests/search-test-core/pom.xml

@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>org.opengroup.osdu</groupId>
-        <artifactId>os-search</artifactId>
+        <artifactId>os-search-testing</artifactId>
         <version>0.21.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

testing/integration-tests/search-test-gc/pom.xml

@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>org.opengroup.osdu</groupId>
-        <artifactId>os-search</artifactId>
+        <artifactId>os-search-testing</artifactId>
         <version>0.21.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

testing/integration-tests/search-test-ibm/pom.xml

@@ -4,7 +4,7 @@
 
 	<parent>
 		<groupId>org.opengroup.osdu</groupId>
-		<artifactId>os-search</artifactId>
+		<artifactId>os-search-testing</artifactId>
 		<version>0.21.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>