Commit 7fa6e6ed authored by Abhishek Kumar (SLB)'s avatar Abhishek Kumar (SLB)
Browse files

Merge remote-tracking branch 'origin/release/0.12' into

cherry-pick-493aa638

Conflicts:
	.fossa.yml
	.gitlab-ci.yml
	NOTICE
	pom.xml
	provider/schema-aws/pom.xml
	provider/schema-azure/pom.xml
	provider/schema-gcp/pom.xml
	provider/schema-ibm/pom.xml
	provider/schema-reference/pom.xml
	schema-core/pom.xml
	testing/pom.xml
	testing/schema-test-azure/pom.xml
	testing/schema-test-core/pom.xml
	testing/schema-test-gcp/pom.xml
parents 35977c3d dd58f4c4
Pipeline #75788 failed with stages
in 2 minutes and 13 seconds
......@@ -36,14 +36,6 @@ analyze:
type: mvn
target: provider/schema-reference/pom.xml
path: .
- name: google
type: pip
target: deployments/scripts/google
path: deployments/scripts/google
- name: ibm
type: pip
target: deployments/scripts/ibm
path: deployments/scripts/ibm
- name: scripts
type: pip
target: deployments/scripts
......@@ -56,3 +48,11 @@ analyze:
type: pip
target: deployments/scripts/azure
path: deployments/scripts/azure
- name: google
type: pip
target: deployments/scripts/google
path: deployments/scripts/google
- name: ibm
type: pip
target: deployments/scripts/ibm
path: deployments/scripts/ibm
......@@ -49,27 +49,35 @@ variables:
include:
- project: "osdu/platform/ci-cd-pipelines"
file: "standard-setup.yml"
ref: release/0.12
- project: "osdu/platform/ci-cd-pipelines"
file: "build/maven.yml"
ref: release/0.12
- project: "osdu/platform/ci-cd-pipelines"
file: "scanners/fossa-maven.yml"
ref: release/0.12
- project: "osdu/platform/ci-cd-pipelines"
file: "cloud-providers/aws.yml"
ref: release/0.12
- project: "osdu/platform/ci-cd-pipelines"
file: "cloud-providers/ibm-java-git.yml"
file: "cloud-providers/ibm.yml"
ref: release/0.12
- project: "osdu/platform/ci-cd-pipelines"
file: "scanners/gitlab-ultimate.yml"
ref: release/0.12
- project: "osdu/platform/ci-cd-pipelines"
file: "cloud-providers/azure.yml"
ref: release/0.12
- project: "osdu/platform/ci-cd-pipelines"
file: "cloud-providers/osdu-gcp-gke.yml"
ref: release/0.12
- local: "/devops/azure/gitlab-bootstrap.yml"
- local: "/devops/aws/bootstrap.yaml"
......
This diff is collapsed.
......@@ -31,7 +31,7 @@
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-schema</artifactId>
<version>0.12.2-SNAPSHOT</version>
<version>0.12.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>os-schema</name>
<description>os schema service </description>
......
......@@ -18,7 +18,7 @@
<parent>
<artifactId>os-schema</artifactId>
<groupId>org.opengroup.osdu</groupId>
<version>0.12.2-SNAPSHOT</version>
<version>0.12.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
......@@ -35,7 +35,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-schema-core</artifactId>
<version>0.12.2-SNAPSHOT</version>
<version>0.12.1-SNAPSHOT</version>
</dependency>
<!-- AWS managed packages -->
<dependency>
......
......@@ -13,13 +13,13 @@
<parent>
<artifactId>os-schema</artifactId>
<groupId>org.opengroup.osdu</groupId>
<version>0.12.2-SNAPSHOT</version>
<version>0.12.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>os-schema-azure</artifactId>
<version>0.12.2-SNAPSHOT</version>
<version>0.12.1-SNAPSHOT</version>
<description>Azure related implementation staff.</description>
<packaging>jar</packaging>
......@@ -27,7 +27,7 @@
<azure.version>2.1.7</azure.version>
<osdu.corelibazure.version>0.12.0</osdu.corelibazure.version>
<osdu.oscorecommon.version>0.12.0</osdu.oscorecommon.version>
<osdu.os-schema-core.version>0.13.0-SNAPSHOT</osdu.os-schema-core.version>
<osdu.os-schema-core.version>0.12.1-SNAPSHOT</osdu.os-schema-core.version>
<mockito.version>1.10.19</mockito.version>
<cucumber.version>5.4.0</cucumber.version>
<nimbus-jose-jwt-azure.version>8.20.2</nimbus-jose-jwt-azure.version>
......
......@@ -3,7 +3,7 @@
<parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-schema</artifactId>
<version>0.12.2-SNAPSHOT</version>
<version>0.12.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
......@@ -29,7 +29,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-schema-core</artifactId>
<version>0.12.2-SNAPSHOT</version>
<version>0.12.1-SNAPSHOT</version>
</dependency>
<dependency>
......
......@@ -3,7 +3,7 @@
<parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-schema</artifactId>
<version>0.12.2-SNAPSHOT</version>
<version>0.12.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>os-schema-ibm</artifactId>
......@@ -21,7 +21,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-schema-core</artifactId>
<version>0.12.2-SNAPSHOT</version>
<version>0.12.1-SNAPSHOT</version>
</dependency>
<dependency>
......
......@@ -24,7 +24,7 @@
<parent>
<artifactId>os-schema</artifactId>
<groupId>org.opengroup.osdu</groupId>
<version>0.12.2-SNAPSHOT</version>
<version>0.12.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
......@@ -36,7 +36,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-schema-core</artifactId>
<version>0.12.2-SNAPSHOT</version>
<version>0.12.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
......
......@@ -3,7 +3,7 @@
<parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-schema</artifactId>
<version>0.12.2-SNAPSHOT</version>
<version>0.12.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
......
......@@ -3,7 +3,7 @@
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-schema-test</artifactId>
<version>0.12.2-SNAPSHOT</version>
<version>0.12.1-SNAPSHOT</version>
<description>Schema Service Integration Test Root Project</description>
<packaging>pom</packaging>
......
......@@ -4,12 +4,12 @@
<parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-schema-test</artifactId>
<version>0.12.2-SNAPSHOT</version>
<version>0.12.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>schema-test-azure</artifactId>
<version>0.12.2-SNAPSHOT</version>
<version>0.12.1-SNAPSHOT</version>
<properties>
<os-core-lib-ibm.version>0.7.0</os-core-lib-ibm.version>
<os-core-lib-azure.version>0.6.1</os-core-lib-azure.version>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-schema-test</artifactId>
<version>0.12.2-SNAPSHOT</version>
<version>0.12.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
......
......@@ -4,13 +4,13 @@
<parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-schema-test</artifactId>
<version>0.12.2-SNAPSHOT</version>
<version>0.12.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-schema-test-gcp</artifactId>
<version>0.12.2-SNAPSHOT</version>
<version>0.12.1-SNAPSHOT</version>
<packaging>jar</packaging>
......
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