diff options
| author | Olivier Lamy <olamy@apache.org> | 2015-02-06 23:30:09 +1100 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2015-02-06 23:30:36 +1100 |
| commit | 041a8cc8e0390ba09aefbf24e35bafab705e5f4b (patch) | |
| tree | 44365837acf68fe0bff0293b0c13b339750d6d6c /pom.xml | |
| parent | d8cb9a50e896c204e66797f29d9740e62ba088f9 (diff) | |
| download | archiva-041a8cc8e0390ba09aefbf24e35bafab705e5f4b.tar.gz archiva-041a8cc8e0390ba09aefbf24e35bafab705e5f4b.zip | |
upgrade to cxf 3.0.3
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 40 |
1 files changed, 22 insertions, 18 deletions
@@ -71,7 +71,7 @@ <redback.registry.version>2.4-SNAPSHOT</redback.registry.version> <redback.spring-utils.version>2.1</redback.spring-utils.version> <redback.taskqueue.version>2.1</redback.taskqueue.version> - <slf4j.version>1.7.7</slf4j.version> + <slf4j.version>1.7.10</slf4j.version> <log4j.version>2.1</log4j.version> <spring.version>4.1.4.RELEASE</spring.version> @@ -85,7 +85,7 @@ <sirona.version>0.1-incubating</sirona.version> - <cxfVersion>2.6.15</cxfVersion> + <cxf.version>3.0.3</cxf.version> <derbyVersion>10.10.1.1</derbyVersion> <httpclient.version>4.3.6</httpclient.version> <httpclient.core.version>4.4</httpclient.core.version> @@ -562,22 +562,20 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-bundle-jaxrs</artifactId> - <version>${cxfVersion}</version> - <exclusions> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - </exclusion> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.jettison</groupId> - <artifactId>jettison</artifactId> - </exclusion> - </exclusions> + <artifactId>cxf-rt-frontend-jaxrs</artifactId> + <version>${cxf.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-rs-client</artifactId> + <version>${cxf.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-rs-extension-providers</artifactId> + <version>${cxf.version}</version> </dependency> <dependency> <groupId>org.apache.archiva</groupId> @@ -1261,6 +1259,12 @@ <version>${slf4j.version}</version> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jul-to-slf4j</artifactId> + <version>${slf4j.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>commons-logging</groupId> |