summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x
diff options
context:
space:
mode:
authorrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2011-09-06 21:45:37 +0000
committerrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2011-09-06 21:45:37 +0000
commitdfdcb43d89c5abc1804e91778aec5d6a86f0d896 (patch)
treead7ec930fdc2942f6dd6e3844b50294cf19878c7 /sca-java-2.x
parent9eef67cf0a37bf882cf3268b0c288f04773cc15a (diff)
Upgrade to jackson 1.8.5
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1165873 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x')
-rw-r--r--sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE6
-rw-r--r--sca-java-2.x/trunk/modules/databinding-json/pom.xml6
2 files changed, 6 insertions, 6 deletions
diff --git a/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE b/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
index 60e64170b2..36ba6daabd 100644
--- a/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
@@ -269,9 +269,9 @@ The following components come under Apache Software License 2.0
httpclient-4.1.2.jar
httpcore-4.1.3.jar
jabsorb-1.3.1.jar
- jackson-core-asl-1.8.0.jar
- jackson-mapper-asl-1.8.0.jar
- jackson-xc-1.8.0.jar
+ jackson-core-asl-1.8.5.jar
+ jackson-mapper-asl-1.8.5.jar
+ jackson-xc-1.8.5.jar
jettison-1.2.jar
jetty-6.1.26.jar
jetty-util-6.1.26.jar
diff --git a/sca-java-2.x/trunk/modules/databinding-json/pom.xml b/sca-java-2.x/trunk/modules/databinding-json/pom.xml
index ed78c23ef5..d3f191639a 100644
--- a/sca-java-2.x/trunk/modules/databinding-json/pom.xml
+++ b/sca-java-2.x/trunk/modules/databinding-json/pom.xml
@@ -40,17 +40,17 @@
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
- <version>1.8.0</version>
+ <version>1.8.5</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>1.8.0</version>
+ <version>1.8.5</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
- <version>1.8.0</version>
+ <version>1.8.5</version>
</dependency>
<!--
<dependency>