Commit b3fe7739 authored by Marc Burnie [AWS]'s avatar Marc Burnie [AWS]
Browse files

resolved pom merge conflicts

parents e152b516 1bdb4796
This diff is collapsed.
---
# Source: /devops/azure/chart/templates/virtual-service.yaml
{{- if .Values.istioDnsHost }}
apiVersion: networking.istio.io/v1alpha3
kind: VirtualService
metadata:
......@@ -32,4 +33,5 @@ spec:
- PATCH
- DELETE
allowOrigins:
- prefix: "*"
\ No newline at end of file
- prefix: "*"
{{- end }}
\ No newline at end of file
......@@ -32,7 +32,6 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<springfox-version>2.7.0</springfox-version>
<gson_version>2.8.6</gson_version>
<powermock.version>2.0.6</powermock.version>
<mockito.core.version>3.3.3</mockito.core.version>
<assertj_core_version>3.16.1</assertj_core_version>
......@@ -80,12 +79,6 @@
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson_version}</version>
</dependency>
<!-- test dependencies -->
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
......
......@@ -26,7 +26,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<os-core-common.version>0.13.0-rc3</os-core-common.version>
<os-core-common.version>0.13.0-rc4</os-core-common.version>
<org.springframework.boot.version>2.4.5</org.springframework.boot.version>
</properties>
......
......@@ -68,7 +68,6 @@ public class MongoConfig {
ConnectionString connectionString = new ConnectionString(this.getMongoURI());
MongoClientFactoryBean mongo = new MongoClientFactoryBean();
mongo.setConnectionString(connectionString);
return mongo;
......
......@@ -36,7 +36,7 @@ aws.dynamodb.endpoint=dynamodb.${AWS_REGION}.amazonaws.com
aws.environment=${ENVIRONMENT}
server.ssl.enabled=${SSL_ENABLED:true}
server.ssl.enabled=${SSL_ENABLED:false}
server.ssl.key-store-type=PKCS12
server.ssl.key-store=${SSL_KEY_STORE_PATH:/certs/osduonaws.p12}
server.ssl.key-alias=${SSL_KEY_ALIAS:osduonaws}
......
......@@ -14,12 +14,10 @@
<packaging>jar</packaging>
<properties>
<osdu.corelibazure.version>0.12.0</osdu.corelibazure.version>
<osdu.oscorecommon.version>0.12.0</osdu.oscorecommon.version>
<osdu.corelibazure.version>0.13.0-rc6</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>
......@@ -47,22 +45,6 @@
<artifactId>core-lib-azure</artifactId>
<version>${osdu.corelibazure.version}</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
<version>${osdu.oscorecommon.version}</version>
</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>
......
......@@ -9,5 +9,5 @@ ENV PORT $PORT
# Copy the jar to the production image from the builder stage.
COPY provider/partition-${PROVIDER_NAME}/target/partition-${PROVIDER_NAME}-*-spring-boot.jar partition-${PROVIDER_NAME}.jar
# Run the web service on container startup.
CMD java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${PORT} -jar /app/partition-${PROVIDER_NAME}.jar
CMD java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${PORT} -Dlog4j.formatMsgNoLookups=true -jar /app/partition-${PROVIDER_NAME}.jar
......@@ -27,7 +27,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-lib-ibm</artifactId>
<version>0.12.0</version>
<version>0.13.0-rc5</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
......
......@@ -71,7 +71,7 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
<version>0.12.0</version>
<version>0.12.3</version>
</dependency>
<dependency>
......
......@@ -20,7 +20,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<os-core-lib-ibm.version>0.12.0</os-core-lib-ibm.version>
<os-core-lib-ibm.version>0.12.2</os-core-lib-ibm.version>
</properties>
<dependencies>
......
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