Commit 7c887764 authored by Spencer Sutton's avatar Spencer Sutton
Browse files

Merge branch 'azure-fixing-pom' into 'aws-integration-only'

Azure: fixing azure pom

See merge request !90
parents 3e7943af 6e3d0583
Pipeline #29550 passed with stages
in 78 minutes and 43 seconds
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<properties> <properties>
<osdu.corelibazure.version>0.0.40</osdu.corelibazure.version> <osdu.corelibazure.version>0.0.40</osdu.corelibazure.version>
<osdu.oscorecommon.version>0.3.18</osdu.oscorecommon.version> <osdu.oscorecommon.version>0.3.28</osdu.oscorecommon.version>
<osdu.os-schema-core.version>0.6.0-SNAPSHOT</osdu.os-schema-core.version> <osdu.os-schema-core.version>0.6.0-SNAPSHOT</osdu.os-schema-core.version>
<mockito.version>1.10.19</mockito.version> <mockito.version>1.10.19</mockito.version>
<cucumber.version>5.4.0</cucumber.version> <cucumber.version>5.4.0</cucumber.version>
...@@ -45,6 +45,12 @@ ...@@ -45,6 +45,12 @@
<version>${osdu.corelibazure.version}</version> <version>${osdu.corelibazure.version}</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
<exclusions>
<exclusion>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
...@@ -63,14 +69,14 @@ ...@@ -63,14 +69,14 @@
<dependency> <dependency>
<groupId>org.opengroup.osdu</groupId> <groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-azure</artifactId> <artifactId>os-core-common</artifactId>
<version>${osdu.corelibazure.version}</version> <version>${osdu.oscorecommon.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.opengroup.osdu</groupId> <groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId> <artifactId>core-lib-azure</artifactId>
<version>${osdu.oscorecommon.version}</version> <version>${osdu.corelibazure.version}</version>
</dependency> </dependency>
<dependency> <dependency>
......
Supports Markdown
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