From 303fcaf5cc8f4e83d0dffb31e42bfbea5969ba96 Mon Sep 17 00:00:00 2001
From: HARSHEET SHAH <harsheetshah@microsoft.com>
Date: Wed, 30 Mar 2022 22:46:22 +0530
Subject: [PATCH] PBI-6584: Upgrade spring boot dependencies. Spring boot
dependencies are inherited from os-common-core.
---
indexer-core/pom.xml | 1 -
pom.xml | 8 --------
testing/indexer-test-azure/pom.xml | 2 +-
testing/indexer-test-core/pom.xml | 2 +-
testing/indexer-test-ibm/pom.xml | 2 +-
5 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/indexer-core/pom.xml b/indexer-core/pom.xml
index fe01c429d..c77757842 100644
--- a/indexer-core/pom.xml
+++ b/indexer-core/pom.xml
@@ -16,7 +16,6 @@
<properties>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
-<!-- <osdu.oscorecommon.version>0.14.0-rc8</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 3af119103..04086c2b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,13 +52,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>org.springframework.boot</groupId>-->
-<!-- <artifactId>spring-boot-dependencies</artifactId>-->
-<!-- <version>${spring-boot.version}</version>-->
-<!-- <type>pom</type>-->
-<!-- <scope>import</scope>-->
-<!-- </dependency>-->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
@@ -76,7 +69,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
-
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
diff --git a/testing/indexer-test-azure/pom.xml b/testing/indexer-test-azure/pom.xml
index f97cb3616..25c7e2aeb 100644
--- a/testing/indexer-test-azure/pom.xml
+++ b/testing/indexer-test-azure/pom.xml
@@ -36,7 +36,7 @@
<cucumber.version>1.2.5</cucumber.version>
<junit.jupiter.version>5.6.0</junit.jupiter.version>
<elasticsearch.version>7.8.1</elasticsearch.version>
- <os-core-common.version>0.14.0-rc7</os-core-common.version>
+ <os-core-common.version>0.14.0-rc8</os-core-common.version>
</properties>
<dependencies>
diff --git a/testing/indexer-test-core/pom.xml b/testing/indexer-test-core/pom.xml
index 832c1e615..52d37832e 100644
--- a/testing/indexer-test-core/pom.xml
+++ b/testing/indexer-test-core/pom.xml
@@ -17,7 +17,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-common.version>0.14.0-rc7</os-core-common.version>
+ <os-core-common.version>0.14.0-rc8</os-core-common.version>
</properties>
<dependencies>
diff --git a/testing/indexer-test-ibm/pom.xml b/testing/indexer-test-ibm/pom.xml
index ee58dda84..e7892db4a 100644
--- a/testing/indexer-test-ibm/pom.xml
+++ b/testing/indexer-test-ibm/pom.xml
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
- <version>0.14.0-rc7</version>
+ <version>0.14.0-rc8</version>
</dependency>
<dependency>
--
GitLab