svn commit: r1495734 - in /directmemory/trunk/server: ./ directmemory-server-commons/ directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/

[olamy]

Author: olamy
Date: Sat Jun 22 14:06:54 2013
New Revision: 1495734

URL: http://svn.apache.org/r1495734
Log:
use new jackson from com.fasterxml

Modified:
    directmemory/trunk/server/directmemory-server-commons/pom.xml
    
directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryParser.java
    
directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryWriter.java
    directmemory/trunk/server/pom.xml

Modified: directmemory/trunk/server/directmemory-server-commons/pom.xml
URL: 
http://svn.apache.org/viewvc/directmemory/trunk/server/directmemory-server-commons/pom.xml?rev=1495734&r1=1495733&r2=1495734&view=diff
==============================================================================
--- directmemory/trunk/server/directmemory-server-commons/pom.xml (original)
+++ directmemory/trunk/server/directmemory-server-commons/pom.xml Sat Jun 22 
14:06:54 2013
@@ -36,8 +36,8 @@
       <artifactId>directmemory-cache</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-core-asl</artifactId>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

Modified: 
directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryParser.java
URL: 
http://svn.apache.org/viewvc/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryParser.java?rev=1495734&r1=1495733&r2=1495734&view=diff
==============================================================================
--- 
directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryParser.java
 (original)
+++ 
directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryParser.java
 Sat Jun 22 14:06:54 2013
@@ -19,10 +19,11 @@ package org.apache.directmemory.server.c
  * under the License.
  */
 
-import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.JsonToken;
+
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: 
directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryWriter.java
URL: 
http://svn.apache.org/viewvc/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryWriter.java?rev=1495734&r1=1495733&r2=1495734&view=diff
==============================================================================
--- 
directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryWriter.java
 (original)
+++ 
directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryWriter.java
 Sat Jun 22 14:06:54 2013
@@ -19,9 +19,9 @@ package org.apache.directmemory.server.c
  * under the License.
  */
 
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
 import org.apache.directmemory.serialization.Serializer;
-import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directmemory/trunk/server/pom.xml
URL: 
http://svn.apache.org/viewvc/directmemory/trunk/server/pom.xml?rev=1495734&r1=1495733&r2=1495734&view=diff
==============================================================================
--- directmemory/trunk/server/pom.xml (original)
+++ directmemory/trunk/server/pom.xml Sat Jun 22 14:06:54 2013
@@ -62,9 +62,9 @@
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.jackson</groupId>
-        <artifactId>jackson-core-asl</artifactId>
-        <version>1.9.4</version>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-core</artifactId>
+        <version>2.2.2</version>
       </dependency>
       <dependency>
         <groupId>com.ning</groupId>