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

Merge branch 'aws-integration' into 'master'

spring-webmvc upgrade

See merge request !356

(cherry picked from commit 1e067195)

5af37ab7 Squashed commit of the following 
b47dda9d Merge branch 'master' into 'aws-integration'
parent 674a8582
No related branches found
No related tags found
1 merge request!360Cherry pick spring-webmvc to release/0.16
Pipeline #128201 failed
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
<netty.version>4.1.70.Final</netty.version> <netty.version>4.1.70.Final</netty.version>
<jackson-databind.version>2.13.2.2</jackson-databind.version> <jackson-databind.version>2.13.2.2</jackson-databind.version>
<jackson.version>2.13.2</jackson.version> <jackson.version>2.13.2</jackson.version>
<spring-webmvc.version>5.3.22</spring-webmvc.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
...@@ -93,6 +94,11 @@ ...@@ -93,6 +94,11 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId> <artifactId>spring-boot-starter-validation</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring-webmvc.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.tomcat.embed</groupId> <groupId>org.apache.tomcat.embed</groupId>
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
<netty.version>4.1.51.Final</netty.version> <netty.version>4.1.51.Final</netty.version>
<jackson-databind.version>2.13.2.2</jackson-databind.version> <jackson-databind.version>2.13.2.2</jackson-databind.version>
<jackson.version>2.13.2</jackson.version> <jackson.version>2.13.2</jackson.version>
<spring-webmvc.version>5.3.22</spring-webmvc.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
...@@ -113,6 +114,11 @@ ...@@ -113,6 +114,11 @@
<artifactId>spring-security-oauth2-jose</artifactId> <artifactId>spring-security-oauth2-jose</artifactId>
<version>5.5.0</version> <version>5.5.0</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring-webmvc.version}</version>
</dependency>
<dependency> <dependency>
<groupId>javax.inject</groupId> <groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId> <artifactId>javax.inject</artifactId>
......
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
<oauth2-oidc-sdk.version>6.5</oauth2-oidc-sdk.version> <oauth2-oidc-sdk.version>6.5</oauth2-oidc-sdk.version>
<jackson-databind.version>2.13.2.2</jackson-databind.version> <jackson-databind.version>2.13.2.2</jackson-databind.version>
<jackson.version>2.13.2</jackson.version> <jackson.version>2.13.2</jackson.version>
<spring-webmvc.version>5.3.22</spring-webmvc.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
...@@ -330,6 +331,11 @@ ...@@ -330,6 +331,11 @@
<artifactId>oauth2-oidc-sdk</artifactId> <artifactId>oauth2-oidc-sdk</artifactId>
<version>${oauth2-oidc-sdk.version}</version> <version>${oauth2-oidc-sdk.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring-webmvc.version}</version>
</dependency>
</dependencies> </dependencies>
......
...@@ -126,6 +126,11 @@ ...@@ -126,6 +126,11 @@
<artifactId>logback-jackson</artifactId> <artifactId>logback-jackson</artifactId>
<version>0.1.5</version> <version>0.1.5</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>5.3.22</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -32,8 +32,9 @@ ...@@ -32,8 +32,9 @@
<properties> <properties>
<tomcat.embed.core.version>9.0.54</tomcat.embed.core.version> <tomcat.embed.core.version>9.0.54</tomcat.embed.core.version>
<os-core-lib-ibm.version>0.16.0-rc1</os-core-lib-ibm.version> <os-core-lib-ibm.version>0.16.0-rc1</os-core-lib-ibm.version>
</properties> <spring-webmvc.version>5.3.22</spring-webmvc.version>
</properties>
<profiles> <profiles>
<profile> <profile>
...@@ -97,7 +98,12 @@ ...@@ -97,7 +98,12 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring-webmvc.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId> <artifactId>spring-boot-starter-security</artifactId>
</dependency> </dependency>
......
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