Skip to content
Snippets Groups Projects
Commit be87aea7 authored by David Diederich's avatar David Diederich
Browse files

Merge branch 'cherry-pick-c44ec5e8' into 'release/0.16'

Cherry pick spring-webmvc to release/0.16

See merge request !277
parents a1a3913a 389036d6
No related branches found
No related tags found
1 merge request!277Cherry pick spring-webmvc to release/0.16
Pipeline #128555 failed
......@@ -18,6 +18,7 @@
<properties>
<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>
<dependencies>
......@@ -25,6 +26,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-actuator</artifactId>
......
......@@ -32,6 +32,7 @@
<version.number>0.16.0-SNAPSHOT</version.number>
<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>
<dependencies>
......@@ -111,6 +112,11 @@
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring-webmvc.version}</version>
</dependency>
<!-- Testing packages -->
<dependency>
......
......@@ -36,6 +36,7 @@
<javax.inject.version>1</javax.inject.version>
<javax.servlet-api.version>4.0.1</javax.servlet-api.version>
<woodstox-core.version>5.3.0</woodstox-core.version>
<spring-webmvc.version>5.3.22</spring-webmvc.version>
</properties>
<dependencyManagement>
......@@ -104,6 +105,11 @@
</exclusion>
</exclusions>
</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>
......
......@@ -227,6 +227,11 @@
<version>0.1.5</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>5.3.22</version>
</dependency>
</dependencies>
<build>
......
......@@ -12,6 +12,7 @@
<packaging>jar</packaging>
<properties>
<os-core-lib-ibm.version>0.16.0-rc1</os-core-lib-ibm.version>
<spring-webmvc.version>5.3.22</spring-webmvc.version>
</properties>
<dependencies>
......@@ -84,6 +85,11 @@
<type>pom</type>
</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-test</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