Repository: archiva Updated Branches: refs/heads/master 64187aa84 -> 90e775b84
[MRM-1828] upgrade to jetty 9.x Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/a7a2c913 Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/a7a2c913 Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/a7a2c913 Branch: refs/heads/master Commit: a7a2c9130e30992d3d5dc4e6edac5d1d51034458 Parents: 64187aa Author: Olivier Lamy <[email protected]> Authored: Mon Apr 14 14:08:55 2014 +1000 Committer: Olivier Lamy <[email protected]> Committed: Mon Apr 14 14:08:55 2014 +1000 ---------------------------------------------------------------------- .../apache/archiva/proxy/HttpProxyTransferTest.java | 3 ++- .../indexing/DownloadRemoteIndexTaskTest.java | 13 +++++++------ .../archiva-web/archiva-web-common/pom.xml | 6 ++++++ .../archiva/remotedownload/DownloadArtifactsTest.java | 14 +++++++------- .../RemoteRepositoryConnectivityCheckTest.java | 5 +++-- .../AbstractRepositoryServletProxiedTestCase.java | 3 ++- pom.xml | 2 +- 7 files changed, 28 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/a7a2c913/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java index b96a261..92e34c8 100644 --- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java +++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java @@ -39,6 +39,7 @@ import org.apache.archiva.repository.ManagedRepositoryContent; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.handler.AbstractHandler; import org.junit.After; import org.junit.Before; @@ -167,7 +168,7 @@ public class HttpProxyTransferTest server.setHandler( handler ); server.start(); - int port = server.getConnectors()[0].getLocalPort(); + int port = ServerConnector.class.cast( server.getConnectors()[0] ).getLocalPort(); NetworkProxyConfiguration proxyConfig = new NetworkProxyConfiguration(); proxyConfig.setHost( "localhost" ); http://git-wip-us.apache.org/repos/asf/archiva/blob/a7a2c913/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java index 6a1210d..f0c6330 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java @@ -18,11 +18,11 @@ package org.apache.archiva.scheduler.indexing; * under the License. */ -import junit.framework.TestCase; import org.apache.archiva.admin.model.beans.RemoteRepository; import org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin; import org.apache.archiva.common.plexusbridge.PlexusSisuBridge; import org.apache.archiva.common.utils.FileUtil; +import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; import org.apache.maven.index.FlatSearchRequest; @@ -32,10 +32,10 @@ import org.apache.maven.index.NexusIndexer; import org.apache.maven.index.expr.StringSearchExpression; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.DefaultServlet; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; -import static org.assertj.core.api.Assertions.assertThat; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -50,13 +50,14 @@ import java.io.File; import java.io.IOException; import java.util.Arrays; import java.util.concurrent.TimeUnit; -import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; + +import static org.assertj.core.api.Assertions.assertThat; /** * @author Olivier Lamy */ -@RunWith( ArchivaSpringJUnit4ClassRunner.class ) -@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } ) +@RunWith(ArchivaSpringJUnit4ClassRunner.class) +@ContextConfiguration(locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" }) public class DownloadRemoteIndexTaskTest { @@ -86,7 +87,7 @@ public class DownloadRemoteIndexTaskTest this.server.start(); Connector connector = this.server.getConnectors()[0]; - this.port = connector.getLocalPort(); + this.port = ServerConnector.class.cast( connector ).getLocalPort(); log.info( "start server on port {}", this.port ); nexusIndexer = plexusSisuBridge.lookup( NexusIndexer.class ); } http://git-wip-us.apache.org/repos/asf/archiva/blob/a7a2c913/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 b1bc6d9..9163042 100644 --- a/archiva-modules/archiva-web/archiva-web-common/pom.xml +++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml @@ -403,6 +403,12 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> <build> http://git-wip-us.apache.org/repos/asf/archiva/blob/a7a2c913/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java index 3192fce..a9ac754 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactsTest.java @@ -21,11 +21,13 @@ package org.apache.archiva.remotedownload; import org.apache.archiva.admin.model.beans.RemoteRepository; import org.apache.archiva.redback.rest.api.services.RoleManagementService; import org.apache.archiva.security.common.ArchivaRoleConstants; +import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner; import org.apache.commons.compress.utils.IOUtils; import org.apache.commons.io.FileUtils; import org.apache.maven.wagon.providers.http.HttpWagon; import org.apache.maven.wagon.repository.Repository; import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.junit.After; @@ -47,12 +49,11 @@ import java.io.IOException; import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner; /** * @author Olivier Lamy */ -@RunWith( ArchivaBlockJUnit4ClassRunner.class ) +@RunWith(ArchivaBlockJUnit4ClassRunner.class) public class DownloadArtifactsTest extends AbstractDownloadTest { @@ -85,8 +86,9 @@ public class DownloadArtifactsTest protected String getSpringConfigLocation() { return "classpath*:META-INF/spring-context.xml classpath*:spring-context-test-common.xml classpath*:spring-context-artifacts-download.xml"; - } @Override + } + @Override @Before public void startServer() @@ -106,7 +108,7 @@ public class DownloadArtifactsTest repoServer.setHandler( contextRepo ); repoServer.start(); - this.repoServerPort = repoServer.getConnectors()[0].getLocalPort(); + this.repoServerPort = ServerConnector.class.cast( repoServer.getConnectors()[0] ).getLocalPort(); //redirect handler @@ -120,7 +122,7 @@ public class DownloadArtifactsTest redirectServer.setHandler( contextRedirect ); redirectServer.start(); - this.redirectPort = redirectServer.getConnectors()[0].getLocalPort(); + this.redirectPort = ServerConnector.class.cast( redirectServer.getConnectors()[0] ).getLocalPort(); log.info( "redirect server port {}", redirectPort ); } @@ -182,8 +184,6 @@ public class DownloadArtifactsTest } - - public static class RedirectServlet extends HttpServlet { http://git-wip-us.apache.org/repos/asf/archiva/blob/a7a2c913/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/RemoteRepositoryConnectivityCheckTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/RemoteRepositoryConnectivityCheckTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/RemoteRepositoryConnectivityCheckTest.java index 1b15f06..2734c0e 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/RemoteRepositoryConnectivityCheckTest.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/RemoteRepositoryConnectivityCheckTest.java @@ -26,6 +26,7 @@ import org.apache.commons.io.FileUtils; import org.apache.cxf.jaxrs.client.WebClient; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.handler.DefaultHandler; import org.eclipse.jetty.server.handler.HandlerList; import org.eclipse.jetty.server.handler.ResourceHandler; @@ -80,7 +81,7 @@ public class RemoteRepositoryConnectivityCheckTest try { - int repoServerPort = repoServer.getConnectors()[0].getLocalPort(); + int repoServerPort = ServerConnector.class.cast( repoServer.getConnectors()[0] ).getLocalPort(); RemoteRepository repo = getRemoteRepository(); @@ -113,7 +114,7 @@ public class RemoteRepositoryConnectivityCheckTest try { - int repoServerPort = repoServer.getConnectors()[0].getLocalPort(); + int repoServerPort = ServerConnector.class.cast( repoServer.getConnectors()[0] ).getLocalPort(); RemoteRepository repo = getRemoteRepository(); http://git-wip-us.apache.org/repos/asf/archiva/blob/a7a2c913/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java index c38e33f..d8925c9 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java @@ -32,6 +32,7 @@ import org.apache.archiva.policies.ReleasesPolicy; import org.apache.archiva.policies.SnapshotsPolicy; import org.apache.commons.io.FileUtils; import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.handler.ContextHandlerCollection; import org.eclipse.jetty.servlet.DefaultServlet; import org.eclipse.jetty.servlet.ServletContextHandler; @@ -152,7 +153,7 @@ public abstract class AbstractRepositoryServletProxiedTestCase repo.server.start(); - int port = repo.server.getConnectors()[0].getLocalPort(); + int port = ServerConnector.class.cast( repo.server.getConnectors()[0] ).getLocalPort(); repo.url = "http://localhost:"; + port + repo.context; log.info( "Remote HTTP Server started on {}", repo.url ); http://git-wip-us.apache.org/repos/asf/archiva/blob/a7a2c913/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 680d60b..de884d9 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ <httpclient.version>4.3.1</httpclient.version> <httpclient.core.version>4.3</httpclient.core.version> <javaxMailVersion>1.4</javaxMailVersion> - <jettyVersion>8.1.14.v20131031</jettyVersion> + <jettyVersion>9.1.4.v20140401</jettyVersion> <!-- restore when we will be able to use a derby in memory database --> <redbackTestJdbcUrl>jdbc:derby:memory:users-test;create=true</redbackTestJdbcUrl>
