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 @@
- org.codehaus.jackson
- jackson-core-asl
+ com.fasterxml.jackson.core
+ jackson-annotations
-
@@ -48,11 +47,11 @@
org.apache.archiva.maven2.model
${project.version}
- javax.xml.bind.annotation,
- org.codehaus.jackson.annotate,
+ javax.xml.bind.annotation
- org.apache.archiva.maven2.model*;version=${project.version}
+ org.apache.archiva.maven2.model*;version=${project.version},
+ com.fasterxml.jackson.annotation
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 @@
* 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 @@
bundle
Archiva Base :: Repository Admin Api
-
- org.codehaus.jackson
- jackson-core-asl
-
commons-collections
commons-collections
@@ -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
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 @@
- org.codehaus.jackson
- jackson-jaxrs
+ org.codehaus.woodstox
+ woodstox-core-asl
- org.codehaus.jackson
- jackson-xc
+ com.fasterxml.jackson.jaxrs
+ jackson-jaxrs-json-provider
- org.codehaus.jackson
- jackson-core-asl
+ com.fasterxml.jackson.jaxrs
+ jackson-jaxrs-xml-provider
org.apache.cxf
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 @@
-
+
-
+
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 @@
org.codehaus.woodstox
woodstox-core-asl
- 4.1.4
@@ -727,18 +726,6 @@
log4j-jcl
runtime
-
- org.codehaus.jackson
- jackson-jaxrs
-
-
- org.codehaus.jackson
- jackson-xc
-
-
- org.codehaus.jackson
- jackson-core-asl
-
org.apache.cxf
cxf-bundle-jaxrs
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 @@
disruptor
test
-
- org.codehaus.jackson
- jackson-core-asl
- test
-
-
- org.codehaus.jackson
- jackson-mapper-asl
- test
-
diff --git a/pom.xml b/pom.xml
index 36a7ea985..eb4108e4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -493,25 +493,32 @@
jsr311-api
1.1.1
+
+
+
+ org.codehaus.woodstox
+ woodstox-core-asl
+ 4.2.0
+
+
- org.codehaus.jackson
- jackson-jaxrs
+ com.fasterxml.jackson.jaxrs
+ jackson-jaxrs-json-provider
${jacksonVersion}
- org.codehaus.jackson
- jackson-xc
+ com.fasterxml.jackson.jaxrs
+ jackson-jaxrs-xml-provider
${jacksonVersion}
- org.codehaus.jackson
- jackson-core-asl
- ${jacksonVersion}
-
-
- org.codehaus.jackson
- jackson-mapper-asl
+ com.fasterxml.jackson.core
+ jackson-annotations
${jacksonVersion}