Attachment 703898 Details for Bug 915725 – patch

[patch] patch

0001-Update-to-latest-upstream-version-2.4.patch (text/plain), 32.52 KB, created by Michal Srb on 2013-02-28 13:28:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Srb

Created: 2013-02-28 13:28:42 UTC

Size: 32.52 KB

patch

obsolete

>From 7309a85910a530a411f73b94344e048c741f1aec Mon Sep 17 00:00:00 2001
>From: Michal Srb <msrb@redhat.com>
>Date: Tue, 26 Feb 2013 12:29:34 +0100
>Subject: [PATCH] Update to latest upstream version 2.4
>
>- Remove old depmap and patches
>- Build with xmvn
>---
> 0001-Port-to-jetty-8.patch                        | 259 ++++++++++++++++++++++
> disable-tck.patch                                 |  11 -
> maven-wagon-migration-to-component-metadata.patch |  28 ---
> maven-wagon.spec                                  | 233 ++++++-------------
> sources                                           |   2 +-
> wagon-1.0-jpp-depmap.xml                          | 229 -------------------
> 6 files changed, 326 insertions(+), 436 deletions(-)
> create mode 100644 0001-Port-to-jetty-8.patch
> delete mode 100644 disable-tck.patch
> delete mode 100644 maven-wagon-migration-to-component-metadata.patch
> delete mode 100644 wagon-1.0-jpp-depmap.xml
>
>diff --git a/0001-Port-to-jetty-8.patch b/0001-Port-to-jetty-8.patch
>new file mode 100644
>index 0000000..3753d05
>--- /dev/null
>+++ b/0001-Port-to-jetty-8.patch
>@@ -0,0 +1,259 @@
>+From e7c5fab3875a9e4089277e7d7c9711d974b63601 Mon Sep 17 00:00:00 2001
>+From: Michal Srb <msrb@redhat.com>
>+Date: Wed, 27 Feb 2013 12:38:47 +0100
>+Subject: [PATCH] Port to jetty 8
>+
>+---
>+ wagon-provider-test/pom.xml                        | 30 ++++++++-
>+ .../apache/maven/wagon/http/HttpWagonTestCase.java | 77 +++++++++++-----------
>+ 2 files changed, 67 insertions(+), 40 deletions(-)
>+
>+diff --git a/wagon-provider-test/pom.xml b/wagon-provider-test/pom.xml
>+index 1bc9826..efa730d 100644
>+--- a/wagon-provider-test/pom.xml
>++++ b/wagon-provider-test/pom.xml
>+@@ -51,8 +51,34 @@ under the License.
>+       <scope>compile</scope>
>+     </dependency>
>+     <dependency>
>+-      <groupId>org.mortbay.jetty</groupId>
>+-      <artifactId>jetty</artifactId>
>++      <groupId>log4j</groupId>
>++      <artifactId>log4j</artifactId>
>++      <scope>compile</scope>
>++    </dependency>
>++    <dependency>
>++      <groupId>org.eclipse.jetty</groupId>
>++      <artifactId>jetty-server</artifactId>
>++      <scope>compile</scope>
>++    </dependency>
>++    <dependency>
>++      <groupId>org.eclipse.jetty</groupId>
>++      <artifactId>jetty-util</artifactId>
>++      <scope>compile</scope>
>++    </dependency>
>++    <dependency>
>++      <groupId>org.eclipse.jetty</groupId>
>++      <artifactId>jetty-client</artifactId>
>++      <scope>compile</scope>
>++    </dependency>
>++    <dependency>
>++      <groupId>org.eclipse.jetty</groupId>
>++      <artifactId>jetty-security</artifactId>
>++      <scope>compile</scope>
>++    </dependency>
>++    <dependency>
>++      <groupId>org.eclipse.jetty</groupId>
>++      <artifactId>jetty-servlet</artifactId>
>++      <scope>compile</scope>
>+     </dependency>
>+ 
>+   </dependencies>
>+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 4ee5475..66c77c9 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,23 @@
>+ import org.codehaus.plexus.util.IOUtil;
>+ import org.codehaus.plexus.util.StringOutputStream;
>+ 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.AbstractHttpConnection;
>++import org.eclipse.jetty.server.Request;
>++import org.eclipse.jetty.server.Response;
>++import org.eclipse.jetty.server.Server;
>++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;
>+@@ -95,7 +98,7 @@ protected void setupWagonTestingFixtures()
>+         server = new Server( 0 );
>+ 
>+         PutHandler putHandler = new PutHandler( repositoryDirectory );
>+-        server.addHandler( putHandler );
>++        server.setHandler( putHandler );
>+ 
>+         createContext( server, repositoryDirectory );
>+ 
>+@@ -119,8 +122,8 @@ protected final int getTestRepositoryPort()
>+     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, "/*" );
>+     }
>+@@ -368,7 +371,7 @@ public void testGzipGet()
>+         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" );
>+@@ -901,13 +904,13 @@ public void testRedirectPutFileRelativeUrl()
>+             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() ) );
>+@@ -1062,7 +1065,7 @@ public void runTestSecuredGet( AuthenticationInfo authInfo )
>+ 
>+             assertEquals( "top secret", IOUtil.toString( in ) );
>+ 
>+-            TestSecurityHandler securityHandler = (TestSecurityHandler) ( (Context) server.getHandler() ).getHandler();
>++            TestSecurityHandler securityHandler = (TestSecurityHandler) ( (ServletContextHandler) server.getHandler() ).getHandler();
>+             testPreemptiveAuthenticationGet( securityHandler, supportPreemptiveAuthenticationGet() );
>+ 
>+         }
>+@@ -1113,7 +1116,7 @@ public void runTestSecuredGetToStream( AuthenticationInfo authInfo )
>+ 
>+             assertEquals( "top secret", out.toString() );
>+ 
>+-            TestSecurityHandler securityHandler = (TestSecurityHandler) ( (Context) server.getHandler() ).getHandler();
>++            TestSecurityHandler securityHandler = (TestSecurityHandler) ( (ServletContextHandler) server.getHandler() ).getHandler();
>+             testPreemptiveAuthenticationGet( securityHandler, supportPreemptiveAuthenticationGet() );
>+         }
>+         finally
>+@@ -1203,9 +1206,9 @@ private Server createSecurityServer( String localRepositoryPath )
>+ 
>+         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, "/*" );
>+@@ -1566,7 +1569,7 @@ public void setStatusToReturn( int status )
>+             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 )
>+@@ -1622,11 +1625,11 @@ public PutHandler( File repositoryDirectory )
>+             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 base_request =
>+-                request instanceof Request ? (Request) request : HttpConnection.getCurrentConnection().getRequest();
>++                request instanceof Request ? (Request) request : AbstractHttpConnection.getCurrentConnection().getRequest();
>+ 
>+             if ( base_request.isHandled() || !"PUT".equals( base_request.getMethod() ) )
>+             {
>+@@ -1671,7 +1674,7 @@ public void handle( String target, HttpServletRequest request, HttpServletRespon
>+ 
>+         List<HandlerRequestResponse> handlerRequestResponses = new ArrayList<HandlerRequestResponse>();
>+ 
>+-        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" );
>+@@ -1687,7 +1690,7 @@ public void handle( String target, HttpServletRequest request, HttpServletRespon
>+             }
>+             handlerRequestResponses.add(
>+                 new HandlerRequestResponse( request.getMethod(), 200, request.getRequestURI() ) );
>+-            super.handle( target, request, response, dispatch );
>++            super.handle( target, baseRequest, request, response );
>+         }
>+     }
>+ 
>+@@ -1702,7 +1705,7 @@ public TestHeaderHandler()
>+         {
>+         }
>+ 
>+-        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();
>+@@ -1737,31 +1740,29 @@ protected TestSecurityHandler createSecurityHandler()
>+         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;
>+     }
>+ 
>+     public static class TestSecurityHandler
>+-        extends SecurityHandler
>++        extends ConstraintSecurityHandler
>+     {
>+ 
>+         public List<HandlerRequestResponse> handlerRequestResponses = new ArrayList<HandlerRequestResponse>();
>+ 
>+         @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() ) );
>+         }
>+-
>+     }
>+ 
>+     public static class HandlerRequestResponse
>+-- 
>+1.8.1.2
>+
>diff --git a/disable-tck.patch b/disable-tck.patch
>deleted file mode 100644
>index cb90a22..0000000
>--- a/disable-tck.patch
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- pom.xml.sav	2010-11-13 23:20:29.000000000 +0200
>-+++ pom.xml	2010-12-13 19:10:47.319780363 +0200
>-@@ -163,7 +163,7 @@ under the License.
>-     <module>wagon-provider-api</module>
>-     <module>wagon-providers</module>
>-     <module>wagon-provider-test</module>
>--    <module>wagon-tcks</module>
>-+    
>-   </modules>
>- 
>-   <properties>
>diff --git a/maven-wagon-migration-to-component-metadata.patch b/maven-wagon-migration-to-component-metadata.patch
>deleted file mode 100644
>index ea9f4b2..0000000
>--- a/maven-wagon-migration-to-component-metadata.patch
>+++ /dev/null
>@@ -1,28 +0,0 @@
>-diff -Naur wagon-1.0.orig/pom.xml wagon-1.0/pom.xml
>---- wagon-1.0.orig/pom.xml	2011-07-27 12:42:05.000000000 +0200
>-+++ wagon-1.0/pom.xml	2011-07-27 12:59:05.031845442 +0200
>-@@ -226,21 +226,20 @@
>-         </plugin>
>-         <plugin>
>-           <groupId>org.codehaus.plexus</groupId>
>--          <artifactId>plexus-maven-plugin</artifactId>
>-+          <artifactId>plexus-component-metadata</artifactId>
>-           
>--          <version>1.3.5</version>
>-         </plugin>
>-       </plugins>
>-     </pluginManagement>
>-     <plugins>
>-       <plugin>
>-         <groupId>org.codehaus.plexus</groupId>
>--        <artifactId>plexus-maven-plugin</artifactId>
>-+        <artifactId>plexus-component-metadata</artifactId>
>-         <executions>
>-           <execution>
>-             <id>generate</id>
>-             <goals>
>--              <goal>descriptor</goal>
>-+              <goal>generate-metadata</goal>
>-             </goals>
>-           </execution>
>-         </executions>
>diff --git a/maven-wagon.spec b/maven-wagon.spec
>index a31df32..01841b2 100644
>--- a/maven-wagon.spec
>+++ b/maven-wagon.spec
>@@ -31,8 +31,8 @@
> %global bname     wagon
> 
> Name:           maven-%{bname}
>-Version:        1.0
>-Release:        8%{?dist}
>+Version:        2.4
>+Release:        1%{?dist}
> Epoch:          0
> Summary:        Tools to manage artifacts and deployment
> License:        ASL 2.0
>@@ -40,9 +40,7 @@ Group:          Development/Java
> URL:            http://maven.apache.org/wagon
> Source0:        http://repo1.maven.org/maven2/org/apache/maven/wagon/wagon/%{version}/wagon-%{version}-source-release.zip
> 
>-Source1:        wagon-1.0-jpp-depmap.xml
>-Patch1:         disable-tck.patch
>-Patch2:         %{name}-migration-to-component-metadata.patch
>+Patch0:         0001-Port-to-jetty-8.patch
> 
> BuildArch:      noarch
> BuildRequires:  jpackage-utils >= 0:1.7.2
>@@ -59,7 +57,6 @@ BuildRequires:  maven-site-plugin
> BuildRequires:  maven-surefire-plugin
> BuildRequires:  maven-surefire-provider-junit
> BuildRequires:  maven-enforcer-plugin
>-#BuildRequires:  maven2-default-skin
> BuildRequires:  plexus-containers-component-metadata
> BuildRequires:  xerces-j2
> BuildRequires:  classworlds
>@@ -69,7 +66,6 @@ BuildRequires:  apache-commons-collections
> BuildRequires:  apache-commons-net
> BuildRequires:  jakarta-commons-httpclient
> BuildRequires:  apache-commons-logging
>-#BuildRequires:  jakarta-slide-webdavclient
> BuildRequires:  jsch
> BuildRequires:  jtidy
> BuildRequires:  plexus-container-default
>@@ -79,18 +75,16 @@ BuildRequires:  servlet3
> BuildRequires:  xml-commons-apis
> BuildRequires:  easymock
> BuildRequires:  jsoup
>+BuildRequires:  animal-sniffer
>+BuildRequires:  maven-shade-plugin
>+BuildRequires:  log4j
>+BuildRequires:  jetty-server
>+BuildRequires:  jetty-client
>+BuildRequires:  jetty-security
>+BuildRequires:  jetty-util
>+BuildRequires:  jetty-servlet
> 
>-Requires:       jakarta-commons-httpclient
>-Requires:       apache-commons-net
>-#Requires:       jakarta-slide-webdavclient
>-Requires:       jsch
>-Requires:       jtidy
>-Requires:       jsoup
>-Requires:       plexus-interactivity
>-Requires:       plexus-utils
>-Requires:       xml-commons-apis
>-Requires:       nekohtml
>-Requires:       xerces-j2
>+Obsoletes:      maven-wagon-manual < %{epoch}:%{version}-%{release}
> 
> %description
> Maven Wagon is a transport abstraction that is used in Maven's
>@@ -100,180 +94,85 @@ following providers:
> * HTTP
> * FTP
> * SSH/SCP
>-* WebDAV (in progress)
>+* WebDAV
>+* SCM (in progress)
>+
>+%package provider-test
>+Summary:        provider-test module for %{name}
>+
>+%description provider-test
>+provider-test module for %{name}.
>+
>+%package scm
>+Summary:        scm module for %{name}
>+
>+%description scm
>+scm module for %{name}.
> 
> %package javadoc
> Summary:        Javadoc for %{name}
> Group:          Development/Documentation
>-Requires:       jpackage-utils
> 
> %description javadoc
> Javadoc for %{name}.
> 
>-%package manual
>-Summary:        Documents for %{name}
>-Group:          Development/Documentation
>-
>-%description manual
>-Documents for %{name}.
>-
> %prep
> %setup -q -n wagon-%{version}
> 
>-#FIXME: have to drop wagon-webdav-jackrabbit until jackrabbit is available
>-sed -i "s|<module>wagon-webdav-jackrabbit</module>||" wagon-providers/pom.xml
>-sed -i "s|org.mortbay.jetty|org.eclipse.jetty|g" wagon-provider-test/pom.xml
>-sed -i "s|>jetty<|>jetty-server<|g" wagon-provider-test/pom.xml
>+%patch0 -p1
>+
>+%pom_remove_plugin :animal-sniffer-maven-plugin
>+%pom_remove_dep :wagon-tck-http wagon-providers/wagon-http
> 
>-%patch1
>-%patch2 -p1
>+%pom_remove_dep :xercesMinimal wagon-providers/wagon-http-shared
>+%pom_xpath_inject "pom:dependencies" \
>+   "<dependency>
>+      <groupId>xerces</groupId>
>+      <artifactId>xercesImpl</artifactId>
>+    </dependency>" wagon-providers/wagon-http-shared
> 
>-# To wire out jetty, plexus-avalon-personality and plexus-ftpd requirement
>-rm -f wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java
>-rm -f wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonGzipTest.java
>-rm -f wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonGzipTest.java
>-rm -f wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
>+# correct groupId for jetty
>+%pom_xpath_replace "pom:groupId[text()='org.mortbay.jetty']" "<groupId>org.eclipse.jetty</groupId>"
>+
>+# disable tests, missing dependencies
>+%pom_disable_module wagon-tcks
>+%pom_disable_module wagon-ssh-common-test wagon-providers/pom.xml
>+
>+# missing dependencies
>+%pom_disable_module wagon-webdav-jackrabbit wagon-providers
> 
> %build
>-mvn-rpmbuild \
>-        -e \
>-        -Dmaven.local.depmap.file=%{SOURCE1} \
>-        -Dmaven.test.skip=true \
>-        install javadoc:aggregate
>+%mvn_file ":wagon-{*}" %{name}/@1
>+
>+# wagon-provider-test has dependency on jetty
>+%mvn_package ":wagon-provider-test" provider-test
>+# scm module has a lot of dependencies
>+%mvn_package ":wagon-scm" scm
>+
>+# tests are disabled because of missing dependencies
>+%mvn_build -f
> 
> %install
>-# jars
>-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
>-
>-install -m 644 \
>-  wagon-provider-api/target/wagon-provider-api-%{version}.jar \
>-  $RPM_BUILD_ROOT%{_javadir}/%{name}/provider-api.jar
>-%add_to_maven_depmap org.apache.maven.wagon wagon-provider-api %{version} JPP/%{name} provider-api
>-
>-install -m 644 \
>-  wagon-providers/wagon-file/target/wagon-file-%{version}.jar \
>-  $RPM_BUILD_ROOT%{_javadir}/%{name}/file.jar
>-%add_to_maven_depmap org.apache.maven.wagon wagon-file %{version} JPP/%{name} file
>-
>-install -m 644 \
>-  wagon-providers/wagon-ftp/target/wagon-ftp-%{version}.jar \
>-  $RPM_BUILD_ROOT%{_javadir}/%{name}/ftp.jar
>-%add_to_maven_depmap org.apache.maven.wagon wagon-ftp %{version} JPP/%{name} ftp
>-
>-install -m 644 \
>-  wagon-providers/wagon-http/target/wagon-http-%{version}.jar \
>-  $RPM_BUILD_ROOT%{_javadir}/%{name}/http.jar
>-
>-%add_to_maven_depmap org.apache.maven.wagon wagon-http %{version} JPP/%{name} http
>-
>-install -m 644 \
>-  wagon-providers/wagon-http-lightweight/target/wagon-http-lightweight-%{version}.jar \
>-  $RPM_BUILD_ROOT%{_javadir}/%{name}/http-lightweight.jar
>-%add_to_maven_depmap org.apache.maven.wagon wagon-http-lightweight %{version} JPP/%{name} http-lightweight
>-
>-install -m 644 \
>-  wagon-providers/wagon-http-shared/target/wagon-http-shared-%{version}.jar \
>-  $RPM_BUILD_ROOT%{_javadir}/%{name}/http-shared.jar
>-%add_to_maven_depmap org.apache.maven.wagon wagon-http-shared %{version} JPP/%{name} http-shared
>-
>-install -m 644 \
>-  wagon-providers/wagon-scm/target/wagon-scm-%{version}.jar \
>-  $RPM_BUILD_ROOT%{_javadir}/%{name}/scm.jar
>-%add_to_maven_depmap org.apache.maven.wagon wagon-scm %{version} JPP/%{name} scm
>-
>-install -m 644 \
>-  wagon-providers/wagon-ssh/target/wagon-ssh-%{version}.jar \
>-  $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh.jar
>-%add_to_maven_depmap org.apache.maven.wagon wagon-ssh %{version} JPP/%{name} ssh
>-
>-install -m 644 \
>-  wagon-providers/wagon-ssh-common/target/wagon-ssh-common-%{version}.jar \
>-  $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-common.jar
>-%add_to_maven_depmap org.apache.maven.wagon wagon-ssh-common %{version} JPP/%{name} ssh-common
>-
>-install -m 644 \
>-  wagon-providers/wagon-ssh-common-test/target/wagon-ssh-common-test-%{version}.jar \
>-  $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-common-test.jar
>-%add_to_maven_depmap org.apache.maven.wagon wagon-ssh-common-test %{version} JPP/%{name} ssh-common-test
>-
>-install -m 644 \
>-  wagon-providers/wagon-ssh-external/target/wagon-ssh-external-%{version}.jar \
>-  $RPM_BUILD_ROOT%{_javadir}/%{name}/ssh-external.jar
>-%add_to_maven_depmap org.apache.maven.wagon wagon-ssh-external %{version} JPP/%{name} ssh-external
>-
>-#Until webdav is available, map it to an empty dep
>-#install -m 644 \
>-#  wagon-providers/wagon-webdav-jackrabbit/target/wagon-webdav-jackrabbit-%{version}-%{blevel}.jar \
>-#  $RPM_BUILD_ROOT%{_javadir}/%{name}/web-jackrabbit-%{version}.jar
>-#%%add_to_maven_depmap org.apache.maven.wagon wagon-webdav-jackrabbit %{version} JPP/%{name} webdav-jackrabbit
>-
>-#install -m 644 \
>-#  wagon-providers/wagon-webdav/target/wagon-webdav-%{version}-%{blevel}.jar \
>-#  $RPM_BUILD_ROOT%{_javadir}/%{name}/webdav-%{version}.jar
>-#%%add_to_maven_depmap org.apache.maven.wagon wagon-webdav %{version} JPP/%{name} webdav
>-
>-install -m 644 \
>-  wagon-provider-test/target/wagon-provider-test-%{version}.jar \
>-  $RPM_BUILD_ROOT%{_javadir}/%{name}/provider-test.jar
>-%add_to_maven_depmap org.apache.maven.wagon wagon-provider-test %{version} JPP/%{name} provider-test
>-
>-%add_to_maven_depmap org.apache.maven.wagon wagon %{version} JPP/%{name} wagon
>-%add_to_maven_depmap org.apache.maven.wagon wagon-providers %{version} JPP/%{name} providers
>-
>-# poms
>-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
>-install -m 644 pom.xml \
>-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-wagon.pom
>-install -m 644 wagon-provider-api/pom.xml \
>-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-provider-api.pom
>-install -m 644 wagon-provider-test/pom.xml \
>-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-provider-test.pom
>-install -m 644 wagon-providers/pom.xml \
>-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-providers.pom
>-install -m 644 wagon-providers/wagon-file/pom.xml \
>-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-file.pom
>-install -m 644 wagon-providers/wagon-ftp/pom.xml \
>-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-ftp.pom
>-install -m 644 wagon-providers/wagon-http-shared/pom.xml \
>-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-http-shared.pom
>-install -m 644 wagon-providers/wagon-http-lightweight/pom.xml \
>-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-http-lightweight.pom
>-install -m 644 wagon-providers/wagon-http/pom.xml \
>-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-http.pom
>-install -m 644 wagon-providers/wagon-scm/pom.xml \
>-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-scm.pom
>-install -m 644 wagon-providers/wagon-ssh-common/pom.xml \
>-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-ssh-common.pom
>-install -m 644 wagon-providers/wagon-ssh-common-test/pom.xml \
>-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-ssh-common-test.pom
>-install -m 644 wagon-providers/wagon-ssh-external/pom.xml \
>-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-ssh-external.pom
>-install -m 644 wagon-providers/wagon-ssh/pom.xml \
>-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-ssh.pom
>-#install -m 644 wagon-providers/wagon-webdav/pom.xml \
>-#    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-wagon-webdav.pom
>+%mvn_install
> 
> # javadoc
> install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> 
>-# manual
>-install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
>-#install -m 644 wagon-provider-api/LICENSE.txt \
>-#                $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
> 
>-%files
>-%{_javadir}/*
>-%{_mavenpomdir}/*.pom
>-%{_mavendepmapfragdir}/*
>-
>-%files javadoc
>-%doc %{_javadocdir}/%{name}
>-
>-%files manual
>-%doc %{_docdir}/%{name}-%{version}
>+%files -f .mfiles
>+%doc LICENSE NOTICE DEPENDENCIES
>+%files provider-test -f .mfiles-provider-test
>+%files scm -f .mfiles-scm
>+%files javadoc -f .mfiles-javadoc
>+%doc LICENSE NOTICE DEPENDENCIES
> 
> %changelog
>+* Thu Feb 14 2013 Michal Srb <msrb@redhat.com> - 0:2.4-1
>+- Update to latest upstream 2.4
>+- Remove old depmap and patches
>+- Build with xmvn
>+
> * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.0-8
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
> 
>diff --git a/sources b/sources
>index 4fd9d2d..64481b3 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-bb6436c7ef29d357da962d67b5f62cb0  wagon-1.0-source-release.zip
>+ed30bb26b7392cd0bcfc36b48d9f17b7  wagon-2.4-source-release.zip
>diff --git a/wagon-1.0-jpp-depmap.xml b/wagon-1.0-jpp-depmap.xml
>deleted file mode 100644
>index 368327b..0000000
>--- a/wagon-1.0-jpp-depmap.xml
>+++ /dev/null
>@@ -1,229 +0,0 @@
>-<dependencies>
>-  <dependency>
>-	<maven>
>-	  <groupId>org.codehaus.plexus</groupId>
>-	  <artifactId>plexus-ftpd</artifactId>
>-	  <version>1.0-alpha-1</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP/plexus</groupId>
>-	  <artifactId>ftpd</artifactId>
>-	  <version>1.0-alpha-1</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>plexus</groupId>
>-	  <artifactId>plexus-jetty-httpd</artifactId>
>-	  <version>1.0-beta-1</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP/plexus</groupId>
>-	  <artifactId>jetty-httpd</artifactId>
>-	  <version>1.0-beta-2</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>ch.ethz.ganymed</groupId>
>-	  <artifactId>ganymed-ssh2</artifactId>
>-	  <version>build210</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP</groupId>
>-	  <artifactId>ganymed-ssh2</artifactId>
>-	  <version>210</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>commons-httpclient</groupId>
>-	  <artifactId>commons-httpclient</artifactId>
>-	  <version>3.0</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP</groupId>
>-	  <artifactId>commons-httpclient</artifactId>
>-	  <version>3.0.1</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>it.could</groupId>
>-	  <artifactId>webdav</artifactId>
>-	  <version>0.4</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP</groupId>
>-	  <artifactId>it-could-webdav</artifactId>
>-	  <version>0.4</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>avalon</groupId>
>-	  <artifactId>avalon-framework</artifactId>
>-	  <version>4.1.4</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP</groupId>
>-	  <artifactId>avalon-framework</artifactId>
>-	  <version>4.3.1</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>cornerstone-sockets</groupId>
>-	  <artifactId>cornerstone-sockets-api</artifactId>
>-	  <version>1.0</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP/excalibur</groupId>
>-	  <artifactId>cornerstone-sockets-api</artifactId>
>-	  <version>2.2.1</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>cornerstone-threads</groupId>
>-	  <artifactId>cornerstone-threads-api</artifactId>
>-	  <version>1.0</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP/excalibur</groupId>
>-	  <artifactId>cornerstone-threads-api</artifactId>
>-	  <version>2.2.1</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>cornerstone-threads</groupId>
>-	  <artifactId>cornerstone-threads-impl</artifactId>
>-	  <version>1.0</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP/excalibur</groupId>
>-	  <artifactId>cornerstone-threads-impl</artifactId>
>-	  <version>2.2.1</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>excalibur-pool</groupId>
>-	  <artifactId>excalibur-pool-api</artifactId>
>-	  <version>2.0</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP/excalibur</groupId>
>-	  <artifactId>excalibur-pool-api</artifactId>
>-	  <version>2.2.1</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>cornerstone-sockets</groupId>
>-	  <artifactId>cornerstone-sockets-impl</artifactId>
>-	  <version>1.0</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP/excalibur</groupId>
>-	  <artifactId>cornerstone-sockets-impl</artifactId>
>-	  <version>2.2.1</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>excalibur-thread</groupId>
>-	  <artifactId>excalibur-thread-api</artifactId>
>-	  <version>1.1.1</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP/excalibur</groupId>
>-	  <artifactId>excalibur-thread-api</artifactId>
>-	  <version>2.2.1</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>concurrent</groupId>
>-	  <artifactId>concurrent</artifactId>
>-	  <version>1.3.4</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP</groupId>
>-	  <artifactId>concurrent</artifactId>
>-	  <version>1.3.4</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>excalibur-pool</groupId>
>-	  <artifactId>excalibur-pool-impl</artifactId>
>-	  <version>2.0</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP/excalibur</groupId>
>-	  <artifactId>excalibur-pool-impl</artifactId>
>-	  <version>2.2.1</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>excalibur-thread</groupId>
>-	  <artifactId>excalibur-thread-impl</artifactId>
>-	  <version>1.1.1</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP/excalibur</groupId>
>-	  <artifactId>excalibur-thread-impl</artifactId>
>-	  <version>2.2.1</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>cornerstone-connection</groupId>
>-	  <artifactId>cornerstone-connection-api</artifactId>
>-	  <version>1.0</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP/excalibur</groupId>
>-	  <artifactId>cornerstone-connection-api</artifactId>
>-	  <version>2.2.1</version>
>-	</jpp>
>-  </dependency>
>-  <dependency>
>-	<maven>
>-	  <groupId>cornerstone-connection</groupId>
>-	  <artifactId>cornerstone-connection-impl</artifactId>
>-	  <version>1.0</version>
>-	</maven>
>-	<jpp>
>-	  <groupId>JPP/excalibur</groupId>
>-	  <artifactId>cornerstone-connection-impl</artifactId>
>-	  <version>2.2.1</version>
>-	</jpp>
>-  </dependency>
>-
>-  <dependency>
>-    <maven>
>-      <artifactId>plexus-ftpd</artifactId>
>-      <groupId>org.codehaus.plexus</groupId>
>-      <version>1.0-alpha-1</version>
>-    </maven>
>-  </dependency>
>-  <dependency>
>-    <maven>
>-      <artifactId>plexus-jetty-httpd</artifactId>
>-      <groupId>plexus</groupId>
>-      <version>1.0-beta-1</version>
>-    </maven>
>-  </dependency>
>-  <dependency>
>-    <maven>
>-      <groupId>slide</groupId>
>-      <artifactId>slide-webdavlib</artifactId>
>-      <version>2.1</version>
>-    </maven>
>-  </dependency>
>-
>-</dependencies>
>-- 
>1.8.1.2
>

Actions: View | Diff

Attachments on bug 915725: 702806 | 703846 | 703898