Commit 9bcb232c authored by Rucha Deshpande's avatar Rucha Deshpande
Browse files

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

parents 46c8b516 d8ed859d
This diff is collapsed.
...@@ -39,7 +39,8 @@ ...@@ -39,7 +39,8 @@
<springframework.version>4.3.0.RELEASE</springframework.version> <springframework.version>4.3.0.RELEASE</springframework.version>
<reactor.netty.version>0.11.0.RELEASE</reactor.netty.version> <reactor.netty.version>0.11.0.RELEASE</reactor.netty.version>
<reactor.core.version>3.3.0.RELEASE</reactor.core.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> <junit.version>5.6.0</junit.version>
<jjwt.version>3.8.1</jjwt.version> <jjwt.version>3.8.1</jjwt.version>
<mockito.version>2.23.0</mockito.version> <mockito.version>2.23.0</mockito.version>
...@@ -80,6 +81,7 @@ ...@@ -80,6 +81,7 @@
<dependency> <dependency>
<groupId>org.opengroup.osdu</groupId> <groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId> <artifactId>os-core-common</artifactId>
<version>${osdu.oscorecommon.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.opengroup.osdu</groupId> <groupId>org.opengroup.osdu</groupId>
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<dependency> <dependency>
<groupId>org.opengroup.osdu</groupId> <groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-lib-ibm</artifactId> <artifactId>os-core-lib-ibm</artifactId>
<version>0.9.0</version> <version>0.12.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -25,6 +25,7 @@ import java.util.UUID; ...@@ -25,6 +25,7 @@ import java.util.UUID;
public class StorageIntegrationDescriptor extends RestDescriptor { public class StorageIntegrationDescriptor extends RestDescriptor {
protected static final String LEGAL_TAG = TestUtils.getOsduTenant() + "-test-tag"; protected static final String LEGAL_TAG = TestUtils.getOsduTenant() + "-test-tag";
protected static final String DOMAIN = System.getProperty("DOMAIN", System.getenv("DOMAIN"));
@Override @Override
public String getPath() { public String getPath() {
...@@ -38,6 +39,7 @@ public class StorageIntegrationDescriptor extends RestDescriptor { ...@@ -38,6 +39,7 @@ public class StorageIntegrationDescriptor extends RestDescriptor {
@Override @Override
public String getValidBody() { public String getValidBody() {
String postfix = String.format("%s.%s", TestUtils.getOsduTenant(), DOMAIN);
return "[\n" + return "[\n" +
" {\n" + " {\n" +
" \"data\":{\n" + " \"data\":{\n" +
...@@ -49,9 +51,9 @@ public class StorageIntegrationDescriptor extends RestDescriptor { ...@@ -49,9 +51,9 @@ public class StorageIntegrationDescriptor extends RestDescriptor {
" \"kind\":\"opendes:at:wellbore:1.0.0\",\n" + " \"kind\":\"opendes:at:wellbore:1.0.0\",\n" +
" \"acl\":{\n" + " \"acl\":{\n" +
" \"viewers\":[\n" + " \"viewers\":[\n" +
" \"data.test1@opendes.contoso.com\"],\n" + " \"data.test1@" + postfix + "\"],\n" +
" \"owners\":[\n" + " \"owners\":[\n" +
" \"data.test1@opendes.contoso.com\"]},\n" + " \"data.test1@" + postfix + "\"]},\n" +
" \"legal\":{\n" + " \"legal\":{\n" +
" \"legaltags\":[\n" + " \"legaltags\":[\n" +
" \"" + LEGAL_TAG + "\"],\n" + " \"" + LEGAL_TAG + "\"],\n" +
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<java.version>8</java.version> <java.version>8</java.version>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<maven.compiler.source>${java.version}</maven.compiler.source> <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> </properties>
<dependencies> <dependencies>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment