diff --git a/0001-Port-to-jetty-9.patch b/0001-Port-to-jetty-9.patch index 5a44979..471e846 100644 --- a/0001-Port-to-jetty-9.patch +++ b/0001-Port-to-jetty-9.patch @@ -1,4 +1,4 @@ -From a98d4de91d767519ed9f4680607d466ba170e45d Mon Sep 17 00:00:00 2001 +From 444769c85163ba1183f007fbbc98b13fd4fb2790 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 @@ -9,7 +9,7 @@ Subject: [PATCH] Port to jetty 9 2 files changed, 78 insertions(+), 49 deletions(-) diff --git a/wagon-provider-test/pom.xml b/wagon-provider-test/pom.xml -index 1bc9826..efa730d 100644 +index f251ed3..e1f612b 100644 --- a/wagon-provider-test/pom.xml +++ b/wagon-provider-test/pom.xml @@ -51,8 +51,34 @@ under the License. @@ -50,7 +50,7 @@ index 1bc9826..efa730d 100644 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..96728d3 100644 +index 4535e9f..8e11f46 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 @@ @@ -296,7 +296,7 @@ index 4ee5475..96728d3 100644 + public void handle( String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response ) throws IOException, ServletException { - headers = new HashMap(); + headers = new HashMap(); @@ -1737,31 +1742,29 @@ protected TestSecurityHandler createSecurityHandler() cm.setPathSpec( "/*" ); @@ -336,5 +336,5 @@ index 4ee5475..96728d3 100644 public static class HandlerRequestResponse -- -1.8.1.2 +1.8.4.2 diff --git a/maven-wagon.spec b/maven-wagon.spec index 52d1e95..c48f442 100644 --- a/maven-wagon.spec +++ b/maven-wagon.spec @@ -1,8 +1,8 @@ %global bname wagon Name: maven-%{bname} -Version: 2.5 -Release: 2%{?dist} +Version: 2.6 +Release: 1%{?dist} Epoch: 0 Summary: Tools to manage artifacts and deployment License: ASL 2.0 @@ -15,31 +15,31 @@ BuildArch: noarch BuildRequires: maven-local BuildRequires: mvn(com.jcraft:jsch) -BuildRequires: mvn(commons-httpclient:commons-httpclient) +BuildRequires: mvn(com.jcraft:jsch.agentproxy.connector-factory) +BuildRequires: mvn(com.jcraft:jsch.agentproxy.jsch) 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(junit:junit) -BuildRequires: mvn(log4j:log4j) -BuildRequires: mvn(nekohtml:nekohtml) BuildRequires: mvn(org.apache.httpcomponents:httpclient) BuildRequires: mvn(org.apache.httpcomponents:httpcore) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) BuildRequires: mvn(org.apache.maven.scm:maven-scm-api) +BuildRequires: mvn(org.apache.maven.scm:maven-scm-provider-cvsexe) +BuildRequires: mvn(org.apache.maven.scm:maven-scm-provider-svnexe) +BuildRequires: mvn(org.apache.maven.scm:maven-scm-test) BuildRequires: mvn(org.apache.maven:maven-parent) +BuildRequires: mvn(org.apache.sshd:sshd-core) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) -BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-interactivity-api) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) -BuildRequires: mvn(org.eclipse.jetty:jetty-client) -BuildRequires: mvn(org.eclipse.jetty:jetty-security) -BuildRequires: mvn(org.eclipse.jetty:jetty-server) -BuildRequires: mvn(org.eclipse.jetty:jetty-servlet) -BuildRequires: mvn(org.eclipse.jetty:jetty-util) +BuildRequires: mvn(org.easymock:easymock) BuildRequires: mvn(org.jsoup:jsoup) BuildRequires: mvn(org.slf4j:slf4j-api) +BuildRequires: mvn(org.slf4j:slf4j-log4j12) +BuildRequires: mvn(org.slf4j:slf4j-simple) Obsoletes: %{name}-manual < %{epoch}:%{version}-%{release} Obsoletes: %{name}-provider-test < %{epoch}:%{version}-%{release} @@ -98,6 +98,7 @@ Javadoc for %{name}. # Maven requires Wagon HTTP with classifier "shaded" %mvn_alias :wagon-http :::shaded: + %install %mvn_install @@ -108,6 +109,9 @@ Javadoc for %{name}. %doc LICENSE NOTICE DEPENDENCIES %changelog +* Mon Jan 6 2014 Mikolaj Izdebski - 0:2.6-1 +- Update to upstream version 2.6 + * Mon Sep 23 2013 Mikolaj Izdebski - 0:2.5-2 - Add shaded alias for wagon-http diff --git a/sources b/sources index c952a21..ae2135d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7275da743893809c96efa8fd5ada860a wagon-2.5-source-release.zip +151fa2e283a87946ffcba8dc092f8493 wagon-2.6-source-release.zip