Merge remote-tracking branch 'origin/master' into dev

provider/notification-azure/pom.xml

@@ -39,7 +39,8 @@
     <springframework.version>4.3.0.RELEASE</springframework.version>
     <reactor.netty.version>0.11.0.RELEASE</reactor.netty.version>
     <reactor.core.version>3.3.0.RELEASE</reactor.core.version>
-    <osdu.corelibazure.version>0.11.0</osdu.corelibazure.version>
+    <osdu.corelibazure.version>0.12.0-rc10</osdu.corelibazure.version>
+    <osdu.oscorecommon.version>0.12.0-rc3</osdu.oscorecommon.version>
     <junit.version>5.6.0</junit.version>
     <jjwt.version>3.8.1</jjwt.version>
     <mockito.version>2.23.0</mockito.version>
@@ -80,6 +81,7 @@
     <dependency>
       <groupId>org.opengroup.osdu</groupId>
       <artifactId>os-core-common</artifactId>
+      <version>${osdu.oscorecommon.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opengroup.osdu</groupId>

provider/notification-ibm/pom.xml

@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
             <artifactId>os-core-lib-ibm</artifactId>
-            <version>0.9.0</version>
+            <version>0.12.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

testing/notification-test-azure/src/test/java/org/opengroup/osdu/notification/api/StorageIntegrationDescriptor.java

@@ -25,6 +25,7 @@ import java.util.UUID;
 public class StorageIntegrationDescriptor extends RestDescriptor {
 
     protected static final String LEGAL_TAG = TestUtils.getOsduTenant() + "-test-tag";
+    protected static final String DOMAIN = System.getProperty("DOMAIN", System.getenv("DOMAIN"));
 
     @Override
     public String getPath() {
@@ -38,6 +39,7 @@ public class StorageIntegrationDescriptor extends RestDescriptor {
 
     @Override
     public String getValidBody() {
+        String postfix = String.format("%s.%s", TestUtils.getOsduTenant(), DOMAIN);
         return "[\n" +
                 "  {\n" +
                 "      \"data\":{\n" +
@@ -49,9 +51,9 @@ public class StorageIntegrationDescriptor extends RestDescriptor {
                 "      \"kind\":\"opendes:at:wellbore:1.0.0\",\n" +
                 "      \"acl\":{\n" +
                 "            \"viewers\":[\n" +
-                "                 \"data.test1@opendes.contoso.com\"],\n" +
+                "                 \"data.test1@" + postfix + "\"],\n" +
                 "            \"owners\":[\n" +
-                "                 \"data.test1@opendes.contoso.com\"]},\n" +
+                "                 \"data.test1@" + postfix + "\"]},\n" +
                 "      \"legal\":{\n" +
                 "            \"legaltags\":[\n" +
                 "                 \"" + LEGAL_TAG + "\"],\n" +

testing/notification-test-ibm/pom.xml

@@ -33,7 +33,7 @@
         <java.version>8</java.version>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <maven.compiler.source>${java.version}</maven.compiler.source>
-        <os-core-lib-ibm.version>0.7.0</os-core-lib-ibm.version>
+        <os-core-lib-ibm.version>0.12.0-SNAPSHOT</os-core-lib-ibm.version>
     </properties>
 
     <dependencies>