Repository: archiva Updated Branches: refs/heads/master 29faf4ed8 -> 1feb9a99f
fix compilation Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/1feb9a99 Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/1feb9a99 Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/1feb9a99 Branch: refs/heads/master Commit: 1feb9a99f6a45879e536cfc6fbd919aba6e970df Parents: 29faf4e Author: Olivier Lamy <[email protected]> Authored: Wed Feb 11 21:40:24 2015 +1100 Committer: Olivier Lamy <[email protected]> Committed: Wed Feb 11 21:40:24 2015 +1100 ---------------------------------------------------------------------- .../archiva-web/archiva-web-common/pom.xml | 6 ++++++ .../remotedownload/AbstractDownloadTest.java | 19 +++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/1feb9a99/archiva-modules/archiva-web/archiva-web-common/pom.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml index c5f0628..f392d94 100644 --- a/archiva-modules/archiva-web/archiva-web-common/pom.xml +++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml @@ -285,6 +285,12 @@ </dependency> <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-rs-client</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/archiva/blob/1feb9a99/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java index 0b17612..227da18 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/AbstractDownloadTest.java @@ -20,12 +20,18 @@ package org.apache.archiva.remotedownload; import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; import junit.framework.TestCase; +import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; +import org.apache.archiva.redback.rest.api.model.User; +import org.apache.archiva.redback.rest.api.services.RoleManagementService; +import org.apache.archiva.redback.rest.api.services.UserService; +import org.apache.archiva.redback.rest.services.FakeCreateAdminService; import org.apache.archiva.rest.api.services.ManagedRepositoriesService; import org.apache.archiva.rest.api.services.ProxyConnectorService; import org.apache.archiva.rest.api.services.RemoteRepositoriesService; import org.apache.archiva.rest.api.services.RepositoriesService; import org.apache.archiva.rest.api.services.RepositoryGroupService; import org.apache.archiva.rest.api.services.SearchService; +import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner; import org.apache.archiva.webdav.RepositoryServlet; import org.apache.catalina.Context; import org.apache.catalina.deploy.ApplicationListener; @@ -36,18 +42,10 @@ import org.apache.cxf.common.util.Base64Utility; import org.apache.cxf.jaxrs.client.JAXRSClientFactory; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.transport.servlet.CXFServlet; -import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; -import org.apache.archiva.redback.rest.api.model.User; -import org.apache.archiva.redback.rest.api.services.RoleManagementService; -import org.apache.archiva.redback.rest.api.services.UserService; -import org.apache.archiva.redback.rest.services.FakeCreateAdminService; -import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.session.SessionHandler; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.servlet.ServletHolder; import org.junit.After; import org.junit.Before; +import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.context.ContextLoaderListener; @@ -59,9 +57,6 @@ import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner; -import org.junit.runner.RunWith; - /** * @author Olivier Lamy */
