Commit 21195386 authored by Spencer Sutton's avatar Spencer Sutton
Browse files

Merge branch 'master' into dev

parents b2c84215 dfa55bd4
......@@ -28,3 +28,7 @@ analyze:
type: mvn
target: provider/dataset-gcp/pom.xml
path: .
- name: dataset-azure
type: mvn
target: provider/dataset-azure/pom.xml
path: .
......@@ -3,7 +3,7 @@ variables:
AWS_TEST_SUBDIR: testing/dataset-test-aws
AWS_SERVICE: dataset
AWS_ENVIRONMENT: dev
IBM_BUILD_SUBDIR: provider/dataset-ibm
# --- osdu-gcp specific variables ---
......@@ -12,9 +12,9 @@ variables:
OSDU_GCP_APPLICATION_NAME: os-dataset
OSDU_GCP_FILE_DMS_BUCKET: "file-dms-bucket"
OSDU_GCP_EXPIRATION_DAYS: 1
OSDU_GCP_ENV_VARS: AUTHORIZE_API=$OSDU_GCP_ENTITLEMENTS_URL,GCP_STORAGE_API=$OSDU_GCP_STORAGE_URL,GCP_SCHEMA_API=$OSDU_GCP_SCHEMA_URL/api/schema-service/v1,FILE_DMS_BUCKET=$OSDU_GCP_FILE_DMS_BUCKET,EXPIRATION_DAYS=$OSDU_GCP_EXPIRATION_DAYS,REDIS_GROUP_HOST=$REDIS_GROUP_HOST,REDIS_GROUP_PORT=$OSDU_GCP_REDIS_SEARCH_PORT,GOOGLE_AUDIENCES=$GOOGLE_AUDIENCE,PARTITION_API=$OSDU_GCP_PARTITION_API --vpc-connector=$OSDU_GCP_VPC_CONNECTOR
OSDU_GCP_ENV_VARS: AUTHORIZE_API=$OSDU_GCP_ENTITLEMENTS_V2_URL,GCP_STORAGE_API=$OSDU_GCP_STORAGE_URL,GCP_SCHEMA_API=$OSDU_GCP_SCHEMA_URL/api/schema-service/v1,FILE_DMS_BUCKET=$OSDU_GCP_FILE_DMS_BUCKET,EXPIRATION_DAYS=$OSDU_GCP_EXPIRATION_DAYS,REDIS_GROUP_HOST=$REDIS_GROUP_HOST,REDIS_GROUP_PORT=$OSDU_GCP_REDIS_SEARCH_PORT,GOOGLE_AUDIENCES=$GOOGLE_AUDIENCE,PARTITION_API=$OSDU_GCP_PARTITION_API --vpc-connector=$OSDU_GCP_VPC_CONNECTOR
OSDU_GCP_TEST_SUBDIR: testing/$OSDU_GCP_SERVICE-test-$OSDU_GCP_VENDOR
include:
- project: "osdu/platform/ci-cd-pipelines"
file: "standard-setup.yml"
......@@ -23,10 +23,13 @@ include:
file: "build/maven.yml"
- project: "osdu/platform/ci-cd-pipelines"
file: "scanners/fossa.yml"
file: "scanners/fossa-maven.yml"
- project: 'osdu/platform/ci-cd-pipelines'
file: 'cloud-providers/aws.yml'
file: 'cloud-providers/aws-global.yml'
- project: 'osdu/platform/ci-cd-pipelines'
file: 'cloud-providers/aws-maven.yml'
- project: "osdu/platform/ci-cd-pipelines"
file: "cloud-providers/ibm-deploy-only.yml"
......@@ -36,7 +39,7 @@ include:
- project: 'osdu/platform/ci-cd-pipelines'
file: 'cloud-providers/osdu-gcp-cloudrun.yml'
# disable the eslint scanner
# I think this is being generated from the presence of an HTML file, but there
......
This diff is collapsed.
......@@ -19,14 +19,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.opengroup.osdu</groupId>
<artifactId>dataset-core</artifactId>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
<description>Core project for the Dataset Registry service</description>
<packaging>jar</packaging>
<parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-dataset</artifactId>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
......
......@@ -17,7 +17,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-dataset</artifactId>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
<description>Root Dataset Registry Service project</description>
<properties>
......
......@@ -21,20 +21,20 @@
<parent>
<artifactId>os-dataset</artifactId>
<groupId>org.opengroup.osdu</groupId>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>dataset-aws</artifactId>
<description>Dataset Registry service on AWS</description>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<aws.version>1.11.1018</aws.version>
<deployment.environment>dev</deployment.environment>
<version.number>0.10.0-SNAPSHOT</version.number>
<version.number>0.11.0-SNAPSHOT</version.number>
</properties>
<dependencyManagement>
......@@ -58,7 +58,7 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
<version>0.9.2-SNAPSHOT</version>
<version>0.10.0</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
......
......@@ -22,13 +22,13 @@
<parent>
<artifactId>os-dataset</artifactId>
<groupId>org.opengroup.osdu</groupId>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>dataset-azure</artifactId>
<description>Azure implementation of Dataset service APIs</description>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>dataset-azure</name>
......@@ -37,7 +37,7 @@
<java.version>1.8</java.version>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<osdu.corelibazure.version>0.10.0-rc8</osdu.corelibazure.version>
<osdu.corelibazure.version>0.10.0</osdu.corelibazure.version>
<nimbus-jose-jwt.version>7.9</nimbus-jose-jwt.version>
</properties>
......
......@@ -20,21 +20,21 @@
<parent>
<artifactId>os-dataset</artifactId>
<groupId>org.opengroup.osdu</groupId>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>dataset-gcp</artifactId>
<description>Dataset Registry service on GCP</description>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>dataset-core</artifactId>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.powermock</groupId>
......
......@@ -21,19 +21,19 @@
<parent>
<artifactId>os-dataset</artifactId>
<groupId>org.opengroup.osdu</groupId>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>dataset-ibm</artifactId>
<description>Dataset Registry service on IBM</description>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<os-core-lib-ibm.version>0.7.0</os-core-lib-ibm.version>
<version.number>0.10.0-SNAPSHOT</version.number>
<version.number>0.11.0-SNAPSHOT</version.number>
<start-class>org.opengroup.osdu.dataset.provider.ibm.IBMDatasetRegistry</start-class>
<!--<os-core-common.version>0.3.28</os-core-common.version>-->
</properties>
......
......@@ -20,13 +20,13 @@
<parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-dataset-testing</artifactId>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.storage</groupId>
<artifactId>dataset-test-aws</artifactId>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
......@@ -40,20 +40,26 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
<version>0.9.2-SNAPSHOT</version>
<version>0.10.0</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
<version>0.9.0</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu.storage</groupId>
<artifactId>dataset-test-core</artifactId>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-cognitoidp</artifactId>
<version>1.11.1018</version>
</dependency>
</dependency>
<!-- third party Apache 2.0 license packages -->
<dependency>
......@@ -136,7 +142,7 @@
</includes>
</configuration>
</execution>
</executions>
</executions>
<configuration>
<trimStackTrace>false</trimStackTrace>
<systemPropertyVariables>
......
......@@ -21,13 +21,13 @@
<parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-dataset-testing</artifactId>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.storage</groupId>
<artifactId>dataset-test-core</artifactId>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<maven.compiler.target>1.8</maven.compiler.target>
......@@ -72,7 +72,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
<version>0.6.6</version>
<version>0.9.0</version>
</dependency>
</dependencies>
......@@ -85,4 +85,4 @@
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
</project>
......@@ -20,13 +20,13 @@
<parent>
<artifactId>os-dataset-testing</artifactId>
<groupId>org.opengroup.osdu</groupId>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>dataset-test-gcp</artifactId>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
......@@ -40,7 +40,7 @@
<dependency>
<groupId>org.opengroup.osdu.storage</groupId>
<artifactId>dataset-test-core</artifactId>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
......@@ -51,7 +51,12 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-gcp</artifactId>
<version>0.7.0</version>
<version>0.10.0</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
<version>0.9.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
......@@ -69,6 +74,11 @@
<artifactId>jackson-databind</artifactId>
<version>2.12.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.12.2</version>
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
......
......@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-dataset-testing</artifactId>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
<description>Dataset integration testing code</description>
<packaging>pom</packaging>
......
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