Merge branch 'master' into master-dev-merge

pom.xml

@@ -8,7 +8,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <docker.image.prefix>opendes</docker.image.prefix>
         <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>
         <snakeyaml.version>1.26</snakeyaml.version>
         <resilience4jVersion>1.7.0</resilience4jVersion>
     </properties>

provider/legal-aws/pom.xml

@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.opengroup.osdu.core.aws</groupId>
             <artifactId>os-core-lib-aws</artifactId>
-            <version>0.13.0-SNAPSHOT</version>
+            <version>0.13.0-rc3</version>
         </dependency>
         <dependency>
             <groupId>org.opengroup.osdu</groupId>

provider/legal-azure/pom.xml

@@ -31,7 +31,7 @@
         <azure.appservice.plan />
         <azure.appservice.appname />
         <azure.appservice.subscription />
-        <osdu.corelibazure.version>0.13.0-rc5</osdu.corelibazure.version>
+        <osdu.corelibazure.version>0.13.0-rc6</osdu.corelibazure.version>
         <osdu.legal-core.version>0.13.0-SNAPSHOT</osdu.legal-core.version>
         <javax.inject.version>1</javax.inject.version>
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>

provider/legal-gcp/cloudbuild/Dockerfile.cloudbuild

@@ -9,4 +9,4 @@ ENV PORT $PORT
 # Copy the jar to the production image from the builder stage.
 COPY provider/legal-${PROVIDER_NAME}/target/legal-${PROVIDER_NAME}-*-spring-boot.jar legal-${PROVIDER_NAME}.jar
 # Run the web service on container startup.
-CMD java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${PORT} -jar /app/legal-${PROVIDER_NAME}.jar
+CMD java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${PORT} -Dlog4j.formatMsgNoLookups=true -jar /app/legal-${PROVIDER_NAME}.jar

provider/legal-gcp/pom.xml

@@ -25,7 +25,7 @@
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
             <artifactId>core-lib-gcp</artifactId>
-            <version>0.13.0-SNAPSHOT</version>
+            <version>0.13.0-rc4</version>
         </dependency>
         <dependency>
             <groupId>org.opengroup.osdu.legal</groupId>

provider/legal-ibm/pom.xml

@@ -11,7 +11,7 @@
 	<artifactId>legal-ibm</artifactId>
 	<packaging>jar</packaging>
 	<properties>
-		<os-core-lib-ibm.version>0.13.0-rc4</os-core-lib-ibm.version>
+		<os-core-lib-ibm.version>0.13.0-rc5</os-core-lib-ibm.version>
 	</properties>
 
 	<dependencies>