Browse Source

switched to Jackson 2.3.1

ipolevoy 11 years ago
parent
commit
b7664f4a17

+ 7 - 6
activeweb/pom.xml

@@ -97,15 +97,16 @@
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-core-asl</artifactId>
-            <version>1.9.12</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.3.1</version>
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
-            <version>1.9.12</version>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+          <version>2.3.1</version>
         </dependency>
+
     </dependencies>
 </project>

+ 1 - 1
activeweb/src/main/java/app/controllers/JsonController.java

@@ -20,7 +20,7 @@ limitations under the License.
 
 package app.controllers;
 
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.javalite.activeweb.AppController;
 
 import java.io.IOException;

+ 2 - 1
activeweb/src/test/java/app/controllers/JsonHelper.java

@@ -20,7 +20,8 @@ limitations under the License.
 
 package app.controllers;
 
-import org.codehaus.jackson.map.ObjectMapper;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.io.IOException;
 import java.util.Map;