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

Merge branch 'aws-integration' into 'master'

update spring-webmvc

See merge request !172
parents 6c17e7be 59bf2f1f
No related branches found
No related tags found
1 merge request!172update spring-webmvc
Pipeline #128572 failed
......@@ -31,6 +31,7 @@
<osdu.oscorecommon.version>0.16.0-rc2</osdu.oscorecommon.version>
<jackson-databind.version>2.13.2.2</jackson-databind.version>
<jackson.version>2.13.2</jackson.version>
<spring-webmvc.version>5.3.22</spring-webmvc.version>
</properties>
<prerequisites>
......@@ -91,6 +92,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>javax.jdo</groupId>
<artifactId>jdo-api</artifactId>
......
......@@ -42,6 +42,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<jackson-databind.version>2.13.2.2</jackson-databind.version>
<jackson.version>2.13.2</jackson.version>
<spring-webmvc.version>5.3.22</spring-webmvc.version>
</properties>
<prerequisites>
......@@ -77,6 +78,11 @@
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring-webmvc.version}</version>
</dependency>
</dependencies>
......
......@@ -27,6 +27,7 @@
<osdu.corelibazure.version>0.14.0</osdu.corelibazure.version>
<jackson-databind.version>2.13.2.2</jackson-databind.version>
<jackson.version>2.13.2</jackson.version>
<spring-webmvc.version>5.3.22</spring-webmvc.version>
</properties>
<prerequisites>
......@@ -162,6 +163,11 @@
<version>3.0.16</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring-webmvc.version}</version>
</dependency>
</dependencies>
<build>
......
......@@ -25,6 +25,7 @@
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<spring-webmvc.version>5.3.22</spring-webmvc.version>
</properties>
<prerequisites>
......@@ -104,6 +105,11 @@
<artifactId>logback-json-classic</artifactId>
<version>0.1.5</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring-webmvc.version}</version>
</dependency>
</dependencies>
<build>
......
......@@ -26,6 +26,7 @@
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<spring-webmvc.version>5.3.22</spring-webmvc.version>
</properties>
<prerequisites>
......@@ -102,7 +103,12 @@
<version>${os-core-lib-ibm.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring-webmvc.version}</version>
</dependency>
</dependencies>
<build>
......
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