[pkg-java] r17165 - in tags/wagon: . 1.0.0-4/debian 1.0.0-4/debian/patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Sun Aug 25 22:04:33 UTC 2013
Author: drazzib
Date: 2013-08-25 22:04:32 +0000 (Sun, 25 Aug 2013)
New Revision: 17165
Added:
tags/wagon/1.0.0-4/
tags/wagon/1.0.0-4/debian/changelog
tags/wagon/1.0.0-4/debian/libwagon-java.poms
tags/wagon/1.0.0-4/debian/maven.properties
tags/wagon/1.0.0-4/debian/patches/0003-do-not-run-https-tests.patch
tags/wagon/1.0.0-4/debian/patches/0004-fix-tests-parrallel-run.diff
tags/wagon/1.0.0-4/debian/patches/series
Removed:
tags/wagon/1.0.0-4/debian/changelog
tags/wagon/1.0.0-4/debian/libwagon-java.poms
tags/wagon/1.0.0-4/debian/maven.properties
tags/wagon/1.0.0-4/debian/patches/0003-do-not-run-LightweightHttp-tests.patch
tags/wagon/1.0.0-4/debian/patches/series
Log:
[svn-buildpackage] Tagging wagon 1.0.0-4
Deleted: tags/wagon/1.0.0-4/debian/changelog
===================================================================
--- trunk/wagon/debian/changelog 2013-08-22 20:49:22 UTC (rev 17161)
+++ tags/wagon/1.0.0-4/debian/changelog 2013-08-25 22:04:32 UTC (rev 17165)
@@ -1,117 +0,0 @@
-wagon (1.0.0-3) unstable; urgency=low
-
- * debian/watch: Updated to match only 1.x versions
- * Updated Standards-Version to 3.9.4 (no changes)
- * Use canonical URLs for the Vcs-* fields
-
- -- Emmanuel Bourg <ebourg at apache.org> Tue, 14 May 2013 00:29:48 +0200
-
-wagon (1.0.0-2) unstable; urgency=low
-
- * Team upload.
- * Drop Michael Koch from Uploaders. (Closes: #654138).
- * Add Build-Depends libjaxen-java to build depends to fix FTBFS, otherwise
- buildd was trying to download it. Thanks to Michael Terry for patch!
- (Closes: #649609).
- * Bump Standards-Version to 3.9.2: no changes needed.
- * d/control: Remove duplicate Homepage fields.
-
- -- Damien Raude-Morvan <drazzib at debian.org> Mon, 09 Jan 2012 22:33:51 +0100
-
-wagon (1.0.0-1) unstable; urgency=low
-
- [ Michael Koch ]
- * Added myself to Uploaders.
- * Build-Depends on debhelper (>= 7).
-
- [ Torsten Werner ]
- * New upstream release 1.0. We use 1.0.0 to fake a newer version compared to
- 1.0-beta-*.
- * Add Build-Depends: libjsoup-java and libcommons-io-java.
- * Change debian/watch to allow download of version 1.0.
- * Switch to source format 3.0.
- * Remove Paul from Uploaders list.
- * Update Standards-Version: 3.9.1.
- * Use Maven to build the package. Switch to Build-Depends: default-jdk-doc.
- (Closes: #567294)
- * Add missing Build-Depends: subversion.
-
- -- Torsten Werner <twerner at debian.org> Sat, 03 Sep 2011 11:58:13 +0200
-
-wagon (1.0-beta-6-2) unstable; urgency=low
-
- * Upload to unstable.
-
- -- Torsten Werner <twerner at debian.org> Sun, 09 Aug 2009 23:53:07 +0200
-
-wagon (1.0-beta-6-1) experimental; urgency=low
-
- * New upstream version
- * Bump up Standards-Version to 3.8.2
- * Remove junit and wagon-provider-test dependency from Maven descriptor
- * Move api documentation to /usr/share/doc/libwagon-java/api
-
- -- Ludovic Claude <ludovic.claude at laposte.net> Sat, 25 Jul 2009 18:43:01 +0100
-
-wagon (1.0-beta-5-1) experimental; urgency=low
-
- * New upstream version (Closes: #531444)
- * Add myself to Uploaders
- * Bump up Standards-Version to 3.8.1
- * Add the Maven POM to the package (Closes: #511870)
- * Add a Build-Depends-Indep dependency on maven-repo-helper and
- maven-ant-helper, use quilt to patch one of the POM files.
- * Use mh_installpom and mh_installjar to install the POM and the jar to the
- Maven repository
- * Use mh_mavenrepo to generate the update scripts for the Debian parent POM
- * Update watch, orig-tar.sh and the get-orig-sources in debian/rules to use
- SVN tags
- * Remove the patch as it doesn't apply anymore
- * Update the dependency list: remove libcommons-openpgp-java,
- libcommons-openpgp-java-doc, libganymed-ssh2-java, libjtidy-java,
- libjtidy-java-doc, libslide-webdavclient-java,
- libplexus-classworlds-java, libplexus-component-api-java
- * Add a dependency on libmaven-scm-java, libnekohtml-java
- * Update debian/build.xml to use build.xml from maven-ant-helper,
- making the build more modular.
- * Renamed wagon.docbase to libwagon-java-doc.docbase to fix documentation
-
- -- Ludovic Claude <ludovic.claude at laposte.net> Mon, 06 Jul 2009 23:19:57 +0100
-
-wagon (1.0-beta-2-4) unstable; urgency=low
-
- * Add missing Depends: ${misc:Depends}.
- * Change Section: java.
- * Fix typo: transferring.
- * Switch to default-jdk. (Closes: #526302)
-
- -- Torsten Werner <twerner at debian.org> Wed, 01 Jul 2009 23:27:22 +0200
-
-wagon (1.0-beta-2-3) experimental; urgency=low
-
- [ Michael Koch ]
- * Added watch file.
-
- [ Torsten Werner ]
- * Add missing jars.
- * Update control file.
- * Add myself to Uploaders.
- * Add Vcs-* headers.
- * Bump up Standards-Version: 3.8.0.
- * Do no longer quote the full text of the Apache license.
-
- -- Torsten Werner <twerner at debian.org> Sat, 29 Nov 2008 12:27:19 +0100
-
-wagon (1.0-beta-2-2) unstable; urgency=low
-
- * libwagon-java: Fixed missing package
- org.apache.maven.wagon.providers.ssh.knownhost (Closes: #449188)
- * Added new control field "Homepage"
-
- -- Paul Cager <paul-debian at home.paulcager.org> Sun, 04 Nov 2007 11:03:16 +0000
-
-wagon (1.0-beta-2-1) unstable; urgency=low
-
- * Initial release. (Closes: #413518)
-
- -- Paul Cager <paul-debian at home.paulcager.org> Mon, 30 Apr 2007 11:40:01 +0100
Copied: tags/wagon/1.0.0-4/debian/changelog (from rev 17164, trunk/wagon/debian/changelog)
===================================================================
--- tags/wagon/1.0.0-4/debian/changelog (rev 0)
+++ tags/wagon/1.0.0-4/debian/changelog 2013-08-25 22:04:32 UTC (rev 17165)
@@ -0,0 +1,129 @@
+wagon (1.0.0-4) unstable; urgency=low
+
+ [ Damien Raude-Morvan ]
+ * Team upload.
+ * Fix FTBFS with latest switch to java7 (Closes: #717280):
+ - d/patches/0004-fix-tests-parrallel-run.diff: Provide a different
+ port each running test.
+ - d/patches/0003-do-not-run-https-tests.patch: Skip HTTPS tests
+ for now.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 25 Aug 2013 23:22:18 +0200
+
+wagon (1.0.0-3) unstable; urgency=low
+
+ * debian/watch: Updated to match only 1.x versions
+ * Updated Standards-Version to 3.9.4 (no changes)
+ * Use canonical URLs for the Vcs-* fields
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 14 May 2013 00:29:48 +0200
+
+wagon (1.0.0-2) unstable; urgency=low
+
+ * Team upload.
+ * Drop Michael Koch from Uploaders. (Closes: #654138).
+ * Add Build-Depends libjaxen-java to build depends to fix FTBFS, otherwise
+ buildd was trying to download it. Thanks to Michael Terry for patch!
+ (Closes: #649609).
+ * Bump Standards-Version to 3.9.2: no changes needed.
+ * d/control: Remove duplicate Homepage fields.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Mon, 09 Jan 2012 22:33:51 +0100
+
+wagon (1.0.0-1) unstable; urgency=low
+
+ [ Michael Koch ]
+ * Added myself to Uploaders.
+ * Build-Depends on debhelper (>= 7).
+
+ [ Torsten Werner ]
+ * New upstream release 1.0. We use 1.0.0 to fake a newer version compared to
+ 1.0-beta-*.
+ * Add Build-Depends: libjsoup-java and libcommons-io-java.
+ * Change debian/watch to allow download of version 1.0.
+ * Switch to source format 3.0.
+ * Remove Paul from Uploaders list.
+ * Update Standards-Version: 3.9.1.
+ * Use Maven to build the package. Switch to Build-Depends: default-jdk-doc.
+ (Closes: #567294)
+ * Add missing Build-Depends: subversion.
+
+ -- Torsten Werner <twerner at debian.org> Sat, 03 Sep 2011 11:58:13 +0200
+
+wagon (1.0-beta-6-2) unstable; urgency=low
+
+ * Upload to unstable.
+
+ -- Torsten Werner <twerner at debian.org> Sun, 09 Aug 2009 23:53:07 +0200
+
+wagon (1.0-beta-6-1) experimental; urgency=low
+
+ * New upstream version
+ * Bump up Standards-Version to 3.8.2
+ * Remove junit and wagon-provider-test dependency from Maven descriptor
+ * Move api documentation to /usr/share/doc/libwagon-java/api
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Sat, 25 Jul 2009 18:43:01 +0100
+
+wagon (1.0-beta-5-1) experimental; urgency=low
+
+ * New upstream version (Closes: #531444)
+ * Add myself to Uploaders
+ * Bump up Standards-Version to 3.8.1
+ * Add the Maven POM to the package (Closes: #511870)
+ * Add a Build-Depends-Indep dependency on maven-repo-helper and
+ maven-ant-helper, use quilt to patch one of the POM files.
+ * Use mh_installpom and mh_installjar to install the POM and the jar to the
+ Maven repository
+ * Use mh_mavenrepo to generate the update scripts for the Debian parent POM
+ * Update watch, orig-tar.sh and the get-orig-sources in debian/rules to use
+ SVN tags
+ * Remove the patch as it doesn't apply anymore
+ * Update the dependency list: remove libcommons-openpgp-java,
+ libcommons-openpgp-java-doc, libganymed-ssh2-java, libjtidy-java,
+ libjtidy-java-doc, libslide-webdavclient-java,
+ libplexus-classworlds-java, libplexus-component-api-java
+ * Add a dependency on libmaven-scm-java, libnekohtml-java
+ * Update debian/build.xml to use build.xml from maven-ant-helper,
+ making the build more modular.
+ * Renamed wagon.docbase to libwagon-java-doc.docbase to fix documentation
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Mon, 06 Jul 2009 23:19:57 +0100
+
+wagon (1.0-beta-2-4) unstable; urgency=low
+
+ * Add missing Depends: ${misc:Depends}.
+ * Change Section: java.
+ * Fix typo: transferring.
+ * Switch to default-jdk. (Closes: #526302)
+
+ -- Torsten Werner <twerner at debian.org> Wed, 01 Jul 2009 23:27:22 +0200
+
+wagon (1.0-beta-2-3) experimental; urgency=low
+
+ [ Michael Koch ]
+ * Added watch file.
+
+ [ Torsten Werner ]
+ * Add missing jars.
+ * Update control file.
+ * Add myself to Uploaders.
+ * Add Vcs-* headers.
+ * Bump up Standards-Version: 3.8.0.
+ * Do no longer quote the full text of the Apache license.
+
+ -- Torsten Werner <twerner at debian.org> Sat, 29 Nov 2008 12:27:19 +0100
+
+wagon (1.0-beta-2-2) unstable; urgency=low
+
+ * libwagon-java: Fixed missing package
+ org.apache.maven.wagon.providers.ssh.knownhost (Closes: #449188)
+ * Added new control field "Homepage"
+
+ -- Paul Cager <paul-debian at home.paulcager.org> Sun, 04 Nov 2007 11:03:16 +0000
+
+wagon (1.0-beta-2-1) unstable; urgency=low
+
+ * Initial release. (Closes: #413518)
+
+ -- Paul Cager <paul-debian at home.paulcager.org> Mon, 30 Apr 2007 11:40:01 +0100
Deleted: tags/wagon/1.0.0-4/debian/libwagon-java.poms
===================================================================
--- trunk/wagon/debian/libwagon-java.poms 2013-08-22 20:49:22 UTC (rev 17161)
+++ tags/wagon/1.0.0-4/debian/libwagon-java.poms 2013-08-25 22:04:32 UTC (rev 17165)
@@ -1,41 +0,0 @@
-# List of POM files for the package
-# Format of this file is:
-# <path to pom file> [option]*
-# where option can be:
-# --ignore: ignore this POM or
-# --no-parent: remove the <parent> tag from the POM
-# --package=<package>: an alternative package to use when installing this POM
-# and its artifact
-# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
-# of the version for the package.
-# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
-# during a clean operation with mh_cleanpom or mh_installpom
-# --artifact=<path>: path to the build artifact associated with this POM,
-# it will be installed when using the command mh_install
-# --java-lib: install the jar into /usr/share/java to comply with Debian
-# packaging guidelines
-# --usj-name=<name>: name to use when installing the library in /usr/share/java
-# --usj-version=<version>: version to use when installing the library in /usr/share/java
-# --no-usj-versionless: don't install the versionless link in /usr/share/java
-# --dest-jar=<path>: the destination for the real jar
-# it will be installed with mh_install.
-# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
-# --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created
-# temporarily for certain artifacts such as Javadoc jars.
-#
-pom.xml --no-parent --has-package-version
-wagon-provider-api/pom.xml --has-package-version
-wagon-providers/pom.xml --has-package-version
-wagon-providers/wagon-file/pom.xml --has-package-version
-wagon-providers/wagon-ftp/pom.xml --has-package-version
-wagon-providers/wagon-http-lightweight/pom.xml --has-package-version
-wagon-providers/wagon-http/pom.xml --has-package-version
-wagon-providers/wagon-http-shared/pom.xml --has-package-version
-wagon-providers/wagon-scm/pom.xml --has-package-version
-wagon-providers/wagon-ssh-external/pom.xml --has-package-version
-wagon-providers/wagon-ssh-common/pom.xml --has-package-version
-wagon-providers/wagon-ssh-common-test/pom.xml --has-package-version
-wagon-providers/wagon-ssh/pom.xml --has-package-version
-wagon-provider-test/pom.xml --has-package-version
-wagon-tcks/pom.xml --has-package-version
-wagon-tcks/wagon-tck-http/pom.xml --has-package-version
Copied: tags/wagon/1.0.0-4/debian/libwagon-java.poms (from rev 17164, trunk/wagon/debian/libwagon-java.poms)
===================================================================
--- tags/wagon/1.0.0-4/debian/libwagon-java.poms (rev 0)
+++ tags/wagon/1.0.0-4/debian/libwagon-java.poms 2013-08-25 22:04:32 UTC (rev 17165)
@@ -0,0 +1,41 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+# --ignore: ignore this POM or
+# --no-parent: remove the <parent> tag from the POM
+# --package=<package>: an alternative package to use when installing this POM
+# and its artifact
+# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+# of the version for the package.
+# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: path to the build artifact associated with this POM,
+# it will be installed when using the command mh_install
+# --java-lib: install the jar into /usr/share/java to comply with Debian
+# packaging guidelines
+# --usj-name=<name>: name to use when installing the library in /usr/share/java
+# --usj-version=<version>: version to use when installing the library in /usr/share/java
+# --no-usj-versionless: don't install the versionless link in /usr/share/java
+# --dest-jar=<path>: the destination for the real jar
+# it will be installed with mh_install.
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created
+# temporarily for certain artifacts such as Javadoc jars.
+#
+pom.xml --no-parent --has-package-version
+wagon-provider-api/pom.xml --has-package-version --java-lib
+wagon-providers/pom.xml --has-package-version --java-lib
+wagon-providers/wagon-file/pom.xml --has-package-version --java-lib
+wagon-providers/wagon-ftp/pom.xml --has-package-version --java-lib
+wagon-providers/wagon-http-lightweight/pom.xml --has-package-version --java-lib
+wagon-providers/wagon-http/pom.xml --has-package-version --java-lib
+wagon-providers/wagon-http-shared/pom.xml --has-package-version --java-lib
+wagon-providers/wagon-scm/pom.xml --has-package-version --java-lib
+wagon-providers/wagon-ssh-external/pom.xml --has-package-version --java-lib
+wagon-providers/wagon-ssh-common/pom.xml --has-package-version --java-lib
+wagon-providers/wagon-ssh-common-test/pom.xml --has-package-version --java-lib
+wagon-providers/wagon-ssh/pom.xml --has-package-version --java-lib
+wagon-provider-test/pom.xml --has-package-version --java-lib
+wagon-tcks/pom.xml --has-package-version --java-lib
+wagon-tcks/wagon-tck-http/pom.xml --has-package-version --java-lib
Deleted: tags/wagon/1.0.0-4/debian/maven.properties
===================================================================
--- trunk/wagon/debian/maven.properties 2013-08-22 20:49:22 UTC (rev 17161)
+++ tags/wagon/1.0.0-4/debian/maven.properties 2013-08-25 22:04:32 UTC (rev 17165)
@@ -1,4 +0,0 @@
-# Include here properties to pass to Maven during the build.
-# For example:
-# maven.test.skip=true
-
Copied: tags/wagon/1.0.0-4/debian/maven.properties (from rev 17164, trunk/wagon/debian/maven.properties)
===================================================================
--- tags/wagon/1.0.0-4/debian/maven.properties (rev 0)
+++ tags/wagon/1.0.0-4/debian/maven.properties 2013-08-25 22:04:32 UTC (rev 17165)
@@ -0,0 +1,2 @@
+# maven.test.skip=true
+
Deleted: tags/wagon/1.0.0-4/debian/patches/0003-do-not-run-LightweightHttp-tests.patch
===================================================================
--- trunk/wagon/debian/patches/0003-do-not-run-LightweightHttp-tests.patch 2013-08-22 20:49:22 UTC (rev 17161)
+++ tags/wagon/1.0.0-4/debian/patches/0003-do-not-run-LightweightHttp-tests.patch 2013-08-25 22:04:32 UTC (rev 17165)
@@ -1,32 +0,0 @@
-From: Torsten Werner <twerner at debian.org>
-Date: Mon, 29 Aug 2011 21:39:30 +0200
-Subject: [PATCH] do not run LightweightHttp* tests
-
----
- wagon-providers/wagon-http-lightweight/pom.xml | 14 ++++++++++++++
- 1 files changed, 14 insertions(+), 0 deletions(-)
-
-diff --git a/wagon-providers/wagon-http-lightweight/pom.xml b/wagon-providers/wagon-http-lightweight/pom.xml
-index 70ea885..d413f31 100644
---- a/wagon-providers/wagon-http-lightweight/pom.xml
-+++ b/wagon-providers/wagon-http-lightweight/pom.xml
-@@ -50,4 +50,18 @@ under the License.
- </exclusions>
- </dependency>
- </dependencies>
-+
-+ <build>
-+ <plugins>
-+ <plugin>
-+ <groupId>org.apache.maven.plugins</groupId>
-+ <artifactId>maven-surefire-plugin</artifactId>
-+ <configuration>
-+ <excludes>
-+ <exclude>**/LightweightHttp*</exclude>
-+ </excludes>
-+ </configuration>
-+ </plugin>
-+ </plugins>
-+ </build>
- </project>
---
Copied: tags/wagon/1.0.0-4/debian/patches/0003-do-not-run-https-tests.patch (from rev 17164, trunk/wagon/debian/patches/0003-do-not-run-https-tests.patch)
===================================================================
--- tags/wagon/1.0.0-4/debian/patches/0003-do-not-run-https-tests.patch (rev 0)
+++ tags/wagon/1.0.0-4/debian/patches/0003-do-not-run-https-tests.patch 2013-08-25 22:04:32 UTC (rev 17165)
@@ -0,0 +1,50 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Mon, 29 Aug 2011 21:39:30 +0200
+Subject: [PATCH] do not run LightweightHttp* tests
+
+---
+ wagon-providers/wagon-http-lightweight/pom.xml | 14 ++++++++++++++
+ 1 files changed, 14 insertions(+), 0 deletions(-)
+
+--- a/wagon-providers/wagon-http-lightweight/pom.xml
++++ b/wagon-providers/wagon-http-lightweight/pom.xml
+@@ -50,4 +50,18 @@
+ </exclusions>
+ </dependency>
+ </dependencies>
++
++ <build>
++ <plugins>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-surefire-plugin</artifactId>
++ <configuration>
++ <excludes>
++ <exclude>**/LightweightHttps*</exclude>
++ </excludes>
++ </configuration>
++ </plugin>
++ </plugins>
++ </build>
+ </project>
+--- a/wagon-providers/wagon-http/pom.xml
++++ b/wagon-providers/wagon-http/pom.xml
+@@ -84,4 +84,18 @@
+ </plugins>
+ </build>
+ -->
++
++ <build>
++ <plugins>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-surefire-plugin</artifactId>
++ <configuration>
++ <excludes>
++ <exclude>**/Https*</exclude>
++ </excludes>
++ </configuration>
++ </plugin>
++ </plugins>
++ </build>
+ </project>
Copied: tags/wagon/1.0.0-4/debian/patches/0004-fix-tests-parrallel-run.diff (from rev 17164, trunk/wagon/debian/patches/0004-fix-tests-parrallel-run.diff)
===================================================================
--- tags/wagon/1.0.0-4/debian/patches/0004-fix-tests-parrallel-run.diff (rev 0)
+++ tags/wagon/1.0.0-4/debian/patches/0004-fix-tests-parrallel-run.diff 2013-08-25 22:04:32 UTC (rev 17165)
@@ -0,0 +1,399 @@
+Description: Tests fail with 'Address already in use' when building Wagon in parallel mode
+ WAGON-335 use different ports for the test server fixtures for each wagon module
+ .
+ This prevents us from getting 'Address already in use' Exceptions when building
+ wagon in parallel mode
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2013-08-25
+Bug: http://jira.codehaus.org/browse/WAGON-335
+Bug-Debian: http://bugs.debian.org/717280
+--- a/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
++++ b/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
+@@ -132,6 +132,13 @@
+ */
+ protected abstract String getProtocol();
+
++ /**
++ * The number of the port which should get used to start the test server
++ *
++ * @return the port number for the test server
++ */
++ protected abstract int getTestRepositoryPort();
++
+ // ----------------------------------------------------------------------
+ // 1. Create a local file repository which mimic a users local file
+ // Repository.
+--- 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
+@@ -88,7 +88,7 @@
+ FileUtils.deleteDirectory( repositoryDirectory );
+ repositoryDirectory.mkdirs();
+
+- server = new Server( 10007 );
++ server = new Server( getTestRepositoryPort() );
+
+ PutHandler putHandler = new PutHandler( repositoryDirectory );
+ server.addHandler( putHandler );
+@@ -318,7 +318,7 @@
+ public void testGzipGet()
+ throws Exception
+ {
+- Server server = new Server( 10008 );
++ Server server = new Server( getTestRepositoryPort() );
+
+ String localRepositoryPath = FileTestUtils.getTestOutputDir().toString();
+ Context root = new Context( server, "/", Context.SESSIONS );
+@@ -388,12 +388,12 @@
+ throws Exception, IOException, ConnectionException, AuthenticationException, ResourceDoesNotExistException,
+ TransferFailedException, AuthorizationException
+ {
+- Server proxyServer = new Server( 10007 );
++ Server proxyServer = new Server( getTestRepositoryPort() );
+
+ proxyServer.setHandler( handler );
+ proxyServer.start();
+
+- proxyInfo.setPort( 10007 );
++ proxyInfo.setPort( getTestRepositoryPort() );
+
+ try
+ {
+--- a/wagon-providers/wagon-file/src/test/java/org/apache/maven/wagon/providers/file/FileWagonTest.java
++++ b/wagon-providers/wagon-file/src/test/java/org/apache/maven/wagon/providers/file/FileWagonTest.java
+@@ -49,6 +49,11 @@
+
+ return "file://" + file.getPath();
+ }
++
++ protected int getTestRepositoryPort() {
++ // file transfer dont needs a port
++ return 0;
++ }
+
+ /**
+ * This test is introduced to allow for null file wagons.
+--- a/wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java
++++ b/wagon-providers/wagon-ftp/src/test/java/org/apache/maven/wagon/providers/ftp/FtpWagonTest.java
+@@ -45,6 +45,10 @@
+ return "ftp";
+ }
+
++ protected int getTestRepositoryPort() {
++ return 10023;
++ }
++
+ protected void setupWagonTestingFixtures()
+ throws Exception
+ {
+@@ -67,7 +71,7 @@
+
+ protected String getTestRepositoryUrl()
+ {
+- return "ftp://localhost:10023";
++ return "ftp://localhost:" + getTestRepositoryPort();
+ }
+
+ public AuthenticationInfo getAuthInfo()
+--- a/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonTest.java
++++ b/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonTest.java
+@@ -41,7 +41,11 @@
+
+ protected String getTestRepositoryUrl()
+ {
+- return getProtocol() + "://localhost:10007/";
++ return getProtocol() + "://localhost:" + getTestRepositoryPort() + "/";
++ }
++
++ protected int getTestRepositoryPort() {
++ return 10017;
+ }
+
+ protected void setHttpHeaders( StreamingWagon wagon, Properties properties )
+--- a/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpsWagonTest.java
++++ b/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpsWagonTest.java
+@@ -34,13 +34,17 @@
+ return "https";
+ }
+
++ protected int getTestRepositoryPort() {
++ return super.getTestRepositoryPort() + 443;
++ }
++
+ protected void addConnectors( Server server )
+ {
+ System.setProperty( "javax.net.ssl.trustStore",
+ getTestFile( "src/test/resources/ssl/keystore" ).getAbsolutePath() );
+
+ SslSocketConnector connector = new SslSocketConnector();
+- connector.setPort( server.getConnectors()[0].getPort() );
++ connector.setPort( getTestRepositoryPort() );
+ connector.setKeystore( getTestPath( "src/test/resources/ssl/keystore" ) );
+ connector.setPassword( "wagonhttp" );
+ connector.setKeyPassword( "wagonhttp" );
+--- a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTest.java
++++ b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTest.java
+@@ -38,7 +38,11 @@
+
+ protected String getTestRepositoryUrl()
+ {
+- return getProtocol() + "://localhost:10007";
++ return getProtocol() + "://localhost:" + getTestRepositoryPort();
++ }
++
++ protected int getTestRepositoryPort() {
++ return 10009;
+ }
+
+ protected void setHttpHeaders( StreamingWagon wagon, Properties properties )
+--- a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpsWagonTest.java
++++ b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpsWagonTest.java
+@@ -31,13 +31,17 @@
+ return "https";
+ }
+
++ protected int getTestRepositoryPort() {
++ return super.getTestRepositoryPort() + 443;
++ }
++
+ protected void addConnectors( Server server )
+ {
+ System.setProperty( "javax.net.ssl.trustStore",
+ getTestFile( "src/test/resources/ssl/keystore" ).getAbsolutePath() );
+
+ SslSocketConnector connector = new SslSocketConnector();
+- connector.setPort( server.getConnectors()[0].getPort() );
++ connector.setPort( getTestRepositoryPort() );
+ connector.setKeystore( getTestPath( "src/test/resources/ssl/keystore" ) );
+ connector.setPassword( "wagonhttp" );
+ connector.setKeyPassword( "wagonhttp" );
+--- a/wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/providers/scm/AbstractScmWagonTest.java
++++ b/wagon-providers/wagon-scm/src/test/java/org/apache/maven/wagon/providers/scm/AbstractScmWagonTest.java
+@@ -78,6 +78,10 @@
+ }
+ }
+
++ protected int getTestRepositoryPort() {
++ return 0; // not used
++ }
++
+ /**
+ * Allows overriding the {@link ScmProvider} injected by default in the {@link ScmWagon}.
+ * Useful to force the implementation to use for a particular SCM type.
+--- a/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagonTest.java
++++ b/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagonTest.java
+@@ -55,6 +55,10 @@
+ return "scpexe";
+ }
+
++ protected int getTestRepositoryPort() {
++ return 0; // not used
++ }
++
+ public String getTestRepositoryUrl()
+ {
+ return TestData.getTestRepositoryUrl();
+--- a/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpWagonWithSshPrivateKeySearchTest.java
++++ b/wagon-providers/wagon-ssh-external/src/test/java/org/apache/maven/wagon/providers/ssh/external/ScpWagonWithSshPrivateKeySearchTest.java
+@@ -53,6 +53,10 @@
+ return "scpexe";
+ }
+
++ protected int getTestRepositoryPort() {
++ return 0; // not used
++ }
++
+ public String getTestRepositoryUrl()
+ {
+ return TestData.getTestRepositoryUrl();
+--- a/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagonTest.java
++++ b/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagonTest.java
+@@ -39,6 +39,10 @@
+ return "scp";
+ }
+
++ protected int getTestRepositoryPort() {
++ return 0; // not used
++ }
++
+ public String getTestRepositoryUrl()
+ {
+ return TestData.getTestRepositoryUrl();
+--- a/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagonWithSshPrivateKeySearchTest.java
++++ b/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagonWithSshPrivateKeySearchTest.java
+@@ -42,6 +42,10 @@
+ return "scp";
+ }
+
++ protected int getTestRepositoryPort() {
++ return 0; // not used
++ }
++
+ public String getTestRepositoryUrl()
+ {
+ return TestData.getTestRepositoryUrl();
+--- a/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagonTest.java
++++ b/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagonTest.java
+@@ -39,6 +39,10 @@
+ return "sftp";
+ }
+
++ protected int getTestRepositoryPort() {
++ return 0; // not used
++ }
++
+ public String getTestRepositoryUrl()
+ {
+ return TestData.getTestRepositoryUrl();
+--- a/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/WebDavWagonTest.java
++++ b/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/WebDavWagonTest.java
+@@ -45,7 +45,7 @@
+ protected String getTestRepositoryUrl()
+ throws IOException
+ {
+- return getProtocol() + "://localhost:10007/newfolder/folder2";
++ return getProtocol() + "://localhost:" + getTestRepositoryPort() + "/newfolder/folder2";
+ }
+
+ protected String getProtocol()
+@@ -87,7 +87,7 @@
+ */
+ public void testGetURLDavHttp()
+ {
+- assertURL( "dav:http://localhost:10007/dav/", "http://localhost:10007/dav/" );
++ assertURL( "dav:http://localhost:" + getTestRepositoryPort() + "/dav/", "http://localhost:" + getTestRepositoryPort() + "/dav/" );
+ }
+
+ /**
+@@ -95,7 +95,7 @@
+ */
+ public void testGetURLDavHttps()
+ {
+- assertURL( "dav:https://localhost:10007/dav/", "https://localhost:10007/dav/" );
++ assertURL( "dav:https://localhost:" + getTestRepositoryPort() + "/dav/", "https://localhost:" + getTestRepositoryPort() + "/dav/" );
+ }
+
+ /**
+@@ -103,7 +103,7 @@
+ */
+ public void testGetURLDavUri()
+ {
+- assertURL( "dav://localhost:10007/dav/", "http://localhost:10007/dav/" );
++ assertURL( "dav://localhost:" + getTestRepositoryPort() + "/dav/", "http://localhost:" + getTestRepositoryPort() +"/dav/" );
+ }
+
+ /**
+@@ -111,7 +111,7 @@
+ */
+ public void testGetURLDavUriWithSsl()
+ {
+- assertURL( "davs://localhost:10007/dav/", "https://localhost:10007/dav/" );
++ assertURL( "davs://localhost:" + getTestRepositoryPort() +"/dav/", "https://localhost:" + getTestRepositoryPort() +"/dav/" );
+ }
+
+ /**
+@@ -119,7 +119,7 @@
+ */
+ public void testGetURLDavPlusHttp()
+ {
+- assertURL( "dav+https://localhost:10007/dav/", "https://localhost:10007/dav/" );
++ assertURL( "dav+https://localhost:" + getTestRepositoryPort() + "/dav/", "https://localhost:" + getTestRepositoryPort() + "/dav/" );
+ }
+
+ /**
+@@ -127,7 +127,7 @@
+ */
+ public void testGetURLDavPlusHttps()
+ {
+- assertURL( "dav+https://localhost:10007/dav/", "https://localhost:10007/dav/" );
++ assertURL( "dav+https://localhost:" + getTestRepositoryPort() + "/dav/", "https://localhost:" + getTestRepositoryPort() + "/dav/" );
+ }
+
+ public void testMkdirs() throws Exception
+--- a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpWagonTests.java
++++ b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpWagonTests.java
+@@ -48,6 +48,8 @@
+
+ private ServerFixture serverFixture;
+
++ private static int defaultPort = 9080;
++
+ private static PlexusContainer container;
+
+ private Wagon wagon;
+@@ -282,7 +284,12 @@
+
+ protected int getDefaultPort()
+ {
+- return 9080;
++ return defaultPort;
++ }
++
++ public static void setDefaultPort( int defaultPort )
++ {
++ HttpWagonTests.defaultPort = defaultPort;
+ }
+
+ protected int getPortPropertyValue()
+--- a/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpsGetWagonTests.java
++++ b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpsGetWagonTests.java
+@@ -32,7 +32,7 @@
+ @Override
+ protected int getDefaultPort()
+ {
+- return 9443;
++ return super.getDefaultPort() + 443;
+ }
+
+ }
+--- /dev/null
++++ b/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/TckTest.java
+@@ -0,0 +1,49 @@
++package org.apache.maven.wagon.tck.http;
++
++/*
++ * Licensed to the Apache Software Foundation (ASF) under one
++ * or more contributor license agreements. See the NOTICE file
++ * distributed with this work for additional information
++ * regarding copyright ownership. The ASF licenses this file
++ * to you under the Apache License, Version 2.0 (the
++ * "License"); you may not use this file except in compliance
++ * with the License. You may obtain a copy of the License at
++ *
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing,
++ * software distributed under the License is distributed on an
++ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
++ * KIND, either express or implied. See the License for the
++ * specific language governing permissions and limitations
++ * under the License.
++ */
++
++import org.junit.BeforeClass;
++import org.junit.runner.RunWith;
++import org.junit.runners.Suite;
++
++/**
++ * This test will run the TCK suite on wagon-http-lightweight
++ */
++ at RunWith( Suite.class )
++ at Suite.SuiteClasses( { GetWagonTests.class, HttpsGetWagonTests.class } )
++public class TckTest
++{
++
++ @BeforeClass
++ public static void beforeAll() throws Exception
++ {
++ HttpWagonTests.setDefaultPort(9083);
++ }
++
++ //public static Test suite()
++ //{
++ // HttpWagonTests.setDefaultPort(9083);
++ //
++ // TestSuite mySuite = new TestSuite("org.apache.maven.wagon.tck.http");
++ // mySuite.addTest(GetWagonTests.class);
++ // mySuite.addTest(HttpsGetWagonTests.class);
++ // return mySuite;
++ //}
++}
Deleted: tags/wagon/1.0.0-4/debian/patches/series
===================================================================
--- trunk/wagon/debian/patches/series 2013-08-22 20:49:22 UTC (rev 17161)
+++ tags/wagon/1.0.0-4/debian/patches/series 2013-08-25 22:04:32 UTC (rev 17165)
@@ -1,3 +0,0 @@
-0001-do-not-build-FtpWagonTest.java.patch
-0002-disable-webdav-jackrabbit-module.patch
-0003-do-not-run-LightweightHttp-tests.patch
Copied: tags/wagon/1.0.0-4/debian/patches/series (from rev 17164, trunk/wagon/debian/patches/series)
===================================================================
--- tags/wagon/1.0.0-4/debian/patches/series (rev 0)
+++ tags/wagon/1.0.0-4/debian/patches/series 2013-08-25 22:04:32 UTC (rev 17165)
@@ -0,0 +1,4 @@
+0001-do-not-build-FtpWagonTest.java.patch
+0002-disable-webdav-jackrabbit-module.patch
+0003-do-not-run-https-tests.patch
+0004-fix-tests-parrallel-run.diff
More information about the pkg-java-commits
mailing list