mirror of
https://github.com/apache/struts.git
synced 2026-08-06 15:17:00 +00:00
Merge branch 'struts-2-5-x' into WW-5041
This commit is contained in:
@@ -96,19 +96,16 @@
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
|
||||
<spring.platformVersion>4.3.24.RELEASE</spring.platformVersion>
|
||||
<ognl.version>3.1.26</ognl.version>
|
||||
<spring.platformVersion>4.3.25.RELEASE</spring.platformVersion>
|
||||
<asm.version>7.1</asm.version>
|
||||
<tiles.version>3.0.8</tiles.version>
|
||||
<tiles-request.version>1.0.7</tiles-request.version>
|
||||
<log4j2.version>2.11.2</log4j2.version>
|
||||
<jackson.version>2.9.9</jackson.version>
|
||||
<!-- FIXME: drop once a new 2.9.10 will be out and all packages will be in sync -->
|
||||
<jackson-databind.version>2.9.9.3</jackson-databind.version>
|
||||
<log4j2.version>2.12.1</log4j2.version>
|
||||
<jackson.version>2.10.0</jackson.version>
|
||||
|
||||
<!-- Site generation -->
|
||||
<fluido-skin.version>1.7</fluido-skin.version>
|
||||
<fluido-skin.version>1.8</fluido-skin.version>
|
||||
|
||||
<!-- Sonar -->
|
||||
<sonar.host.url>https://builds.apache.org/analysis/</sonar.host.url>
|
||||
@@ -1003,12 +1000,12 @@
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<version>1.7.26</version>
|
||||
<version>1.7.28</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-simple</artifactId>
|
||||
<version>1.7.26</version>
|
||||
<version>1.7.28</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
@@ -1082,7 +1079,7 @@
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-databind</artifactId>
|
||||
<version>${jackson-databind.version}</version>
|
||||
<version>${jackson.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.dataformat</groupId>
|
||||
@@ -1095,7 +1092,7 @@
|
||||
<dependency>
|
||||
<groupId>org.codehaus.woodstox</groupId>
|
||||
<artifactId>stax2-api</artifactId>
|
||||
<version>4.1</version>
|
||||
<version>4.2</version>
|
||||
</dependency>
|
||||
|
||||
<!-- CDI & Weld -->
|
||||
|
||||
Reference in New Issue
Block a user