You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2017/09/19 07:26:31 UTC
[2/2] struts git commit: WW-4859 WW-4860 Upgrades jackson and
json-lib jars
WW-4859 WW-4860 Upgrades jackson and json-lib jars
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d41bd50a
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d41bd50a
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d41bd50a
Branch: refs/heads/master
Commit: d41bd50a6ef5ddc14dd0502fd9cd36dff09e9e6c
Parents: bca42a2
Author: Lukasz Lenart <lu...@apache.org>
Authored: Tue Sep 19 09:19:42 2017 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Tue Sep 19 09:26:20 2017 +0200
----------------------------------------------------------------------
plugins/rest/pom.xml | 5 -----
pom.xml | 13 ++++++++++++-
2 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/d41bd50a/plugins/rest/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml
index caa6808..f85b496 100644
--- a/plugins/rest/pom.xml
+++ b/plugins/rest/pom.xml
@@ -34,7 +34,6 @@
<packaging>jar</packaging>
<properties>
- <jackson.version>2.6.1</jackson.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -52,14 +51,10 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>${jackson.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/struts/blob/d41bd50a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5af929e..3a83b32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -919,7 +919,18 @@
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
<classifier>jdk15</classifier>
- <version>2.3</version>
+ <version>2.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>2.8.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.8.2</version>
</dependency>
<!-- CDI & Weld -->