You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/11/01 00:01:30 UTC
svn commit: r1537754 - in /archiva/trunk: ./
archiva-modules/archiva-base/archiva-maven2-model/
archiva-modules/archiva-base/archiva-maven2-model/src/main/java/org/apache/archiva/maven2/model/
archiva-modules/archiva-base/archiva-repository-admin/archi...
Author: olamy
Date: Thu Oct 31 23:01:29 2013
New Revision: 1537754
URL: http://svn.apache.org/r1537754
Log:
use last jackson version
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-maven2-model/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-maven2-model/src/main/java/org/apache/archiva/maven2/model/TreeEntry.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-maven2-model/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-maven2-model/pom.xml?rev=1537754&r1=1537753&r2=1537754&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-maven2-model/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-maven2-model/pom.xml Thu Oct 31 23:01:29 2013
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-maven2-model/src/main/java/org/apache/archiva/maven2/model/TreeEntry.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-maven2-model/src/main/java/org/apache/archiva/maven2/model/TreeEntry.java?rev=1537754&r1=1537753&r2=1537754&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-maven2-model/src/main/java/org/apache/archiva/maven2/model/TreeEntry.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-maven2-model/src/main/java/org/apache/archiva/maven2/model/TreeEntry.java Thu Oct 31 23:01:29 2013
@@ -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;
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml?rev=1537754&r1=1537753&r2=1537754&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml Thu Oct 31 23:01:29 2013
@@ -30,10 +30,6 @@
<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>
</dependency>
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml?rev=1537754&r1=1537753&r2=1537754&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml Thu Oct 31 23:01:29 2013
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml?rev=1537754&r1=1537753&r2=1537754&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml Thu Oct 31 23:01:29 2013
@@ -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">
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1537754&r1=1537753&r2=1537754&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Thu Oct 31 23:01:29 2013
@@ -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>
@@ -728,18 +727,6 @@
<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>
<exclusions>
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml?rev=1537754&r1=1537753&r2=1537754&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml Thu Oct 31 23:01:29 2013
@@ -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>
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1537754&r1=1537753&r2=1537754&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Thu Oct 31 23:01:29 2013
@@ -493,25 +493,32 @@
<artifactId>jsr311-api</artifactId>
<version>1.1.1</version>
</dependency>
- <!-- START SNIPPET: rest-dependencies -->
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
- <version>${jacksonVersion}</version>
+
+ <!-- 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.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>