diff options
| author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2011-02-07 23:08:54 +0000 |
|---|---|---|
| committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2011-02-07 23:08:54 +0000 |
| commit | 1288834480c8b3e074bb65284ef2db0ee64f9e28 (patch) | |
| tree | dc54b55041d8b240c41361291e8308f24c474f90 /sca-java-2.x/trunk | |
| parent | eeaf84366a7e92085ffdec489f3a2efd3528aa76 (diff) | |
Upgrade to jackson 1.7.1 release
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1068210 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk')
4 files changed, 10 insertions, 10 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 e934b46560..b1c8b31b54 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 @@ -267,9 +267,9 @@ The following components come under Apache Software License 2.0 httpclient-4.0.3.jar
httpcore-4.0.1.jar
jabsorb-1.3.1.jar
- jackson-core-asl-1.6.3.jar
- jackson-mapper-asl-1.6.3.jar
- jackson-xc-1.6.3.jar
+ jackson-core-asl-1.7.1.jar
+ jackson-mapper-asl-1.7.1.jar
+ jackson-xc-1.7.1.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-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java index b58fbb9f53..526283c8fa 100644 --- a/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java +++ b/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java @@ -210,8 +210,8 @@ public class JSONRPCBindingInvoker implements Invoker, DataExchangeSemantics { // Ignore } if (xmlAdapter != null) { - XmlAdapterJsonDeserializer deserializer = new XmlAdapterJsonDeserializer(xmlAdapter); - XmlAdapterJsonSerializer serializer = new XmlAdapterJsonSerializer(xmlAdapter); + XmlAdapterJsonDeserializer deserializer = new XmlAdapterJsonDeserializer(xmlAdapter, null); + XmlAdapterJsonSerializer serializer = new XmlAdapterJsonSerializer(xmlAdapter, null); deserializerFactory.addSpecificMapping(a.type(), deserializer); serializerFactory.addGenericMapping(a.type(), serializer); StdDeserializerProvider deserializerProvider = 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 793307bff3..1dc52e661d 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.6.3</version> + <version>1.7.1</version> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> - <version>1.6.3</version> + <version>1.7.1</version> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-xc</artifactId> - <version>1.6.3</version> + <version>1.7.1</version> </dependency> <dependency> diff --git a/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java b/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java index 459462fa97..e684378c6e 100644 --- a/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java +++ b/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java @@ -77,8 +77,8 @@ public class JacksonHelper { // Ignore } if (xmlAdapter != null) { - XmlAdapterJsonDeserializer deserializer = new XmlAdapterJsonDeserializer(xmlAdapter); - XmlAdapterJsonSerializer serializer = new XmlAdapterJsonSerializer(xmlAdapter); + XmlAdapterJsonDeserializer deserializer = new XmlAdapterJsonDeserializer(xmlAdapter, null); + XmlAdapterJsonSerializer serializer = new XmlAdapterJsonSerializer(xmlAdapter, null); deserializerFactory.addSpecificMapping(a.type(), deserializer); serializerFactory.addGenericMapping(a.type(), serializer); StdDeserializerProvider deserializerProvider = |