Apache/archiva
1
0
Fork 0
mirror of https://github.com/apache/archiva.git synced 2025-02-22 01:44:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

use last jackson version

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1537754 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2013-10-31 23:01:29 +00:00
parent e713507bdd
commit 0399353cf3
8 changed files with 34 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
archiva-modules/archiva-base/archiva-maven2-model/pom.xml
View File

@ -32,10 +32,9 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core-asl</artifactId> <artifactId>jackson-annotations</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
@ -48,11 +47,11 @@
<Bundle-SymbolicName>org.apache.archiva.maven2.model</Bundle-SymbolicName> <Bundle-SymbolicName>org.apache.archiva.maven2.model</Bundle-SymbolicName>
<Bundle-Version>${project.version}</Bundle-Version> <Bundle-Version>${project.version}</Bundle-Version>
<Import-Package> <Import-Package>
javax.xml.bind.annotation, javax.xml.bind.annotation
org.codehaus.jackson.annotate,
</Import-Package> </Import-Package>
<Export-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> </Export-Package>
</instructions> </instructions>
</configuration> </configuration>

3
archiva-modules/archiva-base/archiva-maven2-model/src/main/java/org/apache/archiva/maven2/model/TreeEntry.java
View File

@ -18,7 +18,8 @@
* under the License. * under the License.
*/ */
import org.codehaus.jackson.annotate.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnore;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable; import java.io.Serializable;

7
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
View File

@ -29,10 +29,6 @@
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>Archiva Base :: Repository Admin Api</name> <name>Archiva Base :: Repository Admin Api</name>
<dependencies> <dependencies>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
</dependency>
<dependency> <dependency>
<groupId>commons-collections</groupId> <groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId> <artifactId>commons-collections</artifactId>
@ -98,8 +94,7 @@
org.apache.commons.collections;version="[3.2,4)", org.apache.commons.collections;version="[3.2,4)",
org.apache.commons.lang;version="[2.4,3)", org.apache.commons.lang;version="[2.4,3)",
org.apache.archiva.redback.users, org.apache.archiva.redback.users,
org.apache.maven.index.context;resolution:=optional, org.apache.maven.index.context;resolution:=optional
org.codehaus.jackson.annotate
</Import-Package> </Import-Package>
</instructions> </instructions>
</configuration> </configuration>

12
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
View File

@ -192,16 +192,16 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>org.codehaus.woodstox</groupId>
<artifactId>jackson-jaxrs</artifactId> <artifactId>woodstox-core-asl</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-xc</artifactId> <artifactId>jackson-jaxrs-json-provider</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-core-asl</artifactId> <artifactId>jackson-jaxrs-xml-provider</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>

4
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
View File

@ -39,11 +39,11 @@
<context:component-scan <context:component-scan
base-package="org.apache.archiva.rest.services"/> 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"/> <property name="mapper" ref="redbackJacksonMapper"/>
</bean> </bean>
<bean id="redbackJacksonMapper" class="org.codehaus.jackson.map.ObjectMapper"> <bean id="redbackJacksonMapper" class="com.fasterxml.jackson.databind.ObjectMapper">
</bean> </bean>
<jaxrs:server id="archivaServices" address="/archivaServices"> <jaxrs:server id="archivaServices" address="/archivaServices">

13
archiva-modules/archiva-web/archiva-webapp/pom.xml
View File

@ -259,7 +259,6 @@
<dependency> <dependency>
<groupId>org.codehaus.woodstox</groupId> <groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId> <artifactId>woodstox-core-asl</artifactId>
<version>4.1.4</version>
</dependency> </dependency>
<!-- to help was8 to find dom parser impl --> <!-- to help was8 to find dom parser impl -->
<dependency> <dependency>
@ -727,18 +726,6 @@
<artifactId>log4j-jcl</artifactId> <artifactId>log4j-jcl</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </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> <dependency>
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle-jaxrs</artifactId> <artifactId>cxf-bundle-jaxrs</artifactId>

10
archiva-modules/plugins/metadata-store-cassandra/pom.xml
View File

@ -194,16 +194,6 @@
<artifactId>disruptor</artifactId> <artifactId>disruptor</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </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> </dependencies>
<build> <build>

29
pom.xml
View File

@ -493,25 +493,32 @@
<artifactId>jsr311-api</artifactId> <artifactId>jsr311-api</artifactId>
<version>1.1.1</version> <version>1.1.1</version>
</dependency> </dependency>
<!-- 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 --> <!-- START SNIPPET: rest-dependencies -->
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs</artifactId> <artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jacksonVersion}</version> <version>${jacksonVersion}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-xc</artifactId> <artifactId>jackson-jaxrs-xml-provider</artifactId>
<version>${jacksonVersion}</version> <version>${jacksonVersion}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core-asl</artifactId> <artifactId>jackson-annotations</artifactId>
<version>${jacksonVersion}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>${jacksonVersion}</version> <version>${jacksonVersion}</version>
</dependency> </dependency>
<dependency> <dependency>