From 0399353cf3707f292b2d17743c3625c66556d9d2 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Thu, 31 Oct 2013 23:01:29 +0000
Subject: use last jackson version

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1537754 13f79535-47bb-0310-9956-ffa450edef68
---
 .../archiva-base/archiva-maven2-model/pom.xml      | 11 ++++-----
 .../org/apache/archiva/maven2/model/TreeEntry.java |  3 ++-
 .../archiva-repository-admin-api/pom.xml           |  7 +-----
 .../archiva-rest/archiva-rest-services/pom.xml     | 12 +++++-----
 .../src/main/resources/META-INF/spring-context.xml |  4 ++--
 archiva-modules/archiva-web/archiva-webapp/pom.xml | 13 -----------
 .../plugins/metadata-store-cassandra/pom.xml       | 10 --------
 pom.xml                                            | 27 ++++++++++++++--------
 8 files changed, 33 insertions(+), 54 deletions(-)

diff --git a/archiva-modules/archiva-base/archiva-maven2-model/pom.xml b/archiva-modules/archiva-base/archiva-maven2-model/pom.xml
index 10758e8a8..c31687639 100644
--- a/archiva-modules/archiva-base/archiva-maven2-model/pom.xml
+++ b/archiva-modules/archiva-base/archiva-maven2-model/pom.xml
@@ -32,10 +32,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-core-asl</artifactId>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
     </dependency>
-
   </dependencies>
 
   <build>
@@ -48,11 +47,11 @@
             <Bundle-SymbolicName>org.apache.archiva.maven2.model</Bundle-SymbolicName>
             <Bundle-Version>${project.version}</Bundle-Version>
             <Import-Package>
-              javax.xml.bind.annotation,
-              org.codehaus.jackson.annotate,
+              javax.xml.bind.annotation
             </Import-Package>
             <Export-Package>
-              org.apache.archiva.maven2.model*;version=${project.version}
+              org.apache.archiva.maven2.model*;version=${project.version},
+              com.fasterxml.jackson.annotation
             </Export-Package>
           </instructions>
         </configuration>
diff --git a/archiva-modules/archiva-base/archiva-maven2-model/src/main/java/org/apache/archiva/maven2/model/TreeEntry.java b/archiva-modules/archiva-base/archiva-maven2-model/src/main/java/org/apache/archiva/maven2/model/TreeEntry.java
index 9cf4d9a06..b122780aa 100644
--- a/archiva-modules/archiva-base/archiva-maven2-model/src/main/java/org/apache/archiva/maven2/model/TreeEntry.java
+++ b/archiva-modules/archiva-base/archiva-maven2-model/src/main/java/org/apache/archiva/maven2/model/TreeEntry.java
@@ -18,7 +18,8 @@ package org.apache.archiva.maven2.model;
  * under the License.
  */
 
-import org.codehaus.jackson.annotate.JsonIgnore;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import java.io.Serializable;
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
index c7231c614..751642329 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
@@ -29,10 +29,6 @@
   <packaging>bundle</packaging>
   <name>Archiva Base :: Repository Admin Api</name>
   <dependencies>
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-core-asl</artifactId>
-    </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
@@ -98,8 +94,7 @@
               org.apache.commons.collections;version="[3.2,4)",
               org.apache.commons.lang;version="[2.4,3)",
               org.apache.archiva.redback.users,
-              org.apache.maven.index.context;resolution:=optional,
-              org.codehaus.jackson.annotate
+              org.apache.maven.index.context;resolution:=optional
             </Import-Package>
           </instructions>
         </configuration>
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
index 3c2edf67a..345665151 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
@@ -192,16 +192,16 @@
         </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-jaxrs</artifactId>
+      <groupId>org.codehaus.woodstox</groupId>
+      <artifactId>woodstox-core-asl</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-xc</artifactId>
+      <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <artifactId>jackson-jaxrs-json-provider</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-core-asl</artifactId>
+      <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <artifactId>jackson-jaxrs-xml-provider</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.cxf</groupId>
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
index f2c1f2d8f..71a6db2d9 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
@@ -39,11 +39,11 @@
   <context:component-scan
       base-package="org.apache.archiva.rest.services"/>
 
-  <bean id="jsonProvider" class="org.codehaus.jackson.jaxrs.JacksonJsonProvider">
+  <bean id="jsonProvider" class="com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider">
     <property name="mapper" ref="redbackJacksonMapper"/>
   </bean>
 
-  <bean id="redbackJacksonMapper" class="org.codehaus.jackson.map.ObjectMapper">
+  <bean id="redbackJacksonMapper" class="com.fasterxml.jackson.databind.ObjectMapper">
   </bean>
 
   <jaxrs:server id="archivaServices" address="/archivaServices">
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 8e522e856..69b592e47 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -259,7 +259,6 @@
     <dependency>
       <groupId>org.codehaus.woodstox</groupId>
       <artifactId>woodstox-core-asl</artifactId>
-      <version>4.1.4</version>
     </dependency>
     <!-- to help was8 to find dom parser impl -->
     <dependency>
@@ -727,18 +726,6 @@
       <artifactId>log4j-jcl</artifactId>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-jaxrs</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-xc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-core-asl</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-bundle-jaxrs</artifactId>
diff --git a/archiva-modules/plugins/metadata-store-cassandra/pom.xml b/archiva-modules/plugins/metadata-store-cassandra/pom.xml
index ba32df2af..59f8261d2 100644
--- a/archiva-modules/plugins/metadata-store-cassandra/pom.xml
+++ b/archiva-modules/plugins/metadata-store-cassandra/pom.xml
@@ -194,16 +194,6 @@
       <artifactId>disruptor</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-core-asl</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-      <scope>test</scope>
-    </dependency>
 
   </dependencies>
   <build>
diff --git a/pom.xml b/pom.xml
index 36a7ea985..eb4108e4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -493,25 +493,32 @@
         <artifactId>jsr311-api</artifactId>
         <version>1.1.1</version>
       </dependency>
-      <!-- START SNIPPET: rest-dependencies -->
+
+      <!-- normally not needed as we are 1.6 required
+        but due to http://jira.codehaus.org/browse/MODELLO-266
+        and we use stax reader produced by modello
+        ibm jdk stax impl won't work with
+       -->
       <dependency>
-        <groupId>org.codehaus.jackson</groupId>
-        <artifactId>jackson-jaxrs</artifactId>
-        <version>${jacksonVersion}</version>
+        <groupId>org.codehaus.woodstox</groupId>
+        <artifactId>woodstox-core-asl</artifactId>
+        <version>4.2.0</version>
       </dependency>
+
+      <!-- START SNIPPET: rest-dependencies -->
       <dependency>
-        <groupId>org.codehaus.jackson</groupId>
-        <artifactId>jackson-xc</artifactId>
+        <groupId>com.fasterxml.jackson.jaxrs</groupId>
+        <artifactId>jackson-jaxrs-json-provider</artifactId>
         <version>${jacksonVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.jackson</groupId>
-        <artifactId>jackson-core-asl</artifactId>
+        <groupId>com.fasterxml.jackson.jaxrs</groupId>
+        <artifactId>jackson-jaxrs-xml-provider</artifactId>
         <version>${jacksonVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.jackson</groupId>
-        <artifactId>jackson-mapper-asl</artifactId>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-annotations</artifactId>
         <version>${jacksonVersion}</version>
       </dependency>
       <dependency>
-- 
cgit v1.2.3