Commit 79bb4e0b authored by Vivek Ojha's avatar Vivek Ojha
Browse files

merge m8 master into m10

parents b2109be4 070b7f5f
Pipeline #100129 failed with stages
in 8 minutes and 40 seconds
......@@ -41,60 +41,17 @@ include:
file: "scanners/fossa-maven.yml"
ref: release/0.13
- project: "osdu/platform/ci-cd-pipelines"
file: "cloud-providers/aws-global.yml"
ref: release/0.13
- project: "osdu/platform/ci-cd-pipelines"
file: "cloud-providers/aws-maven.yml"
ref: release/0.13
- project: "osdu/platform/ci-cd-pipelines"
file: "cloud-providers/azure.yml"
ref: release/0.13
- project: "osdu/platform/ci-cd-pipelines"
file: "cloud-providers/ibm.yml"
ref: release/0.13
- project: "osdu/platform/ci-cd-pipelines"
file: "scanners/gitlab-ultimate.yml"
ref: release/0.13
- project: "osdu/platform/ci-cd-pipelines"
file: "cloud-providers/osdu-gcp-gke.yml"
ref: release/0.13
# disable the eslint scanner
# I think this is being generated from the presence of an HTML file, but there
# is no javascript to scan, so the job isn't helpful and just gets in the way
eslint-sast:
rules:
- when: never
osdu-gcp-test:
variables:
STORAGE_BASE_URL: $OSDU_GCP_STORAGE_EXTERNAL_URL
LEGAL_BASE_URL: $OSDU_GCP_LEGAL_EXTERNAL_URL
DATASET_BASE_URL: $OSDU_GCP_DATASET_EXTERNAL_URL
SCHEMA_API: $OSDU_GCP_SCHEMA_URL
PROVIDER_KEY: GCP
KIND_SUBTYPE: DatasetTest
LEGAL_TAG: datatest-int-tag
LEGAL_HOST: $OSDU_GCP_LEGAL_EXTERNAL_URL
GCP_STORAGE_PERSISTENT_AREA: persistent-area
GCP_DEPLOY_FILE: $OSDU_GCP_DEPLOY_FILE
osdu-gcp-dev2-test:
variables:
STORAGE_BASE_URL: $OSDU_GCP_STORAGE_EXTERNAL_URL
LEGAL_BASE_URL: $OSDU_GCP_LEGAL_EXTERNAL_URL
DATASET_BASE_URL: $OSDU_GCP_DATASET_EXTERNAL_URL
SCHEMA_API: $OSDU_GCP_SCHEMA_URL
PROVIDER_KEY: GCP
KIND_SUBTYPE: DatasetTest
LEGAL_TAG: datatest-int-tag
LEGAL_HOST: $OSDU_GCP_LEGAL_EXTERNAL_URL
GCP_STORAGE_PERSISTENT_AREA: persistent-area
GCP_DEPLOY_FILE: $OSDU_GCP_DEPLOY_FILE
- when: never
\ No newline at end of file
......@@ -36,10 +36,11 @@
<maven.compiler.source>1.8</maven.compiler.source>
<tomcat_embed_core_version>9.0.54</tomcat_embed_core_version>
<log4j2.version>2.17.1</log4j2.version>
<springfox-version>2.7.0</springfox-version>
</properties>
<dependencyManagement>
<dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
......@@ -47,8 +48,33 @@
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
<version>${log4j2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jul</artifactId>
<version>${log4j2.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
......
......@@ -82,7 +82,7 @@
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>${nimbusds.version}</version>
</dependency> -->
</dependency>-->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
......
......@@ -37,9 +37,10 @@
<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.13.0-rc6</osdu.corelibazure.version>
<osdu.corelibazure.version>0.14.0-rc2</osdu.corelibazure.version>
<osdu.oscorecommon-version>0.13.0</osdu.oscorecommon-version>
<nimbus-jose-jwt.version>7.9</nimbus-jose-jwt.version>
<log4j2.version>2.17.0</log4j2.version>
</properties>
<dependencyManagement>
......@@ -144,8 +145,12 @@
<artifactId>core-lib-azure</artifactId>
<version>${osdu.corelibazure.version}</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
......
......@@ -19,6 +19,7 @@ package org.opengroup.osdu.dataset.provider.azure;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
// Hello world
@SpringBootApplication(scanBasePackages = "org.opengroup.osdu.dataset")
public class DatasetAzureApplication {
public static void main(String[] args) {
......
......@@ -58,6 +58,8 @@ server.port=${server_port:8089}
# if this is turned on then the service tries to connect to elastic search
management.health.elasticsearch.enabled=false
management.server.port=8081
management.endpoints.web.exposure.include=health,info,prometheus
#logging configuration
logging.transaction.enabled=true
......
......@@ -118,4 +118,4 @@
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
</project>
......@@ -36,6 +36,37 @@
<project.main.basedir>${project.basedir}</project.main.basedir>
<osdu.oscorecommon.version>0.13.0</osdu.oscorecommon.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
<version>${log4j2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jul</artifactId>
<version>${log4j2.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.sun.jersey</groupId>
......
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