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 2015/02/06 13:30:42 UTC
archiva git commit: upgrade to cxf 3.0.3
Repository: archiva
Updated Branches:
refs/heads/master d8cb9a50e -> 041a8cc8e
upgrade to cxf 3.0.3
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/041a8cc8
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/041a8cc8
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/041a8cc8
Branch: refs/heads/master
Commit: 041a8cc8e0390ba09aefbf24e35bafab705e5f4b
Parents: d8cb9a5
Author: Olivier Lamy <ol...@apache.org>
Authored: Fri Feb 6 23:30:09 2015 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Fri Feb 6 23:30:36 2015 +1100
----------------------------------------------------------------------
.../archiva-rest/archiva-rest-api/pom.xml | 12 +---
.../archiva-rest/archiva-rest-services/pom.xml | 36 +++++++-----
.../archiva/rest/services/CopyArtifactTest.java | 9 +--
.../archiva/rest/services/PingServiceTest.java | 9 +--
.../services/RemoteRepositoriesServiceTest.java | 8 +--
.../rest/services/RepositoriesServiceTest.java | 23 ++++----
.../archiva/web/rss/SecuritySystemStub.java | 7 +++
.../archiva-web/archiva-webapp/pom.xml | 61 ++------------------
.../archiva/webdav/BypassSecuritySystem.java | 2 +
pom.xml | 40 +++++++------
10 files changed, 83 insertions(+), 124 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/041a8cc8/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
index b56d3ad..3978172 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
@@ -87,17 +87,7 @@
<!-- normally not needed but here for wadl feature currently in cxf -->
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle-jaxrs</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/archiva/blob/041a8cc8/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
----------------------------------------------------------------------
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 c63241d..1fafc81 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
@@ -198,22 +198,22 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle-jaxrs</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-extension-providers</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+
+
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rest-services</artifactId>
@@ -280,6 +280,12 @@
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/archiva/blob/041a8cc8/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/CopyArtifactTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/CopyArtifactTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/CopyArtifactTest.java
index 526d406..abfdf82 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/CopyArtifactTest.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/CopyArtifactTest.java
@@ -18,12 +18,9 @@ package org.apache.archiva.rest.services;
* under the License.
*/
-import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.rest.api.model.ArtifactTransferRequest;
import org.apache.archiva.rest.api.services.RepositoriesService;
-import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.cxf.jaxrs.client.ServerWebApplicationException;
import org.junit.Ignore;
import org.junit.Test;
@@ -79,7 +76,7 @@ public class CopyArtifactTest
}
}
- @Test( expected = ServerWebApplicationException.class )
+ @Test( expected = Exception.class )
public void copyNonExistingArtifact()
throws Throwable
{
@@ -95,9 +92,9 @@ public class CopyArtifactTest
artifactTransferRequest.setTargetRepositoryId( TARGET_REPO_ID );
RepositoriesService repositoriesService = getRepositoriesService( authorizationHeader );
- Boolean res = repositoriesService.copyArtifact( artifactTransferRequest );
+ repositoriesService.copyArtifact( artifactTransferRequest );
}
- catch ( ServerWebApplicationException e )
+ catch ( Exception e )
{
assertTrue( StringUtils.contains( e.getMessage(), "cannot find artifact" ) );
throw e;
http://git-wip-us.apache.org/repos/asf/archiva/blob/041a8cc8/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/PingServiceTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/PingServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/PingServiceTest.java
index 2786a25..7fb242e 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/PingServiceTest.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/PingServiceTest.java
@@ -20,11 +20,12 @@ package org.apache.archiva.rest.services;
*/
import org.apache.archiva.rest.api.services.PingService;
-import org.apache.cxf.jaxrs.client.ServerWebApplicationException;
import org.apache.cxf.jaxrs.client.WebClient;
import org.junit.Ignore;
import org.junit.Test;
+import javax.ws.rs.ForbiddenException;
+
/**
* @author Olivier Lamy
* @since 1.4-M1
@@ -45,7 +46,7 @@ public class PingServiceTest
assertEquals( "Yeah Baby It rocks!", res );
}
- @Test( expected = ServerWebApplicationException.class )
+ @Test( expected = ForbiddenException.class )
public void pingWithAuthzFailed()
throws Exception
{
@@ -55,9 +56,9 @@ public class PingServiceTest
String res = getPingService().pingWithAuthz();
fail( "not in exception" );
}
- catch ( ServerWebApplicationException e )
+ catch ( ForbiddenException e )
{
- assertEquals( 403, e.getStatus() );
+ assertEquals( 403, e.getResponse().getStatus() );
throw e;
}
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/041a8cc8/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RemoteRepositoriesServiceTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RemoteRepositoriesServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RemoteRepositoriesServiceTest.java
index 4d7d78c..db85771 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RemoteRepositoriesServiceTest.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RemoteRepositoriesServiceTest.java
@@ -21,10 +21,10 @@ package org.apache.archiva.rest.services;
import org.apache.archiva.admin.model.beans.RemoteRepository;
import org.apache.archiva.rest.api.services.RemoteRepositoriesService;
-import org.apache.cxf.jaxrs.client.ServerWebApplicationException;
import org.apache.cxf.jaxrs.client.WebClient;
import org.junit.Test;
+import javax.ws.rs.ForbiddenException;
import java.util.List;
/**
@@ -35,7 +35,7 @@ public class RemoteRepositoriesServiceTest
{
- @Test (expected = ServerWebApplicationException.class)
+ @Test( expected = ForbiddenException.class )
public void listRemoteRepositoriesKarmaFailed()
throws Exception
{
@@ -44,9 +44,9 @@ public class RemoteRepositoriesServiceTest
{
assertFalse( service.getRemoteRepositories().isEmpty() );
}
- catch ( ServerWebApplicationException e )
+ catch ( ForbiddenException e )
{
- assertEquals( 403, e.getStatus() );
+ assertEquals( 403, e.getResponse().getStatus() );
throw e;
}
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/041a8cc8/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
index 12070c3..51c1bff 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
@@ -29,13 +29,14 @@ import org.apache.archiva.rest.api.services.BrowseService;
import org.apache.archiva.rest.api.services.ManagedRepositoriesService;
import org.apache.archiva.rest.api.services.RepositoriesService;
import org.apache.commons.io.FileUtils;
-import org.apache.cxf.jaxrs.client.ServerWebApplicationException;
-import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
+import javax.ws.rs.ForbiddenException;
import java.io.File;
import java.util.List;
+import static org.assertj.core.api.Assertions.assertThat;
+
/**
* @author Olivier Lamy
*/
@@ -43,7 +44,7 @@ public class RepositoriesServiceTest
extends AbstractArchivaRestTest
{
- @Test ( expected = ServerWebApplicationException.class )
+ @Test( expected = ForbiddenException.class )
public void scanRepoKarmaFailed()
throws Exception
{
@@ -52,9 +53,9 @@ public class RepositoriesServiceTest
{
service.scanRepository( "id", true );
}
- catch ( ServerWebApplicationException e )
+ catch ( ForbiddenException e )
{
- assertEquals( 403, e.getStatus() );
+ assertEquals( 403, e.getResponse().getStatus() );
throw e;
}
}
@@ -79,7 +80,7 @@ public class RepositoriesServiceTest
assertTrue( service.scanRepository( repoId, true ) );
}
- @Test ( expected = ServerWebApplicationException.class )
+ @Test( expected = ForbiddenException.class )
public void deleteArtifactKarmaFailed()
throws Exception
{
@@ -96,15 +97,15 @@ public class RepositoriesServiceTest
repositoriesService.deleteArtifact( artifact );
}
- catch ( ServerWebApplicationException e )
+ catch ( ForbiddenException e )
{
- assertEquals( 403, e.getStatus() );
+ assertEquals( 403, e.getResponse().getStatus() );
throw e;
}
}
- @Test ( expected = ServerWebApplicationException.class )
+ @Test( expected = ForbiddenException.class )
public void deleteWithRepoNull()
throws Exception
{
@@ -121,9 +122,9 @@ public class RepositoriesServiceTest
repositoriesService.deleteArtifact( artifact );
}
- catch ( ServerWebApplicationException e )
+ catch ( ForbiddenException e )
{
- assertEquals( "not http 400 status", 400, e.getStatus() );
+ assertEquals( "not http 400 status", 400, e.getResponse().getStatus() );
throw e;
}
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/041a8cc8/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java
index 53cfeb5..16c84f2 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java
@@ -104,6 +104,13 @@ public class SecuritySystemStub
return result;
}
+ @Override
+ public AuthorizationResult authorize( User user, String permission, String resource )
+ throws AuthorizationException
+ {
+ return null;
+ }
+
public String getAuthenticatorId()
{
return null;
http://git-wip-us.apache.org/repos/asf/archiva/blob/041a8cc8/archiva-modules/archiva-web/archiva-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index c12918e..27b5030 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -767,61 +767,12 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle-jaxrs</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-continuation</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-http</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-io</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-security</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-extension-providers</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
http://git-wip-us.apache.org/repos/asf/archiva/blob/041a8cc8/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/BypassSecuritySystem.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/BypassSecuritySystem.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/BypassSecuritySystem.java
index a858771..fed66b9 100644
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/BypassSecuritySystem.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/BypassSecuritySystem.java
@@ -82,6 +82,8 @@ public class BypassSecuritySystem
return new AuthorizationResult( true, session.getUser(), null );
}
+
+
@Override
public String getAuthenticatorId()
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/041a8cc8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a1406a9..52a69c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>