Skip to content
Snippets Groups Projects
Commit f5887bf6 authored by Alok Joshi's avatar Alok Joshi
Browse files

Merge branch 'master' of... 

Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/storage into add-version-info-collab
parents fd1a7542 6ccebc44
No related branches found
No related tags found
2 merge requests!744Upgraded packages to mitigated vulns in netty, guava, snakeyaml,!607Separate out records changed message for collaboration context
Hide whitespace changes
Inline Side-by-side
Showing
with 34 additions and 34 deletions
pom.xml
+ 1
− 1
View file @ f5887bf6
......@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-storage</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<description>Root Storage Service project</description>
<properties>
......
provider/storage-aws/pom.xml
+ 3
− 3
View file @ f5887bf6
......@@ -21,20 +21,20 @@
<parent>
<artifactId>os-storage</artifactId>
<groupId>org.opengroup.osdu</groupId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>storage-aws</artifactId>
<description>Storage service on AWS</description>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<aws.version>1.11.1018</aws.version>
<deployment.environment>dev</deployment.environment>
<version.number>0.19.0-SNAPSHOT</version.number>
<version.number>0.20.0-SNAPSHOT</version.number>
<spring-webmvc.version>5.3.22</spring-webmvc.version>
</properties>
......
provider/storage-azure/pom.xml
+ 3
− 3
View file @ f5887bf6
......@@ -20,14 +20,14 @@
<parent>
<artifactId>os-storage</artifactId>
<groupId>org.opengroup.osdu</groupId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>storage-azure</artifactId>
<description>Storage service on Azure</description>
<packaging>jar</packaging>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<properties>
<azure.appservice.resourcegroup />
<azure.appservice.plan />
......@@ -35,7 +35,7 @@
<azure.appservice.subscription />
<!-- below corelibazure version will be updated to a release candidate once the associated MR is merged -->
<osdu.corelibazure.version>0.19.0-rc5</osdu.corelibazure.version>
<osdu.storage-core.version>0.19.0-SNAPSHOT</osdu.storage-core.version>
<osdu.storage-core.version>0.20.0-SNAPSHOT</osdu.storage-core.version>
<junit.version>4.12</junit.version>
<mockito.version>1.10.19</mockito.version>
<powermock.version>2.0.2</powermock.version>
......
provider/storage-byoc/pom.xml
+ 2
− 2
View file @ f5887bf6
......@@ -19,7 +19,7 @@
<parent>
<artifactId>os-storage</artifactId>
<groupId>org.opengroup.osdu</groupId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -36,7 +36,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>storage-core</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.powermock</groupId>
......
provider/storage-gc/pom.xml
+ 3
− 3
View file @ f5887bf6
......@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.opengroup.osdu</groupId>
<artifactId>storage-gc</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<description>Google cloud related implementation staff.</description>
<packaging>jar</packaging>
......@@ -93,7 +93,7 @@
<parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-storage</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
......@@ -112,7 +112,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>storage-core</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.mockito</groupId>
......
provider/storage-ibm/pom.xml
+ 2
− 2
View file @ f5887bf6
......@@ -16,7 +16,7 @@
<parent>
<artifactId>os-storage</artifactId>
<groupId>org.opengroup.osdu</groupId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -39,7 +39,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>storage-core</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
......
storage-core/pom.xml
+ 2
− 2
View file @ f5887bf6
......@@ -18,14 +18,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.opengroup.osdu</groupId>
<artifactId>storage-core</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<description>Core project for the storage service</description>
<packaging>jar</packaging>
<parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-storage</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
......
testing/pom.xml
+ 1
− 1
View file @ f5887bf6
......@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-storage-testing</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<description>Root Storage Service project</description>
<packaging>pom</packaging>
......
testing/storage-test-anthos/pom.xml
+ 3
− 3
View file @ f5887bf6
......@@ -21,13 +21,13 @@
<parent>
<artifactId>os-storage-testing</artifactId>
<groupId>org.opengroup.osdu</groupId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.storage</groupId>
<artifactId>storage-test-anthos</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
......@@ -41,7 +41,7 @@
<dependency>
<groupId>org.opengroup.osdu.storage</groupId>
<artifactId>storage-test-core</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
......
testing/storage-test-aws/pom.xml
+ 3
− 3
View file @ f5887bf6
......@@ -18,7 +18,7 @@
<parent>
<artifactId>os-storage-testing</artifactId>
<groupId>org.opengroup.osdu</groupId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
......@@ -26,7 +26,7 @@
<groupId>org.opengroup.osdu.storage</groupId>
<artifactId>storage-test-aws</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
......@@ -52,7 +52,7 @@
<dependency>
<groupId>org.opengroup.osdu.storage</groupId>
<artifactId>storage-test-core</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
</dependency>
<dependency>
......
testing/storage-test-azure/pom.xml
+ 3
− 3
View file @ f5887bf6
......@@ -19,7 +19,7 @@
<parent>
<artifactId>os-storage-testing</artifactId>
<groupId>org.opengroup.osdu</groupId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
......@@ -27,7 +27,7 @@
<groupId>org.opengroup.osdu.storage</groupId>
<artifactId>storage-test-azure</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
......@@ -41,7 +41,7 @@
<dependency>
<groupId>org.opengroup.osdu.storage</groupId>
<artifactId>storage-test-core</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
......
testing/storage-test-core/pom.xml
+ 2
− 2
View file @ f5887bf6
......@@ -18,14 +18,14 @@
<parent>
<artifactId>os-storage-testing</artifactId>
<groupId>org.opengroup.osdu</groupId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.opengroup.osdu.storage</groupId>
<artifactId>storage-test-core</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<maven.compiler.target>1.8</maven.compiler.target>
......
testing/storage-test-gc/pom.xml
+ 3
− 3
View file @ f5887bf6
......@@ -19,7 +19,7 @@
<parent>
<artifactId>os-storage-testing</artifactId>
<groupId>org.opengroup.osdu</groupId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
......@@ -27,7 +27,7 @@
<groupId>org.opengroup.osdu.storage</groupId>
<artifactId>storage-test-gc</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
......@@ -98,7 +98,7 @@
<dependency>
<groupId>org.opengroup.osdu.storage</groupId>
<artifactId>storage-test-core</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
......
testing/storage-test-ibm/pom.xml
+ 3
− 3
View file @ f5887bf6
......@@ -18,7 +18,7 @@
<parent>
<artifactId>os-storage-testing</artifactId>
<groupId>org.opengroup.osdu</groupId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
......@@ -26,7 +26,7 @@
<groupId>org.opengroup.osdu.storage</groupId>
<artifactId>storage-test-ibm</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
......@@ -42,7 +42,7 @@
<dependency>
<groupId>org.opengroup.osdu.storage</groupId>
<artifactId>storage-test-core</artifactId>
<version>0.19.0-SNAPSHOT</version>
<version>0.20.0-SNAPSHOT</version>
</dependency>
<dependency>
......
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