diff --git a/.gitignore b/.gitignore index 0eca7e3..af5875c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ wagon-1.0-source-release.zip /wagon-2.8-source-release.zip /wagon-2.9-source-release.zip /wagon-2.10-source-release.zip +/wagon-3.0.0-source-release.zip diff --git a/0001-Port-to-jetty-9.patch b/0001-Port-to-jetty-9.patch deleted file mode 100644 index 1773719..0000000 --- a/0001-Port-to-jetty-9.patch +++ /dev/null @@ -1,342 +0,0 @@ -From 5cb833d14c6752642812122c249b71bd3b1fb99d Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Wed, 27 Feb 2013 12:38:47 +0100 -Subject: [PATCH] Port to jetty 9 - ---- - wagon-provider-test/pom.xml | 30 ++++++- - .../apache/maven/wagon/http/HttpWagonTestCase.java | 97 +++++++++++----------- - 2 files changed, 78 insertions(+), 49 deletions(-) - -diff --git a/wagon-provider-test/pom.xml b/wagon-provider-test/pom.xml -index cf9a53d..439a476 100644 ---- a/wagon-provider-test/pom.xml -+++ b/wagon-provider-test/pom.xml -@@ -51,8 +51,34 @@ under the License. - compile - - -- org.mortbay.jetty -- jetty -+ log4j -+ log4j -+ compile -+ -+ -+ org.eclipse.jetty -+ jetty-server -+ compile -+ -+ -+ org.eclipse.jetty -+ jetty-util -+ compile -+ -+ -+ org.eclipse.jetty -+ jetty-client -+ compile -+ -+ -+ org.eclipse.jetty -+ jetty-security -+ compile -+ -+ -+ org.eclipse.jetty -+ jetty-servlet -+ compile - - - -diff --git a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java -index acdab16..78ecbc5 100644 ---- a/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java -+++ b/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java -@@ -34,20 +34,25 @@ import org.apache.maven.wagon.resource.Resource; - import org.codehaus.plexus.util.FileUtils; - import org.codehaus.plexus.util.IOUtil; - import org.codehaus.plexus.util.StringUtils; --import org.mortbay.jetty.Handler; --import org.mortbay.jetty.HttpConnection; --import org.mortbay.jetty.Request; --import org.mortbay.jetty.Response; --import org.mortbay.jetty.Server; --import org.mortbay.jetty.handler.AbstractHandler; --import org.mortbay.jetty.handler.HandlerCollection; --import org.mortbay.jetty.security.Constraint; --import org.mortbay.jetty.security.ConstraintMapping; --import org.mortbay.jetty.security.HashUserRealm; --import org.mortbay.jetty.security.SecurityHandler; --import org.mortbay.jetty.servlet.Context; --import org.mortbay.jetty.servlet.DefaultServlet; --import org.mortbay.jetty.servlet.ServletHolder; -+import org.eclipse.jetty.server.Handler; -+import org.eclipse.jetty.server.HttpConnection; -+import org.eclipse.jetty.server.HttpChannel; -+import org.eclipse.jetty.server.Request; -+import org.eclipse.jetty.server.Response; -+import org.eclipse.jetty.server.Server; -+import org.eclipse.jetty.server.NetworkConnector; -+import org.eclipse.jetty.server.UserIdentity; -+import org.eclipse.jetty.server.handler.AbstractHandler; -+import org.eclipse.jetty.server.handler.HandlerCollection; -+import org.eclipse.jetty.util.security.Constraint; -+import org.eclipse.jetty.util.security.Password; -+import org.eclipse.jetty.security.ConstraintMapping; -+import org.eclipse.jetty.security.HashLoginService; -+import org.eclipse.jetty.security.SecurityHandler; -+import org.eclipse.jetty.security.ConstraintSecurityHandler; -+import org.eclipse.jetty.servlet.ServletContextHandler; -+import org.eclipse.jetty.servlet.DefaultServlet; -+import org.eclipse.jetty.servlet.ServletHolder; - - import javax.servlet.ServletException; - import javax.servlet.ServletInputStream; -@@ -99,7 +104,7 @@ public abstract class HttpWagonTestCase - server = new Server( 0 ); - - PutHandler putHandler = new PutHandler( repositoryDirectory ); -- server.addHandler( putHandler ); -+ server.setHandler( putHandler ); - - createContext( server, repositoryDirectory ); - -@@ -117,14 +122,14 @@ public abstract class HttpWagonTestCase - { - return 0; - } -- return server.getConnectors()[0].getLocalPort(); -+ return ((NetworkConnector) (server.getConnectors()[0])).getLocalPort(); - } - - protected void createContext( Server server, File repositoryDirectory ) - throws IOException - { -- Context root = new Context( server, "/", Context.SESSIONS ); -- root.setResourceBase( repositoryDirectory.getAbsolutePath() ); -+ ServletContextHandler root = new ServletContextHandler( server, "/", ServletContextHandler.SESSIONS ); -+ //root.setResourceBase( repositoryDirectory.getAbsolutePath() ); - ServletHolder servletHolder = new ServletHolder( new DefaultServlet() ); - root.addServlet( servletHolder, "/*" ); - } -@@ -164,7 +169,7 @@ public abstract class HttpWagonTestCase - server.start(); - - wagon.connect( -- new Repository( "id", getProtocol() + "://localhost:" + server.getConnectors()[0].getLocalPort() ) ); -+ new Repository( "id", getProtocol() + "://localhost:" + ((NetworkConnector) (server.getConnectors()[0])).getLocalPort() ) ); - - wagon.getToStream( "resource", new ByteArrayOutputStream() ); - -@@ -196,7 +201,7 @@ public abstract class HttpWagonTestCase - server.start(); - - wagon.connect( -- new Repository( "id", getProtocol() + "://localhost:" + server.getConnectors()[0].getLocalPort() ) ); -+ new Repository( "id", getProtocol() + "://localhost:" + ((NetworkConnector) (server.getConnectors()[0])).getLocalPort() ) ); - - wagon.getToStream( "resource", new ByteArrayOutputStream() ); - -@@ -265,7 +270,7 @@ public abstract class HttpWagonTestCase - - protected String getRepositoryUrl( Server server ) - { -- int localPort = server.getConnectors()[0].getLocalPort(); -+ int localPort = ((NetworkConnector) (server.getConnectors()[0])).getLocalPort(); - return getProtocol() + "://localhost:" + localPort; - } - -@@ -543,7 +548,7 @@ public abstract class HttpWagonTestCase - Server server = new Server( getTestRepositoryPort() ); - - String localRepositoryPath = FileTestUtils.getTestOutputDir().toString(); -- Context root = new Context( server, "/", Context.SESSIONS ); -+ ServletContextHandler root = new ServletContextHandler( server, "/", ServletContextHandler.SESSIONS ); - root.setResourceBase( localRepositoryPath ); - ServletHolder servletHolder = new ServletHolder( new DefaultServlet() ); - servletHolder.setInitParameter( "gzip", "true" ); -@@ -679,7 +684,7 @@ public abstract class HttpWagonTestCase - protocol = "https"; - } - -- String redirectUrl = protocol + "://localhost:" + server.getConnectors()[0].getLocalPort(); -+ String redirectUrl = protocol + "://localhost:" + ((NetworkConnector) (server.getConnectors()[0])).getLocalPort(); - - RedirectHandler redirectHandler = - new RedirectHandler( "Found", HttpServletResponse.SC_SEE_OTHER, redirectUrl, null ); -@@ -744,7 +749,7 @@ public abstract class HttpWagonTestCase - protocol = "https"; - } - -- String redirectUrl = protocol + "://localhost:" + server.getConnectors()[0].getLocalPort(); -+ String redirectUrl = protocol + "://localhost:" + ((NetworkConnector) (server.getConnectors()[0])).getLocalPort(); - - RedirectHandler redirectHandler = - new RedirectHandler( "Found", HttpServletResponse.SC_SEE_OTHER, redirectUrl, null ); -@@ -811,7 +816,7 @@ public abstract class HttpWagonTestCase - protocol = "https"; - } - -- String redirectUrl = protocol + "://localhost:" + realServer.getConnectors()[0].getLocalPort(); -+ String redirectUrl = protocol + "://localhost:" + ((NetworkConnector) (realServer.getConnectors()[0])).getLocalPort(); - - RedirectHandler redirectHandler = - new RedirectHandler( "Found", HttpServletResponse.SC_SEE_OTHER, redirectUrl, repositoryDirectory ); -@@ -991,7 +996,7 @@ public abstract class HttpWagonTestCase - protocol = "https"; - } - -- String redirectUrl = protocol + "://localhost:" + realServer.getConnectors()[0].getLocalPort(); -+ String redirectUrl = protocol + "://localhost:" + ((NetworkConnector) (realServer.getConnectors()[0])).getLocalPort(); - - RedirectHandler redirectHandler = - new RedirectHandler( "Found", HttpServletResponse.SC_SEE_OTHER, redirectUrl, repositoryDirectory ); -@@ -1122,13 +1127,13 @@ public abstract class HttpWagonTestCase - this.repositoryDirectory = repositoryDirectory; - } - -- public void handle( String s, HttpServletRequest req, HttpServletResponse resp, int i ) -+ public void handle( String s, Request baseRequest, HttpServletRequest req, HttpServletResponse resp ) - throws IOException, ServletException - { - if ( req.getRequestURI().contains( "redirectRequest" ) ) - { - PutHandler putHandler = new PutHandler( this.repositoryDirectory ); -- putHandler.handle( s, req, resp, i ); -+ putHandler.handle( s, baseRequest, req, resp ); - handlerRequestResponses.add( - new HandlerRequestResponse( req.getMethod(), ( (Response) resp ).getStatus(), - req.getRequestURI() ) ); -@@ -1158,7 +1163,7 @@ public abstract class HttpWagonTestCase - - proxyServer.start(); - -- proxyInfo.setPort( proxyServer.getConnectors()[0].getLocalPort() ); -+ proxyInfo.setPort( ((NetworkConnector) (proxyServer.getConnectors()[0])).getLocalPort() ); - - System.out.println( - "start proxy on host/port " + proxyInfo.getHost() + "/" + proxyInfo.getPort() + " with non proxyHosts " -@@ -1342,7 +1347,7 @@ public abstract class HttpWagonTestCase - - assertEquals( "top secret", IOUtil.toString( in ) ); - -- TestSecurityHandler securityHandler = (TestSecurityHandler) ( (Context) server.getHandler() ).getHandler(); -+ TestSecurityHandler securityHandler = (TestSecurityHandler) ( (ServletContextHandler) server.getHandler() ).getHandler(); - testPreemptiveAuthenticationGet( securityHandler, supportPreemptiveAuthenticationGet() ); - - } -@@ -1393,7 +1398,7 @@ public abstract class HttpWagonTestCase - - assertEquals( "top secret", out.toString( "US-ASCII" ) ); - -- TestSecurityHandler securityHandler = (TestSecurityHandler) ( (Context) server.getHandler() ).getHandler(); -+ TestSecurityHandler securityHandler = (TestSecurityHandler) ( (ServletContextHandler) server.getHandler() ).getHandler(); - testPreemptiveAuthenticationGet( securityHandler, supportPreemptiveAuthenticationGet() ); - } - finally -@@ -1483,9 +1488,9 @@ public abstract class HttpWagonTestCase - - SecurityHandler sh = createSecurityHandler(); - -- Context root = new Context( Context.SESSIONS ); -+ ServletContextHandler root = new ServletContextHandler( ServletContextHandler.SESSIONS ); - root.setContextPath( "/" ); -- root.addHandler( sh ); -+ root.setHandler( sh ); - root.setResourceBase( localRepositoryPath ); - ServletHolder servletHolder = new ServletHolder( new DefaultServlet() ); - root.addServlet( servletHolder, "/*" ); -@@ -1908,7 +1913,7 @@ public abstract class HttpWagonTestCase - this.status = status; - } - -- public void handle( String target, HttpServletRequest request, HttpServletResponse response, int dispatch ) -+ public void handle( String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response ) - throws IOException, ServletException - { - if ( status != 0 ) -@@ -1968,11 +1973,11 @@ public abstract class HttpWagonTestCase - this.resourceBase = repositoryDirectory; - } - -- public void handle( String target, HttpServletRequest request, HttpServletResponse response, int dispatch ) -+ public void handle( String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response ) - throws IOException, ServletException - { - Request baseRequest = -- request instanceof Request ? (Request) request : HttpConnection.getCurrentConnection().getRequest(); -+ request instanceof Request ? (Request) request : HttpConnection.getCurrentConnection().getHttpChannel().getRequest(); - - if ( baseRequest.isHandled() || !"PUT".equals( baseRequest.getMethod() ) ) - { -@@ -2017,7 +2022,7 @@ public abstract class HttpWagonTestCase - - List handlerRequestResponses = new ArrayList(); - -- public void handle( String target, HttpServletRequest request, HttpServletResponse response, int dispatch ) -+ public void handle( String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response ) - throws IOException, ServletException - { - System.out.println( " handle proxy request" ); -@@ -2035,7 +2040,7 @@ public abstract class HttpWagonTestCase - } - handlerRequestResponses.add( - new HandlerRequestResponse( request.getMethod(), HttpServletResponse.SC_OK, request.getRequestURI() ) ); -- super.handle( target, request, response, dispatch ); -+ super.handle( target, baseRequest, request, response ); - } - } - -@@ -2054,7 +2059,7 @@ public abstract class HttpWagonTestCase - { - } - -- public void handle( String target, HttpServletRequest request, HttpServletResponse response, int dispatch ) -+ public void handle( String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response ) - throws IOException, ServletException - { - headers = new HashMap(); -@@ -2102,10 +2107,9 @@ public abstract class HttpWagonTestCase - cm.setPathSpec( "/*" ); - - TestSecurityHandler sh = new TestSecurityHandler(); -- HashUserRealm hashUserRealm = new HashUserRealm( "MyRealm" ); -- hashUserRealm.put( "user", "secret" ); -- hashUserRealm.addUserToRole( "user", "admin" ); -- sh.setUserRealm( hashUserRealm ); -+ HashLoginService hashLoginService = new HashLoginService( "MyRealm" ); -+ hashLoginService.putUser( "user", new Password( "secret" ), new String[]{ "admin" } ); -+ sh.setLoginService( hashLoginService ); - sh.setConstraintMappings( new ConstraintMapping[]{ cm } ); - return sh; - } -@@ -2115,22 +2119,21 @@ public abstract class HttpWagonTestCase - */ - @SuppressWarnings( "checkstyle:visibilitymodifier" ) - public static class TestSecurityHandler -- extends SecurityHandler -+ extends ConstraintSecurityHandler - { - - public List handlerRequestResponses = new ArrayList(); - - @Override -- public void handle( String target, HttpServletRequest request, HttpServletResponse response, int dispatch ) -+ public void handle( String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response ) - throws IOException, ServletException - { - String method = request.getMethod(); -- super.handle( target, request, response, dispatch ); -+ super.handle( target, baseRequest, request, response ); - - handlerRequestResponses.add( - new HandlerRequestResponse( method, ( (Response) response ).getStatus(), request.getRequestURI() ) ); - } -- - } - - /** --- -2.1.0 - diff --git a/maven-wagon.spec b/maven-wagon.spec index fb5a6d1..c6939ea 100644 --- a/maven-wagon.spec +++ b/maven-wagon.spec @@ -1,21 +1,17 @@ %bcond_without scm %bcond_without ssh -%global bname wagon -%global split_verrel 2.6-4 -Name: maven-%{bname} -Version: 2.10 -Release: 4%{?dist} +Name: maven-wagon Epoch: 0 +Version: 3.0.0 +Release: 1%{?dist} Summary: Tools to manage artifacts and deployment License: ASL 2.0 URL: http://maven.apache.org/wagon -Source0: http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon/%{version}/wagon-%{version}-source-release.zip - -Patch0: 0001-Port-to-jetty-9.patch - BuildArch: noarch +Source0: http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon/%{version}/wagon-%{version}-source-release.zip + BuildRequires: maven-local %if %{with ssh} BuildRequires: mvn(com.jcraft:jsch) @@ -23,8 +19,6 @@ BuildRequires: mvn(com.jcraft:jsch.agentproxy.connector-factory) BuildRequires: mvn(com.jcraft:jsch.agentproxy.jsch) %endif BuildRequires: mvn(commons-io:commons-io) -BuildRequires: mvn(commons-lang:commons-lang) -BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(commons-net:commons-net) BuildRequires: mvn(org.apache.httpcomponents:httpclient) BuildRequires: mvn(org.apache.httpcomponents:httpcore) @@ -32,11 +26,13 @@ BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) %if %{with scm} BuildRequires: mvn(org.apache.maven.scm:maven-scm-api) +BuildRequires: mvn(org.apache.maven.scm:maven-scm-manager-plexus) %endif BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-interactivity-api) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.jsoup:jsoup) +BuildRequires: mvn(org.slf4j:jcl-over-slf4j) BuildRequires: mvn(org.slf4j:slf4j-api) Obsoletes: %{name}-manual < %{epoch}:%{version}-%{release} @@ -55,7 +51,7 @@ following providers: %package provider-api Summary: provider-api module for %{name} -Obsoletes: %{name} < %{split_verrel} +Obsoletes: %{name} < 2.6-4 Obsoletes: %{name}-webdav-jackrabbit < 2.9-2 %description provider-api @@ -134,15 +130,10 @@ Javadoc for %{name}. %prep %setup -q -n wagon-%{version} -%patch0 -p1 - %pom_remove_plugin :animal-sniffer-maven-plugin %pom_remove_plugin :maven-enforcer-plugin %pom_remove_dep :wagon-tck-http wagon-providers/wagon-http -# correct groupId for jetty -%pom_xpath_set "pom:groupId[text()='org.mortbay.jetty']" "org.eclipse.jetty" - # disable tests, missing dependencies %pom_disable_module wagon-tcks %pom_disable_module wagon-ssh-common-test wagon-providers/pom.xml @@ -200,6 +191,9 @@ Javadoc for %{name}. %doc LICENSE NOTICE DEPENDENCIES %changelog +* Mon Sep 11 2017 Mikolaj Izdebski - 0:3.0.0-1 +- Update to upstream version 3.0.0 + * Wed Jul 26 2017 Fedora Release Engineering - 0:2.10-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 8df8bda..3f486aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3014355ecac309064b5cf9581bc1c58d wagon-2.10-source-release.zip +SHA512 (wagon-3.0.0-source-release.zip) = 41318ec7c8c43b1928d963e268eb11d2c24c58cb2413b595dfbdf374e745094d6848fbf719f2b4fcbfe1ff8e8432a4c4565190cf85fbb69a56ce2b22abd74ff7