Skip to content
Snippets Groups Projects
Commit 34d9ac35 authored by Morris Estepa's avatar Morris Estepa
Browse files

Squashed commit of the following

commit 8c661bfc 
Author: Morris Estepa <estepamo@amazon.com> 
Date: Thu Jul 28 2022 17:52:13 GMT-0500 (Central Daylight Time) 

    spring-webmvc upgrade
parent a567ac0e
No related branches found
No related tags found
1 merge request!240spring-webmvc upgrade
Pipeline #128131 failed
......@@ -40,6 +40,7 @@
<maven_surefire_plugin_version>3.0.0-M4</maven_surefire_plugin_version>
<maven_failsafe_plugin_version>3.0.0-M4</maven_failsafe_plugin_version>
<jackson-databind.version>2.13.2.2</jackson-databind.version>
<spring-webmvc.version>5.3.22</spring-webmvc.version>
</properties>
<dependencyManagement>
......@@ -62,6 +63,11 @@
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring-webmvc.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
......
......@@ -33,6 +33,7 @@
<properties>
<aws.version>1.11.1018</aws.version>
<deployment.environment>dev</deployment.environment>
<spring-webmvc.version>5.3.22</spring-webmvc.version>
</properties>
<dependencyManagement>
......@@ -99,6 +100,11 @@
</dependency>
<!-- Third party Apache 2.0 license packages -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring-webmvc.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
......
......@@ -18,6 +18,7 @@
<junit.version>4.12</junit.version>
<mockito.version>2.25.0</mockito.version>
<powermock.version>2.0.2</powermock.version>
<spring-webmvc.version>5.3.22</spring-webmvc.version>
</properties>
<dependencyManagement>
......@@ -75,6 +76,11 @@
<artifactId>core-lib-azure</artifactId>
<version>${osdu.corelibazure.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring-webmvc.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
......
......@@ -76,6 +76,11 @@
<artifactId>jackson-annotations</artifactId>
<version>2.13.2</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>5.3.22</version>
</dependency>
<!-- Testing packages -->
<dependency>
......
......@@ -20,6 +20,7 @@
<properties>
<version.keycloak>9.0.2</version.keycloak>
<spring-webmvc.version>5.3.22</spring-webmvc.version>
</properties>
<dependencyManagement>
......@@ -51,6 +52,11 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency> -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring-webmvc.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
......
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