You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by ni...@apache.org on 2015/04/17 18:08:20 UTC
[08/50] [abbrv] zest-qi4j git commit: Jackson ValueSerialization now
use Jackson 2.4
Jackson ValueSerialization now use Jackson 2.4
Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/8693abd1
Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/8693abd1
Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/8693abd1
Branch: refs/heads/3.0
Commit: 8693abd124de19c580a1148071ea7aefe8becadc
Parents: 5dc87a2
Author: Paul Merlin <pa...@nosphere.org>
Authored: Thu Jun 12 14:52:12 2014 +0200
Committer: Paul Merlin <pa...@nosphere.org>
Committed: Thu Jun 12 14:52:12 2014 +0200
----------------------------------------------------------------------
.../jackson/JacksonValueDeserializer.java | 16 ++++++++--------
.../jackson/JacksonValueSerializer.java | 8 ++++----
libraries.gradle | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/8693abd1/extensions/valueserialization-jackson/src/main/java/org/qi4j/valueserialization/jackson/JacksonValueDeserializer.java
----------------------------------------------------------------------
diff --git a/extensions/valueserialization-jackson/src/main/java/org/qi4j/valueserialization/jackson/JacksonValueDeserializer.java b/extensions/valueserialization-jackson/src/main/java/org/qi4j/valueserialization/jackson/JacksonValueDeserializer.java
index 4c913bd..5c6774b 100644
--- a/extensions/valueserialization-jackson/src/main/java/org/qi4j/valueserialization/jackson/JacksonValueDeserializer.java
+++ b/extensions/valueserialization-jackson/src/main/java/org/qi4j/valueserialization/jackson/JacksonValueDeserializer.java
@@ -15,16 +15,16 @@
*/
package org.qi4j.valueserialization.jackson;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.MappingJsonFactory;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import java.io.InputStream;
import java.util.Collection;
import java.util.Map;
-import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.JsonToken;
-import org.codehaus.jackson.map.MappingJsonFactory;
-import org.codehaus.jackson.node.ArrayNode;
-import org.codehaus.jackson.node.ObjectNode;
import org.qi4j.api.injection.scope.Service;
import org.qi4j.api.injection.scope.Structure;
import org.qi4j.api.service.ServiceReference;
@@ -56,7 +56,7 @@ public class JacksonValueDeserializer
protected JsonParser adaptInput( InputStream input )
throws Exception
{
- return jsonFactory.createJsonParser( input );
+ return jsonFactory.createParser( input );
}
@Override
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/8693abd1/extensions/valueserialization-jackson/src/main/java/org/qi4j/valueserialization/jackson/JacksonValueSerializer.java
----------------------------------------------------------------------
diff --git a/extensions/valueserialization-jackson/src/main/java/org/qi4j/valueserialization/jackson/JacksonValueSerializer.java b/extensions/valueserialization-jackson/src/main/java/org/qi4j/valueserialization/jackson/JacksonValueSerializer.java
index 7c3bd13..dc028a8 100644
--- a/extensions/valueserialization-jackson/src/main/java/org/qi4j/valueserialization/jackson/JacksonValueSerializer.java
+++ b/extensions/valueserialization-jackson/src/main/java/org/qi4j/valueserialization/jackson/JacksonValueSerializer.java
@@ -15,10 +15,10 @@
*/
package org.qi4j.valueserialization.jackson;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.MappingJsonFactory;
import java.io.OutputStream;
-import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.map.MappingJsonFactory;
import org.qi4j.spi.value.ValueSerializerAdapter;
/**
@@ -34,7 +34,7 @@ public class JacksonValueSerializer
protected JsonGenerator adaptOutput( OutputStream output )
throws Exception
{
- return jsonFactory.createJsonGenerator( output );
+ return jsonFactory.createGenerator( output );
}
@Override
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/8693abd1/libraries.gradle
----------------------------------------------------------------------
diff --git a/libraries.gradle b/libraries.gradle
index 993c407..d78ef13 100644
--- a/libraries.gradle
+++ b/libraries.gradle
@@ -16,11 +16,11 @@ def elasticsearchVersion = '1.2.1'
def freemarkerVersion = '2.3.20'
def gaeVersion = '1.8.8'
def hazelcastVersion = '3.1.3'
-def jacksonVersion = '1.9.11'
def groovyVersion = '2.3.2'
def guavaVersion = '17.0'
def h2Version = '1.4.178'
def httpClientVersion = '4.2.2' // 4.3.4 exists
+def jacksonVersion = '2.4.0'
def javascriptVersion = '1.7R4'
def javasqlgeneratorVersion = '0.3.2'
def jcloudsVersion = '1.7.0'
@@ -200,7 +200,7 @@ rootProject.ext {
wicket_stateless: "com.jolira:wicket-stateless:$wicketStatelessVersion",
// Library & Extension dependencies
- jackson_mapper: "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion",
+ jackson_mapper: "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion",
jodamoney: "org.joda:joda-money:$jodaMoneyVersion",
jodatime: "joda-time:joda-time:$jodaTimeVersion",
ehcache: "net.sf.ehcache:ehcache:$ehcacheVersion",