From 3764577414b6bc6f09f8fd0d3f962dc8a2cac8f4 Mon Sep 17 00:00:00 2001
From: David Meng <xlmeng@amazon.com>
Date: Mon, 3 Oct 2022 19:38:18 +0000
Subject: [PATCH] Squashed commit of the following
commit 9c326cec
Author: AWSReservedSSO_OSDU-Power-User_7d859056df6b352b/xlmeng <AWSReservedSSO_OSDU-Power-User_7d859056df6b352b/xlmeng>
Date: Mon Oct 03 2022 13:57:41 GMT-0400 (Eastern Daylight Time)
Conflicts resolved in the console.
commit 722d96b5
Author: David Meng <xlmeng@amazon.com>
Date: Wed Sep 28 2022 15:21:55 GMT-0400 (Eastern Daylight Time)
Upgrade Tomcat
---
indexer-core/pom.xml | 2 +-
pom.xml | 2 +-
provider/indexer-ibm/pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/indexer-core/pom.xml b/indexer-core/pom.xml
index dda3f9aaf..120a081c4 100644
--- a/indexer-core/pom.xml
+++ b/indexer-core/pom.xml
@@ -103,7 +103,7 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
- <version>9.0.45</version>
+ <version>9.0.67</version>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index f538a540c..b3abf3636 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
<hibernate-validator.version>6.1.5.Final</hibernate-validator.version>
<jackson-databind.version>2.13.2.2</jackson-databind.version>
<jackson.version>2.13.2</jackson.version>
- <tomcat-embed-core.version>9.0.45</tomcat-embed-core.version>
+ <tomcat-embed-core.version>9.0.67</tomcat-embed-core.version>
<common-codec.version>1.14</common-codec.version>
<elasticsearch.version>7.8.1</elasticsearch.version>
<netty.version>4.1.51.Final</netty.version>
diff --git a/provider/indexer-ibm/pom.xml b/provider/indexer-ibm/pom.xml
index 1e739640f..edb6132ee 100644
--- a/provider/indexer-ibm/pom.xml
+++ b/provider/indexer-ibm/pom.xml
@@ -31,7 +31,7 @@
<packaging>jar</packaging>
<properties>
- <tomcat.embed.core.version>9.0.54</tomcat.embed.core.version>
+ <tomcat.embed.core.version>9.0.67</tomcat.embed.core.version>
<os-core-lib-ibm.version>0.16.0-rc1</os-core-lib-ibm.version>
<spring-webmvc.version>5.3.22</spring-webmvc.version>
<jackson-databind.version>2.13.2.2</jackson-databind.version>
--
GitLab