From e89a9ac9476fae833f6d3c66b888c272c94ea74c Mon Sep 17 00:00:00 2001
From: Spencer Sutton <suttonsp@amazon.com>
Date: Wed, 15 Dec 2021 13:08:26 -0600
Subject: [PATCH 1/4] Patching log4j vulnerability

---
 pom.xml                              | 11 +++++++++++
 provider/storage-aws-mongodb/pom.xml |  2 +-
 provider/storage-aws/pom.xml         |  2 +-
 provider/storage-azure/pom.xml       |  2 +-
 provider/storage-gcp/pom.xml         |  2 +-
 storage-core/pom.xml                 |  2 +-
 6 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 95b155cc..b50fd422 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,7 @@
 		<commons-codec.version>1.14</commons-codec.version>
 		<nimbusds.version>7.9</nimbusds.version>
 		<woodstox-core.version>6.2.3</woodstox-core.version>
+		<log4j2.version>2.16.0</log4j2.version>
 	</properties>
 
 	<licenses>
@@ -48,6 +49,16 @@
 
 	<dependencyManagement>
 		<dependencies>
+			<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>io.netty</groupId>
 				<artifactId>netty-bom</artifactId>
diff --git a/provider/storage-aws-mongodb/pom.xml b/provider/storage-aws-mongodb/pom.xml
index 64806f59..0f6c9cc4 100644
--- a/provider/storage-aws-mongodb/pom.xml
+++ b/provider/storage-aws-mongodb/pom.xml
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.opengroup.osdu.core.aws</groupId>
             <artifactId>os-core-lib-aws</artifactId>
-            <version>0.3.8</version>
+            <version>0.13.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
diff --git a/provider/storage-aws/pom.xml b/provider/storage-aws/pom.xml
index d3c760b8..5075288e 100644
--- a/provider/storage-aws/pom.xml
+++ b/provider/storage-aws/pom.xml
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.opengroup.osdu.core.aws</groupId>
             <artifactId>os-core-lib-aws</artifactId>
-            <version>0.12.0</version>
+            <version>0.13.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
diff --git a/provider/storage-azure/pom.xml b/provider/storage-azure/pom.xml
index a31f7a1b..28f181c5 100644
--- a/provider/storage-azure/pom.xml
+++ b/provider/storage-azure/pom.xml
@@ -33,7 +33,7 @@
         <azure.appservice.plan />
         <azure.appservice.appname />
         <azure.appservice.subscription />
-        <osdu.corelibazure.version>0.13.0-rc3</osdu.corelibazure.version>
+        <osdu.corelibazure.version>0.13.0-rc5</osdu.corelibazure.version>
         <osdu.storage-core.version>0.13.0-SNAPSHOT</osdu.storage-core.version>
         <junit.version>4.12</junit.version>
         <mockito.version>1.10.19</mockito.version>
diff --git a/provider/storage-gcp/pom.xml b/provider/storage-gcp/pom.xml
index 1f44b997..8b988ab5 100644
--- a/provider/storage-gcp/pom.xml
+++ b/provider/storage-gcp/pom.xml
@@ -90,7 +90,7 @@
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
             <artifactId>core-lib-gcp</artifactId>
-            <version>0.12.0</version>
+            <version>0.13.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
diff --git a/storage-core/pom.xml b/storage-core/pom.xml
index ba9c7e3a..208d7495 100644
--- a/storage-core/pom.xml
+++ b/storage-core/pom.xml
@@ -34,7 +34,7 @@
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<springfox-version>2.7.0</springfox-version>
-		<os-core-common.version>0.12.0</os-core-common.version>
+		<os-core-common.version>0.13.0-rc3</os-core-common.version>
 		<!--
 		<springfox-version>2.9.2</springfox-version>
 		-->
-- 
GitLab


From 96b7d4590870975e305a781692052f766f9a573c Mon Sep 17 00:00:00 2001
From: David Diederich <d.diederich@opengroup.org>
Date: Wed, 15 Dec 2021 12:22:05 -1000
Subject: [PATCH 2/4] Replacing SNAPSHOT dependencies with rc ones

---
 provider/storage-aws-mongodb/pom.xml | 2 +-
 provider/storage-aws/pom.xml         | 2 +-
 provider/storage-gcp/pom.xml         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/provider/storage-aws-mongodb/pom.xml b/provider/storage-aws-mongodb/pom.xml
index 0f6c9cc4..d09263ff 100644
--- a/provider/storage-aws-mongodb/pom.xml
+++ b/provider/storage-aws-mongodb/pom.xml
@@ -58,7 +58,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-rc2</version>
         </dependency>
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
diff --git a/provider/storage-aws/pom.xml b/provider/storage-aws/pom.xml
index 5075288e..8147aa66 100644
--- a/provider/storage-aws/pom.xml
+++ b/provider/storage-aws/pom.xml
@@ -58,7 +58,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-rc2</version>
         </dependency>
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
diff --git a/provider/storage-gcp/pom.xml b/provider/storage-gcp/pom.xml
index 8b988ab5..93e40e42 100644
--- a/provider/storage-gcp/pom.xml
+++ b/provider/storage-gcp/pom.xml
@@ -90,7 +90,7 @@
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
             <artifactId>core-lib-gcp</artifactId>
-            <version>0.13.0-SNAPSHOT</version>
+            <version>0.13.0-rc3</version>
         </dependency>
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
-- 
GitLab


From d9fccc3da9e99ab187f2261974bc0116ba2c162d Mon Sep 17 00:00:00 2001
From: David Diederich <d.diederich@opengroup.org>
Date: Fri, 17 Dec 2021 08:00:43 -1000
Subject: [PATCH 3/4] Revert os-core-lib-aws to 0.3.8 for storage-aws-mongodb

---
 provider/storage-aws-mongodb/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provider/storage-aws-mongodb/pom.xml b/provider/storage-aws-mongodb/pom.xml
index d09263ff..64806f59 100644
--- a/provider/storage-aws-mongodb/pom.xml
+++ b/provider/storage-aws-mongodb/pom.xml
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.opengroup.osdu.core.aws</groupId>
             <artifactId>os-core-lib-aws</artifactId>
-            <version>0.13.0-rc2</version>
+            <version>0.3.8</version>
         </dependency>
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
-- 
GitLab


From 1fb2f29bdbe288ec647c4f33092118a716d37588 Mon Sep 17 00:00:00 2001
From: David Diederich <d.diederich@opengroup.org>
Date: Fri, 17 Dec 2021 08:45:52 -1000
Subject: [PATCH 4/4] Move back to the latest stable release version

---
 storage-core/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/storage-core/pom.xml b/storage-core/pom.xml
index 208d7495..6d517dd7 100644
--- a/storage-core/pom.xml
+++ b/storage-core/pom.xml
@@ -34,7 +34,7 @@
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<springfox-version>2.7.0</springfox-version>
-		<os-core-common.version>0.13.0-rc3</os-core-common.version>
+		<os-core-common.version>0.12.2</os-core-common.version>
 		<!--
 		<springfox-version>2.9.2</springfox-version>
 		-->
-- 
GitLab