You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2014/07/21 15:38:00 UTC
[04/16] git commit: MARMOTTA-509,
MARMOTTA-510: Updated RESTeasy and Jackson
MARMOTTA-509, MARMOTTA-510: Updated RESTeasy and Jackson
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/fb163312
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/fb163312
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/fb163312
Branch: refs/heads/ldp
Commit: fb1633121749c1f8ec9639355a439179e9eb6e11
Parents: c8d9a18
Author: Jakob Frank <ja...@apache.org>
Authored: Fri Jun 13 17:18:46 2014 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Fri Jun 13 17:18:46 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/fb163312/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 9f0da4e..0b50d01 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -50,8 +50,8 @@
<postgresql.version>9.3-1100-jdbc4</postgresql.version>
<mysql.version>5.1.21</mysql.version>
<jetty.version>9.2.1.v20140609</jetty.version>
- <resteasy.version>3.0.6.Final</resteasy.version>
- <jackson.version>2.2.3</jackson.version>
+ <resteasy.version>3.0.8.Final</resteasy.version>
+ <jackson.version>2.3.3</jackson.version>
<titan.version>0.4.2</titan.version>
</properties>
@@ -864,8 +864,7 @@
<dependency>
<groupId>com.fasterxml.jackson.jr</groupId>
<artifactId>jackson-jr-objects</artifactId>
- <!-- FIXME: align jackson versions! -->
- <version>2.3.3</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.json</groupId>