From eba0a144ed924c5188073c60f706f8722e23995b Mon Sep 17 00:00:00 2001
From: David Diederich <d.diederich@opengroup.org>
Date: Fri, 21 Jan 2022 02:34:07 -1000
Subject: [PATCH] Upgrade core library dependencies
This will pick up the latest log4j 2.17.1 change, addressing CVE-2021-44832
(cherry picked from commit 1db9f5f5cf932ea956b190a8fb8dc956af348dec)
Conflicts:
indexer-core/pom.xml
---
indexer-core/pom.xml | 2 +-
pom.xml | 2 +-
provider/indexer-aws/pom.xml | 2 +-
provider/indexer-azure/pom.xml | 4 ++--
provider/indexer-gcp/pom.xml | 2 +-
provider/indexer-ibm/pom.xml | 2 +-
testing/indexer-test-ibm/pom.xml | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/indexer-core/pom.xml b/indexer-core/pom.xml
index 4d26f295d..5e09b3896 100644
--- a/indexer-core/pom.xml
+++ b/indexer-core/pom.xml
@@ -16,7 +16,7 @@
<properties>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
- <osdu.oscorecommon.version>0.13.0-rc6</osdu.oscorecommon.version>
+ <osdu.oscorecommon.version>0.13.0-rc7</osdu.oscorecommon.version>
<spring-security-web.version>5.4.9</spring-security-web.version>
<gson.version>2.8.9</gson.version>
<netty.version>4.1.70.Final</netty.version>
diff --git a/pom.xml b/pom.xml
index 9d8351d8c..272e41bcb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<spring-cloud.version>Greenwich.SR2</spring-cloud.version>
- <os-core-common.version>0.13.0-rc6</os-core-common.version>
+ <os-core-common.version>0.13.0-rc7</os-core-common.version>
<snakeyaml.version>1.26</snakeyaml.version>
<hibernate-validator.version>6.1.5.Final</hibernate-validator.version>
<jackson.version>2.11.4</jackson.version>
diff --git a/provider/indexer-aws/pom.xml b/provider/indexer-aws/pom.xml
index ba16c8b9c..f4d7b03cf 100644
--- a/provider/indexer-aws/pom.xml
+++ b/provider/indexer-aws/pom.xml
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
- <version>0.13.0-rc3</version>
+ <version>0.13.0-rc4</version>
</dependency>
<!-- AWS managed packages -->
diff --git a/provider/indexer-azure/pom.xml b/provider/indexer-azure/pom.xml
index 282337710..7ae737ee4 100644
--- a/provider/indexer-azure/pom.xml
+++ b/provider/indexer-azure/pom.xml
@@ -41,8 +41,8 @@
<nimbus-jose-jwt.version>8.2</nimbus-jose-jwt.version>
<indexer-core.version>0.13.0-SNAPSHOT</indexer-core.version>
<spring-security-jwt.version>1.1.1.RELEASE</spring-security-jwt.version>
- <osdu.corelibazure.version>0.13.0-rc6</osdu.corelibazure.version>
- <osdu.oscorecommon.version>0.13.0-rc6</osdu.oscorecommon.version>
+ <osdu.corelibazure.version>0.13.0-rc9</osdu.corelibazure.version>
+ <osdu.oscorecommon.version>0.13.0-rc7</osdu.oscorecommon.version>
<reactor-netty.version>0.9.12.RELEASE</reactor-netty.version>
<java-jwt.version>3.8.1</java-jwt.version>
<powermock.version>2.0.2</powermock.version>
diff --git a/provider/indexer-gcp/pom.xml b/provider/indexer-gcp/pom.xml
index 394e63367..d5f0df645 100644
--- a/provider/indexer-gcp/pom.xml
+++ b/provider/indexer-gcp/pom.xml
@@ -19,7 +19,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-gcp</artifactId>
- <version>0.13.0-rc4</version>
+ <version>0.13.0-rc5</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
diff --git a/provider/indexer-ibm/pom.xml b/provider/indexer-ibm/pom.xml
index 6dc55aa9b..736033779 100644
--- a/provider/indexer-ibm/pom.xml
+++ b/provider/indexer-ibm/pom.xml
@@ -31,7 +31,7 @@
<packaging>jar</packaging>
<properties>
- <os-core-lib-ibm.version>0.13.0-rc6</os-core-lib-ibm.version>
+ <os-core-lib-ibm.version>0.13.0-rc7</os-core-lib-ibm.version>
</properties>
<profiles>
diff --git a/testing/indexer-test-ibm/pom.xml b/testing/indexer-test-ibm/pom.xml
index ce81d0fff..4e763a5c1 100644
--- a/testing/indexer-test-ibm/pom.xml
+++ b/testing/indexer-test-ibm/pom.xml
@@ -19,7 +19,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<cucumber.version>1.2.5</cucumber.version>
- <os-core-lib-ibm.version>0.13.0-rc5</os-core-lib-ibm.version>
+ <os-core-lib-ibm.version>0.13.0-rc7</os-core-lib-ibm.version>
</properties>
<dependencies>
--
GitLab