Merge remote-tracking branch 'origin/master' into upgrade-dependencies

Conflicts:
	NOTICE

pom.xml

@@ -19,7 +19,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opengroup.osdu</groupId>
     <artifactId>os-register</artifactId>
-    <version>0.12.0-SNAPSHOT</version>
+    <version>0.13.0-SNAPSHOT</version>
     <description>Root Register Service project</description>
 
     <packaging>pom</packaging>

provider/register-aws/pom.xml

@@ -19,14 +19,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opengroup.osdu</groupId>
     <artifactId>register-aws</artifactId>
-    <version>0.12.0-SNAPSHOT</version>
+    <version>0.13.0-SNAPSHOT</version>
     <description>Register service on AWS</description>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>org.opengroup.osdu</groupId>
         <artifactId>os-register</artifactId>
-        <version>0.12.0-SNAPSHOT</version>
+        <version>0.13.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <properties>
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
             <artifactId>register-core</artifactId>
-            <version>0.12.0-SNAPSHOT</version>
+            <version>0.13.0-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.fasterxml.jackson.core</groupId>

provider/register-azure/pom.xml

@@ -20,14 +20,14 @@
     <parent>
         <artifactId>os-register</artifactId>
         <groupId>org.opengroup.osdu</groupId>
-        <version>0.12.0-SNAPSHOT</version>
+        <version>0.13.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>register-azure</artifactId>
     <description>Register service on Azure</description>
     <packaging>jar</packaging>
-    <version>0.12.0-SNAPSHOT</version>
+    <version>0.13.0-SNAPSHOT</version>
     <properties>
         <osdu.corelibazure.version>0.12.0</osdu.corelibazure.version>
         <osdu.oscorecommon.version>0.12.0</osdu.oscorecommon.version>

provider/register-gcp/pom.xml

@@ -19,14 +19,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opengroup.osdu</groupId>
   <artifactId>register-gcp</artifactId>
-  <version>0.12.0-SNAPSHOT</version>
+  <version>0.13.0-SNAPSHOT</version>
   <description>Register service</description>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.opengroup.osdu</groupId>
     <artifactId>os-register</artifactId>
-    <version>0.12.0-SNAPSHOT</version>
+    <version>0.13.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>org.opengroup.osdu</groupId>
       <artifactId>register-core</artifactId>
-      <version>0.12.0-SNAPSHOT</version>
+      <version>0.13.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>

provider/register-ibm/pom.xml

@@ -16,14 +16,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opengroup.osdu</groupId>
   <artifactId>register-ibm</artifactId>
-  <version>0.12.0-SNAPSHOT</version>
+  <version>0.13.0-SNAPSHOT</version>
   <description>Register service</description>
   <packaging>jar</packaging>
 
   <parent>
     <groupId>org.opengroup.osdu</groupId>
     <artifactId>os-register</artifactId>
-    <version>0.12.0-SNAPSHOT</version>
+    <version>0.13.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>org.opengroup.osdu</groupId>
       <artifactId>register-core</artifactId>
-      <version>0.12.0-SNAPSHOT</version>
+      <version>0.13.0-SNAPSHOT</version>
     </dependency>
 
 

provider/register-reference/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>os-register</artifactId>
     <groupId>org.opengroup.osdu</groupId>
-    <version>0.12.0-SNAPSHOT</version>
+    <version>0.13.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -13,7 +13,7 @@
   <groupId>org.opengroup.osdu</groupId>
   <artifactId>register-reference</artifactId>
   <description>Register service on Hybrid Cloud</description>
-  <version>0.12.0-SNAPSHOT</version>
+  <version>0.13.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <dependencies>
@@ -34,7 +34,7 @@
     <dependency>
       <groupId>org.opengroup.osdu</groupId>
       <artifactId>register-core</artifactId>
-      <version>0.12.0-SNAPSHOT</version>
+      <version>0.13.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>

register-core/pom.xml

@@ -19,14 +19,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opengroup.osdu</groupId>
     <artifactId>register-core</artifactId>
-    <version>0.12.0-SNAPSHOT</version>
+    <version>0.13.0-SNAPSHOT</version>
     <description>Core project for the register service.</description>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>org.opengroup.osdu</groupId>
         <artifactId>os-register</artifactId>
-        <version>0.12.0-SNAPSHOT</version>
+        <version>0.13.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

testing/pom.xml

@@ -18,7 +18,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.opengroup.osdu.register</groupId>
 	<artifactId>os-register-testing</artifactId>
-	<version>0.12.0-SNAPSHOT</version>
+	<version>0.13.0-SNAPSHOT</version>
 	<description>Root Register Service project</description>
 	<packaging>pom</packaging>
 

testing/register-test-aws/pom.xml

@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.opengroup.osdu.register</groupId>
         <artifactId>os-register-testing</artifactId>
-        <version>0.12.0-SNAPSHOT</version>
+        <version>0.13.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.opengroup.osdu.register</groupId>
     <artifactId>register-test-aws</artifactId>
-    <version>0.12.0-SNAPSHOT</version>
+    <version>0.13.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <description>Register service AWS integration tests </description>
@@ -104,7 +104,7 @@
         <dependency>
             <groupId>org.opengroup.osdu.register</groupId>
             <artifactId>register-test-core</artifactId>
-            <version>0.12.0-SNAPSHOT</version>
+            <version>0.13.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

testing/register-test-aws/src/test/java/org/opengroup/osdu/register/action/TestCreateActionApi.java

@@ -36,5 +36,11 @@ public class TestCreateActionApi extends CreateActionApiTest {
         this.testUtils = null;
     }
 
-
+    //overriding test to return 401 for AWS Istio config
+    @Test
+    @Override
+    public void should_return400_when_makingHttpRequestWithoutToken() throws Exception {
+        ClientResponse response = descriptor.run(getId(), "");
+        assertEquals(error(response.getEntity(String.class)), 401, response.getStatus());
+    }
 }

testing/register-test-aws/src/test/java/org/opengroup/osdu/register/action/TestDeleteActionApi.java

@@ -38,4 +38,11 @@ public class TestDeleteActionApi extends DeleteActionApiTest {
     }
 
 
+    //overriding test to return 401 for AWS Istio config
+    @Test
+    @Override
+    public void should_return400_when_makingHttpRequestWithoutToken() throws Exception {
+        ClientResponse response = descriptor.run(getId(), "");
+        assertEquals(error(response.getEntity(String.class)), 401, response.getStatus());
+    }
 }

testing/register-test-aws/src/test/java/org/opengroup/osdu/register/action/TestGetActionByIdApi.java

@@ -36,4 +36,12 @@ public class TestGetActionByIdApi extends GetActionByIdApiTest {
         this.testUtils = null;
     }
 
+
+    //overriding test to return 401 for AWS Istio config
+    @Test
+    @Override
+    public void should_return400_when_makingHttpRequestWithoutToken() throws Exception {
+        ClientResponse response = descriptor.run(getId(), "");
+        assertEquals(error(response.getEntity(String.class)), 401, response.getStatus());
+    }
 }

testing/register-test-aws/src/test/java/org/opengroup/osdu/register/action/TestRetrieveActionApi.java

@@ -38,4 +38,11 @@ public class TestRetrieveActionApi extends RetrieveActionApiTest {
     }
 
 
+    //overriding test to return 401 for AWS Istio config
+    @Test
+    @Override
+    public void should_return400_when_makingHttpRequestWithoutToken() throws Exception {
+        ClientResponse response = descriptor.run(getId(), "");
+        assertEquals(error(response.getEntity(String.class)), 401, response.getStatus());
+    }
 }

testing/register-test-aws/src/test/java/org/opengroup/osdu/register/ddms/TestCreateRegistrationApi.java

@@ -38,4 +38,11 @@ public class TestCreateRegistrationApi extends CreateRegistrationApiTest {
     }
 
 
+    //overriding test to return 401 for AWS Istio config
+    @Test
+    @Override
+    public void should_return400_when_makingHttpRequestWithoutToken() throws Exception {
+        ClientResponse response = descriptor.run(getId(), "");
+        assertEquals(error(response.getEntity(String.class)), 401, response.getStatus());
+    }
 }

testing/register-test-aws/src/test/java/org/opengroup/osdu/register/ddms/TestDeleteRegistrationApi.java

@@ -37,4 +37,11 @@ public class TestDeleteRegistrationApi extends DeleteRegistrationApiTest {
     }
 
 
+    //overriding test to return 401 for AWS Istio config
+    @Test
+    @Override
+    public void should_return400_when_makingHttpRequestWithoutToken() throws Exception {
+        ClientResponse response = descriptor.run(getId(), "");
+        assertEquals(error(response.getEntity(String.class)), 401, response.getStatus());
+    }
 }

testing/register-test-aws/src/test/java/org/opengroup/osdu/register/ddms/TestGetConsumptionByIdApi.java

@@ -38,4 +38,11 @@ public class TestGetConsumptionByIdApi extends GetConsumptionByIdApiTest {
     }
 
 
+    //overriding test to return 401 for AWS Istio config
+    @Test
+    @Override
+    public void should_return400_when_makingHttpRequestWithoutToken() throws Exception {
+        ClientResponse response = descriptor.run(getId(), "");
+        assertEquals(error(response.getEntity(String.class)), 401, response.getStatus());
+    }
 }

testing/register-test-aws/src/test/java/org/opengroup/osdu/register/ddms/TestGetRegistrationByIdApi.java

@@ -38,4 +38,11 @@ public class TestGetRegistrationByIdApi extends GetRegistrationByIdApiTest {
     }
 
 
+    //overriding test to return 401 for AWS Istio config
+    @Test
+    @Override
+    public void should_return400_when_makingHttpRequestWithoutToken() throws Exception {
+        ClientResponse response = descriptor.run(getId(), "");
+        assertEquals(error(response.getEntity(String.class)), 401, response.getStatus());
+    }
 }

testing/register-test-aws/src/test/java/org/opengroup/osdu/register/ddms/TestQueryDdmsByType.java

@@ -38,4 +38,11 @@ public class TestQueryDdmsByType extends QueryDdmsByTypeTest {
     }
 
 
+    //overriding test to return 401 for AWS Istio config
+    @Test
+    @Override
+    public void should_return400_when_makingHttpRequestWithoutToken() throws Exception {
+        ClientResponse response = descriptor.run(getId(), "");
+        assertEquals(error(response.getEntity(String.class)), 401, response.getStatus());
+    }
 }

testing/register-test-aws/src/test/java/org/opengroup/osdu/register/subscriber/TestCreateSubscriberApi.java

@@ -77,4 +77,12 @@ public class TestCreateSubscriberApi extends CreateSubscriberApiTest {
         assertEquals(url, subscriber.pushEndpoint);
     }
 
+
+    //overriding test to return 401 for AWS Istio config
+    @Test
+    @Override
+    public void should_return400_when_makingHttpRequestWithoutToken() throws Exception {
+        ClientResponse response = descriptor.run(getId(), "");
+        assertEquals(error(response.getEntity(String.class)), 401, response.getStatus());
+    }
 }