Commit 782e9589 authored by Vivek Ojha's avatar Vivek Ojha
Browse files

merged m8 master into m10

parents e548dee0 89f7bdfe
Pipeline #100492 passed with stages
in 41 minutes and 21 seconds
......@@ -44,34 +44,10 @@ 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: "cloud-providers/osdu-gcp-gke.yml"
ref: release/0.13
- project: "osdu/platform/ci-cd-pipelines"
file: "publishing/pages.yml"
ref: release/0.13
osdu-gcp-test:
variables:
CLIENT_TENANT: osdu
osdu-gcp-dev2-test:
variables:
CLIENT_TENANT: devtwo
......@@ -14,10 +14,11 @@
<packaging>jar</packaging>
<properties>
<osdu.corelibazure.version>0.13.0-rc6</osdu.corelibazure.version>
<osdu.corelibazure.version>0.14.0-rc2</osdu.corelibazure.version>
<junit.version>4.12</junit.version>
<mockito.version>2.25.0</mockito.version>
<powermock.version>2.0.2</powermock.version>
<json-smart.version>2.4.6</json-smart.version>
</properties>
<dependencyManagement>
......@@ -70,6 +71,21 @@
<artifactId>core-lib-azure</artifactId>
<version>${osdu.corelibazure.version}</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
</dependency>
<!--
Many dependencies contain library with vulnerabilities: net.minidev:json-smart:jar:2.3
because of that we need to enforce the higher version
-->
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>${json-smart.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
......@@ -153,6 +169,12 @@
<artifactId>spring-security-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
<scope>runtime</scope>
<version>1.6.6</version>
</dependency>
</dependencies>
<build>
......@@ -174,4 +196,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
\ No newline at end of file
......@@ -50,6 +50,8 @@ redis.database=${REDIS_DATABASE}
# health check
management.health.azure-key-vault.enabled=false
management.server.port=8081
management.endpoints.web.exposure.include=health,info,prometheus
azure.serviceBus.manager.enabled=false
azure.cryptography.enabled=false
azure.eventgrid.topic.enabled=false
......
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