Skip to content
Snippets Groups Projects
Commit 37645774 authored by Xiangliang Meng's avatar Xiangliang Meng
Browse files

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
parent 6cc9b018
No related branches found
No related tags found
1 merge request!416Squashed commit of the following
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment