summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x
diff options
context:
space:
mode:
authorrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2010-09-24 17:18:56 +0000
committerrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2010-09-24 17:18:56 +0000
commitb1a5b1501efb63c25cd4f04f0ec93d78335c0121 (patch)
tree237c9572b429217a42b63e0e955d4820d1b623d6 /sca-java-2.x
parentbf039f767dc9298dba129222562fb4104038ffa3 (diff)
Update to jackson 1.6.0
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1000979 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/binding-jsonp-runtime/pom.xml4
-rw-r--r--sca-java-2.x/trunk/modules/databinding-json/pom.xml6
3 files changed, 8 insertions, 8 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 fe4b27d610..362b58f0ea 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
@@ -278,9 +278,9 @@ The following components come under Apache Software License 2.0
httpcore-4.0.1.jar
httpcore-nio-4.0.1.jar
jabsorb-1.3.1.jar
- jackson-core-asl-1.5.4.jar
- jackson-mapper-asl-1.5.4.jar
- jackson-xc-1.5.4.jar
+ jackson-core-asl-1.6.0.jar
+ jackson-mapper-asl-1.6.0.jar
+ jackson-xc-1.6.0.jar
jettison-1.2.jar
jetty-6.1.19.jar
jetty-util-6.1.19.jar
diff --git a/sca-java-2.x/trunk/modules/binding-jsonp-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-jsonp-runtime/pom.xml
index bc6e526184..59e2e5fccc 100644
--- a/sca-java-2.x/trunk/modules/binding-jsonp-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-jsonp-runtime/pom.xml
@@ -51,13 +51,13 @@
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
- <version>1.5.4</version>
+ <version>1.6.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>1.5.4</version>
+ <version>1.6.0</version>
</dependency>
<dependency>
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 c81d554cfc..074d55aeb6 100644
--- a/sca-java-2.x/trunk/modules/databinding-json/pom.xml
+++ b/sca-java-2.x/trunk/modules/databinding-json/pom.xml
@@ -50,17 +50,17 @@
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
- <version>1.5.4</version>
+ <version>1.6.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>1.5.4</version>
+ <version>1.6.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
- <version>1.5.4</version>
+ <version>1.6.0</version>
</dependency>
<dependency>