[pkg-java] r17896 - in tags/wagon: . 1.0.0-5/debian 1.0.0-5/debian/patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Mar 14 17:36:04 UTC 2014
Author: ebourg-guest
Date: 2014-03-14 17:36:04 +0000 (Fri, 14 Mar 2014)
New Revision: 17896
Added:
tags/wagon/1.0.0-5/
tags/wagon/1.0.0-5/debian/changelog
tags/wagon/1.0.0-5/debian/control
tags/wagon/1.0.0-5/debian/libwagon-java.poms
tags/wagon/1.0.0-5/debian/maven.properties
tags/wagon/1.0.0-5/debian/patches/0005-easymock-compatibility.patch
tags/wagon/1.0.0-5/debian/patches/series
Removed:
tags/wagon/1.0.0-5/debian/changelog
tags/wagon/1.0.0-5/debian/control
tags/wagon/1.0.0-5/debian/libwagon-java.poms
tags/wagon/1.0.0-5/debian/maven.properties
tags/wagon/1.0.0-5/debian/patches/series
Modified:
tags/wagon/1.0.0-5/debian/maven.cleanIgnoreRules
tags/wagon/1.0.0-5/debian/maven.ignoreRules
tags/wagon/1.0.0-5/debian/maven.publishedRules
tags/wagon/1.0.0-5/debian/maven.rules
Log:
[svn-buildpackage] Tagging wagon 1.0.0-5
Deleted: tags/wagon/1.0.0-5/debian/changelog
===================================================================
--- trunk/wagon/debian/changelog 2014-03-13 09:21:14 UTC (rev 17889)
+++ tags/wagon/1.0.0-5/debian/changelog 2014-03-14 17:36:04 UTC (rev 17896)
@@ -1,139 +0,0 @@
-wagon (1.0.0-5) UNRELEASED; urgency=medium
-
- * Switch to debhelper level 9
- * debian/control:
- - Standards-Version updated to 3.9.5 (no changes)
- - Don't mention the disabled WebDAV support in the package description
- (Closes: #644926)
-
- -- Emmanuel Bourg <ebourg at apache.org> Wed, 15 Jan 2014 22:13:26 +0100
-
-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
Copied: tags/wagon/1.0.0-5/debian/changelog (from rev 17892, trunk/wagon/debian/changelog)
===================================================================
--- tags/wagon/1.0.0-5/debian/changelog (rev 0)
+++ tags/wagon/1.0.0-5/debian/changelog 2014-03-14 17:36:04 UTC (rev 17896)
@@ -0,0 +1,142 @@
+wagon (1.0.0-5) unstable; urgency=medium
+
+ * Added a patch to ensure the compatibility with Easymock 3.x
+ (Closes: #718872)
+ * Disabled the unit tests (LightweightHttpWagonTest hangs randomly)
+ * Switch to debhelper level 9
+ * debian/control:
+ - Standards-Version updated to 3.9.5 (no changes)
+ - Don't mention the disabled WebDAV support in the package description
+ (Closes: #644926)
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 13 Mar 2014 16:47:25 +0100
+
+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-5/debian/control
===================================================================
--- trunk/wagon/debian/control 2014-03-13 09:21:14 UTC (rev 17889)
+++ tags/wagon/1.0.0-5/debian/control 2014-03-14 17:36:04 UTC (rev 17896)
@@ -1,102 +0,0 @@
-Source: wagon
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>,
- Ludovic Claude <ludovic.claude at laposte.net>,
- Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.4)
-Build-Depends-Indep: default-jdk-doc,
- junit (>= 3.8.1),
- libcommons-codec-java,
- libcommons-codec-java-doc,
- libcommons-httpclient-java,
- libcommons-io-java,
- libcommons-logging-java,
- libcommons-logging-java-doc,
- libcommons-net2-java,
- libcommons-net2-java-doc,
- libeasymock-java,
- libjaxen-java,
- libjetty-java,
- libjetty-java-doc,
- libjsch-java,
- libjsoup-java,
- libmaven-enforcer-plugin-java,
- libmaven-javadoc-plugin-java,
- libmaven-scm-java,
- libmaven-scm-java-doc,
- libplexus-container-default-java,
- libplexus-container-default-java-doc,
- libplexus-containers-java,
- libplexus-containers-java-doc,
- libplexus-interactivity-api-java,
- libplexus-interactivity-api-java-doc,
- libplexus-maven-plugin-java,
- libplexus-utils-java,
- libplexus-utils-java-doc,
- subversion
-Standards-Version: 3.9.5
-Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/wagon
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/wagon/
-Homepage: http://maven.apache.org/wagon/
-
-Package: libwagon-java
-Architecture: all
-Depends: ${maven:Depends}, ${misc:Depends}
-Recommends: ${maven:OptionalDepends}
-Suggests: libwagon-java-doc
-Description: tools to manage Maven artifacts and deployment
- The Wagon project defines a simple API for transferring resources
- (artifacts) to and from repositories. The word repository is used in this
- context as it is commonly used in Maven and means a storage of artifacts.
- .
- It is also used to deploy the Maven generated site to a server.
- .
- This package contains the following Jars:
- .
- wagon-file
- Implementation of Wagon provider for File system access.
- wagon-ftp
- Implementation of Wagon provider for FTP access.
- wagon-http
- Implementation of Wagon provider for HTTP access.
- wagon-http-lightweight
- Implementation of Wagon provider for HTTP access. It uses standard
- JDK classes as lower lever layer.
- It enables Maven to use remote repositories stored in HTTP servers.
- It doesn't allow deployment.
- wagon-http-shared
- This package is a shared Library for the wagon-http, and
- wagon-http-lightweight wagon providers
- wagon-scm
- Implementation of Wagon provider for Source Control access.
- Gets and puts artifacts using a Source Control Management system.
- wagon-ssh
- Implementation of Wagon provider for SCP and SFTP access.
- It enables Maven to deploy artifacts and sites to SSH servers. It
- uses JSch (Java Secure Channel) as lower level layer.
- wagon-ssh-common
- Implementation of Wagon provider for SCP and SFTP access. It
- enables Maven to deploy artifacts and sites to SSH servers.
- Getting files from SSH servers is not fully tested.
- wagon-ssh-external
- Implementation of Wagon provider for SSH servers access. It
- enables Maven to deploy artifacts and sites to SSH servers.
- It uses an external SSH program that has to be already installed
- in the system. Getting files from SSH servers is not fully tested.
-
-Package: libwagon-java-doc
-Architecture: all
-Section: doc
-Depends: ${maven:DocDepends}, ${misc:Depends}
-Recommends: ${maven:DocOptionalDepends}
-Suggests: libwagon-java
-Description: tools to manage Maven artifacts and deployment - documentation
- The Wagon project defines a simple API for transferring resources
- (artifacts) to and from repositories. The word repository is used in this
- context as it is commonly used in Maven and means a storage of artifacts.
- .
- It is also used to deploy the Maven generated site to a server.
- .
- This package contains the JavaDocs for libwagon-java.
Copied: tags/wagon/1.0.0-5/debian/control (from rev 17893, trunk/wagon/debian/control)
===================================================================
--- tags/wagon/1.0.0-5/debian/control (rev 0)
+++ tags/wagon/1.0.0-5/debian/control 2014-03-14 17:36:04 UTC (rev 17896)
@@ -0,0 +1,102 @@
+Source: wagon
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Torsten Werner <twerner at debian.org>,
+ Ludovic Claude <ludovic.claude at laposte.net>,
+ Emmanuel Bourg <ebourg at apache.org>
+Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends-Indep: default-jdk-doc,
+ junit (>= 3.8.1),
+ libcommons-codec-java,
+ libcommons-codec-java-doc,
+ libcommons-httpclient-java,
+ libcommons-io-java,
+ libcommons-logging-java,
+ libcommons-logging-java-doc,
+ libcommons-net2-java,
+ libcommons-net2-java-doc,
+ libeasymock-java (>= 3.2),
+ libjaxen-java,
+ libjetty-java,
+ libjetty-java-doc,
+ libjsch-java,
+ libjsoup-java,
+ libmaven-enforcer-plugin-java,
+ libmaven-javadoc-plugin-java,
+ libmaven-scm-java,
+ libmaven-scm-java-doc,
+ libplexus-container-default-java,
+ libplexus-container-default-java-doc,
+ libplexus-containers-java,
+ libplexus-containers-java-doc,
+ libplexus-interactivity-api-java,
+ libplexus-interactivity-api-java-doc,
+ libplexus-maven-plugin-java,
+ libplexus-utils-java,
+ libplexus-utils-java-doc,
+ subversion
+Standards-Version: 3.9.5
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/wagon
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/wagon/
+Homepage: http://maven.apache.org/wagon/
+
+Package: libwagon-java
+Architecture: all
+Depends: ${maven:Depends}, ${misc:Depends}
+Recommends: ${maven:OptionalDepends}
+Suggests: libwagon-java-doc
+Description: tools to manage Maven artifacts and deployment
+ The Wagon project defines a simple API for transferring resources
+ (artifacts) to and from repositories. The word repository is used in this
+ context as it is commonly used in Maven and means a storage of artifacts.
+ .
+ It is also used to deploy the Maven generated site to a server.
+ .
+ This package contains the following Jars:
+ .
+ wagon-file
+ Implementation of Wagon provider for File system access.
+ wagon-ftp
+ Implementation of Wagon provider for FTP access.
+ wagon-http
+ Implementation of Wagon provider for HTTP access.
+ wagon-http-lightweight
+ Implementation of Wagon provider for HTTP access. It uses standard
+ JDK classes as lower lever layer.
+ It enables Maven to use remote repositories stored in HTTP servers.
+ It doesn't allow deployment.
+ wagon-http-shared
+ This package is a shared Library for the wagon-http, and
+ wagon-http-lightweight wagon providers
+ wagon-scm
+ Implementation of Wagon provider for Source Control access.
+ Gets and puts artifacts using a Source Control Management system.
+ wagon-ssh
+ Implementation of Wagon provider for SCP and SFTP access.
+ It enables Maven to deploy artifacts and sites to SSH servers. It
+ uses JSch (Java Secure Channel) as lower level layer.
+ wagon-ssh-common
+ Implementation of Wagon provider for SCP and SFTP access. It
+ enables Maven to deploy artifacts and sites to SSH servers.
+ Getting files from SSH servers is not fully tested.
+ wagon-ssh-external
+ Implementation of Wagon provider for SSH servers access. It
+ enables Maven to deploy artifacts and sites to SSH servers.
+ It uses an external SSH program that has to be already installed
+ in the system. Getting files from SSH servers is not fully tested.
+
+Package: libwagon-java-doc
+Architecture: all
+Section: doc
+Depends: ${maven:DocDepends}, ${misc:Depends}
+Recommends: ${maven:DocOptionalDepends}
+Suggests: libwagon-java
+Description: tools to manage Maven artifacts and deployment - documentation
+ The Wagon project defines a simple API for transferring resources
+ (artifacts) to and from repositories. The word repository is used in this
+ context as it is commonly used in Maven and means a storage of artifacts.
+ .
+ It is also used to deploy the Maven generated site to a server.
+ .
+ This package contains the JavaDocs for libwagon-java.
Deleted: tags/wagon/1.0.0-5/debian/libwagon-java.poms
===================================================================
--- trunk/wagon/debian/libwagon-java.poms 2014-03-13 09:21:14 UTC (rev 17889)
+++ tags/wagon/1.0.0-5/debian/libwagon-java.poms 2014-03-14 17:36:04 UTC (rev 17896)
@@ -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 --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
Copied: tags/wagon/1.0.0-5/debian/libwagon-java.poms (from rev 17892, trunk/wagon/debian/libwagon-java.poms)
===================================================================
--- tags/wagon/1.0.0-5/debian/libwagon-java.poms (rev 0)
+++ tags/wagon/1.0.0-5/debian/libwagon-java.poms 2014-03-14 17:36:04 UTC (rev 17896)
@@ -0,0 +1,43 @@
+# 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 and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+# --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. [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. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
+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
Modified: tags/wagon/1.0.0-5/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/wagon/debian/maven.cleanIgnoreRules 2014-03-13 09:21:14 UTC (rev 17889)
+++ tags/wagon/1.0.0-5/debian/maven.cleanIgnoreRules 2014-03-14 17:36:04 UTC (rev 17896)
@@ -1,17 +1 @@
-# Maven clean ignore rules - ignore some Maven dependencies and plugins
-# during the clean phase of a Maven build
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-# for the version. In this case, the element is simply matched
-# and left as it is
-# - * (the star character, alone). In this case, anything will
-# match and be left as it is. For example, using * on the
-# position of the artifact field will match any artifact id
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., this dependency is then removed
-# from the POM before mvn clean is called
-# junit junit jar s/3\\..*/3.x/
Modified: tags/wagon/1.0.0-5/debian/maven.ignoreRules
===================================================================
--- trunk/wagon/debian/maven.ignoreRules 2014-03-13 09:21:14 UTC (rev 17889)
+++ tags/wagon/1.0.0-5/debian/maven.ignoreRules 2014-03-14 17:36:04 UTC (rev 17896)
@@ -1,17 +1,2 @@
-# Maven ignore rules - ignore some Maven dependencies and plugins
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-# for the version. In this case, the element is simply matched
-# and left as it is
-# - * (the star character, alone). In this case, anything will
-# match and be left as it is. For example, using * on the
-# position of the artifact field will match any artifact id
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., this dependency is then removed
-# from the POM
-# junit junit jar s/3\\..*/3.x/
org.codehaus.plexus plexus-ftpd * * * *
Deleted: tags/wagon/1.0.0-5/debian/maven.properties
===================================================================
--- trunk/wagon/debian/maven.properties 2014-03-13 09:21:14 UTC (rev 17889)
+++ tags/wagon/1.0.0-5/debian/maven.properties 2014-03-14 17:36:04 UTC (rev 17896)
@@ -1,2 +0,0 @@
-# maven.test.skip=true
-
Copied: tags/wagon/1.0.0-5/debian/maven.properties (from rev 17891, trunk/wagon/debian/maven.properties)
===================================================================
--- tags/wagon/1.0.0-5/debian/maven.properties (rev 0)
+++ tags/wagon/1.0.0-5/debian/maven.properties 2014-03-14 17:36:04 UTC (rev 17896)
@@ -0,0 +1 @@
+maven.test.skip=true
Modified: tags/wagon/1.0.0-5/debian/maven.publishedRules
===================================================================
--- trunk/wagon/debian/maven.publishedRules 2014-03-13 09:21:14 UTC (rev 17889)
+++ tags/wagon/1.0.0-5/debian/maven.publishedRules 2014-03-14 17:36:04 UTC (rev 17896)
@@ -1,19 +1,17 @@
-# Maven published rules - additional rules to publish, to help
-# the packaging work of Debian maintainers using mh_make
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-# for the version. In this case, the element is simply matched
-# and left as it is
-# - * (the star character, alone). In this case, anything will
-# match and be left as it is. For example, using * on the
-# position of the artifact field will match any artifact id
-# - a regular expression of the form s/match/replace/
-# in this case, elements that match are transformed using
-# the regex rule.
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., replacing the version with 3.x
-# junit junit jar s/3\\..*/3.x/
+org.apache.maven.wagon wagon-file jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-ftp jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-http-lightweight jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-http-shared jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-http jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-provider-api jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-provider-test jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-providers pom s/.*/debian/ * *
+org.apache.maven.wagon wagon-scm jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-ssh-common-test jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-ssh-common jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-ssh-external jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-ssh jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-tck-http jar s/.*/debian/ * *
+org.apache.maven.wagon wagon-tcks pom s/.*/debian/ * *
+org.apache.maven.wagon wagon pom s/.*/debian/ * *
Modified: tags/wagon/1.0.0-5/debian/maven.rules
===================================================================
--- trunk/wagon/debian/maven.rules 2014-03-13 09:21:14 UTC (rev 17889)
+++ tags/wagon/1.0.0-5/debian/maven.rules 2014-03-14 17:36:04 UTC (rev 17896)
@@ -1,25 +1,13 @@
-# Maven rules - transform Maven dependencies and plugins
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-# for the version. In this case, the element is simply matched
-# and left as it is
-# - * (the star character, alone). In this case, anything will
-# match and be left as it is. For example, using * on the
-# position of the artifact field will match any artifact id
-# - a regular expression of the form s/match/replace/
-# in this case, elements that match are transformed using
-# the regex rule.
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., replacing the version with 3.x
-# junit junit jar s/3\\..*/3.x/
commons-httpclient commons-httpclient jar s/3\..*/3.x/ * *
commons-net commons-net jar s/2\..+/2.x/ * *
junit junit jar s/3\..*/3.x/ * *
junit junit jar s/4\..*/4.x/ * *
+org.apache.maven.scm maven-scm-api jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-manager-plexus jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-provider-cvsexe jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-provider-svnexe jar s/.*/debian/ * *
+org.apache.maven.scm maven-scm-test jar s/.*/debian/ * *
org.apache.maven.wagon wagon-file jar s/.*/debian/ * *
org.apache.maven.wagon wagon-ftp jar s/.*/debian/ * *
org.apache.maven.wagon wagon-http-lightweight jar s/.*/debian/ * *
@@ -37,6 +25,7 @@
org.apache.maven.wagon wagon-tcks pom s/.*/debian/ * *
org.apache.maven.wagon wagon pom s/.*/debian/ * *
org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
+org.codehaus.plexus plexus-interactivity-api jar s/.*/debian/ * *
org.jsoup jsoup jar s/.*/debian/ * *
commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
s/easymock/org.easymock/ easymock * s/.*/debian/ * *
Copied: tags/wagon/1.0.0-5/debian/patches/0005-easymock-compatibility.patch (from rev 17890, trunk/wagon/debian/patches/0005-easymock-compatibility.patch)
===================================================================
--- tags/wagon/1.0.0-5/debian/patches/0005-easymock-compatibility.patch (rev 0)
+++ tags/wagon/1.0.0-5/debian/patches/0005-easymock-compatibility.patch 2014-03-14 17:36:04 UTC (rev 17896)
@@ -0,0 +1,846 @@
+Description: Ensures the compatibility with Easymock 3.x
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: yes
+--- a/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java
++++ b/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java
+@@ -30,6 +30,7 @@
+ import org.apache.maven.wagon.authentication.AuthenticationException;
+ import org.apache.maven.wagon.authentication.AuthenticationInfo;
+ import org.apache.maven.wagon.authorization.AuthorizationException;
++import org.apache.maven.wagon.events.SessionEvent;
+ import org.apache.maven.wagon.events.SessionListener;
+ import org.apache.maven.wagon.events.TransferEvent;
+ import org.apache.maven.wagon.events.TransferListener;
+@@ -40,8 +41,9 @@
+ import org.apache.maven.wagon.resource.Resource;
+ import org.codehaus.plexus.util.FileUtils;
+ import org.codehaus.plexus.util.IOUtil;
+-import org.easymock.AbstractMatcher;
+-import org.easymock.MockControl;
++import org.easymock.IAnswer;
++
++import static org.easymock.EasyMock.*;
+
+ /**
+ * @author <a href="michal.maczka at dimatics.com">Michal Maczka</a>
+@@ -94,10 +96,6 @@
+
+ private TransferListener transferListener = null;
+
+- private MockControl transferListenerControl;
+-
+- private MockControl sessionListenerControl;
+-
+ protected void setUp()
+ throws Exception
+ {
+@@ -111,13 +109,11 @@
+
+ wagon = new WagonMock();
+
+- sessionListenerControl = MockControl.createControl( SessionListener.class );
+- sessionListener = (SessionListener) sessionListenerControl.getMock();
++ sessionListener = createMock( SessionListener.class );
+
+ wagon.addSessionListener( sessionListener );
+
+- transferListenerControl = MockControl.createControl( TransferListener.class );
+- transferListener = (TransferListener) transferListenerControl.getMock();
++ transferListener = createMock( TransferListener.class );
+
+ wagon.addTransferListener( transferListener );
+
+@@ -237,14 +233,13 @@
+ {
+ Repository repository = new Repository();
+
+- sessionListenerControl.setDefaultMatcher( MockControl.ALWAYS_MATCHER );
+- sessionListener.sessionOpening( null );
+- sessionListener.sessionOpened( null );
+- sessionListenerControl.replay();
++ sessionListener.sessionOpening( anyObject( SessionEvent.class ) );
++ sessionListener.sessionOpened( anyObject( SessionEvent.class ) );
++ replay( sessionListener );
+
+ wagon.connect( repository );
+
+- sessionListenerControl.verify();
++ verify( sessionListener );
+
+ assertEquals( repository, wagon.getRepository() );
+ }
+@@ -286,10 +281,9 @@
+ {
+ Repository repository = new Repository();
+
+- sessionListenerControl.setDefaultMatcher( MockControl.ALWAYS_MATCHER );
+- sessionListener.sessionOpening( null );
+- sessionListener.sessionConnectionRefused( null );
+- sessionListenerControl.replay();
++ sessionListener.sessionOpening( anyObject( SessionEvent.class ) );
++ sessionListener.sessionConnectionRefused( anyObject( SessionEvent.class ) );
++ replay( sessionListener );
+
+ Wagon wagon = new TestWagon()
+ {
+@@ -315,7 +309,7 @@
+ }
+ finally
+ {
+- sessionListenerControl.verify();
++ verify( sessionListener );
+
+ assertEquals( repository, wagon.getRepository() );
+ }
+@@ -324,14 +318,13 @@
+ public void testSessionCloseEvents()
+ throws Exception
+ {
+- sessionListenerControl.setDefaultMatcher( MockControl.ALWAYS_MATCHER );
+- sessionListener.sessionDisconnecting( null );
+- sessionListener.sessionDisconnected( null );
+- sessionListenerControl.replay();
++ sessionListener.sessionDisconnecting( anyObject( SessionEvent.class ) );
++ sessionListener.sessionDisconnected( anyObject( SessionEvent.class ) );
++ replay( sessionListener );
+
+ wagon.disconnect();
+
+- sessionListenerControl.verify();
++ verify( sessionListener );
+ }
+
+ public void testSessionCloseRefusedEventConnectionException()
+@@ -339,10 +332,9 @@
+ {
+ Repository repository = new Repository();
+
+- sessionListenerControl.setDefaultMatcher( MockControl.ALWAYS_MATCHER );
+- sessionListener.sessionDisconnecting( null );
+- sessionListener.sessionError( null );
+- sessionListenerControl.replay();
++ sessionListener.sessionDisconnecting( anyObject( SessionEvent.class ) );
++ sessionListener.sessionError( anyObject( SessionEvent.class ) );
++ replay( sessionListener );
+
+ Wagon wagon = new TestWagon()
+ {
+@@ -365,7 +357,7 @@
+ }
+ finally
+ {
+- sessionListenerControl.verify();
++ verify( sessionListener );
+ }
+ }
+
+@@ -373,15 +365,14 @@
+ throws Exception
+ {
+ transferListener.debug( "fetch debug message" );
+- transferListenerControl.setDefaultMatcher( MockControl.ALWAYS_MATCHER );
+- transferListener.transferInitiated( null );
+- transferListener.transferStarted( null );
+- transferListener.debug( null );
+- transferListenerControl.setVoidCallable( MockControl.ZERO_OR_MORE );
+- transferListener.transferProgress( null, null, 0 );
+- transferListenerControl.setVoidCallable( 5 );
+- transferListener.transferCompleted( null );
+- transferListenerControl.replay();
++ transferListener.transferInitiated( anyObject( TransferEvent.class ) );
++ transferListener.transferStarted( anyObject( TransferEvent.class ) );
++ transferListener.debug( anyString() );
++ expectLastCall().anyTimes();
++ transferListener.transferProgress( anyObject( TransferEvent.class ), anyObject( byte[].class ), anyInt() );
++ expectLastCall().times( 5 );
++ transferListener.transferCompleted( anyObject( TransferEvent.class ) );
++ replay( transferListener );
+
+ wagon.fireTransferDebug( "fetch debug message" );
+
+@@ -390,19 +381,18 @@
+
+ wagon.get( artifact, destination );
+
+- transferListenerControl.verify();
++ verify( transferListener );
+ }
+
+ public void testGetError()
+ throws Exception
+ {
+- transferListenerControl.setDefaultMatcher( MockControl.ALWAYS_MATCHER );
+- transferListener.transferInitiated( null );
+- transferListener.transferStarted( null );
+- transferListener.debug( null );
+- transferListenerControl.setVoidCallable( MockControl.ZERO_OR_MORE );
+- transferListener.transferError( null );
+- transferListenerControl.replay();
++ transferListener.transferInitiated( anyObject( TransferEvent.class ) );
++ transferListener.transferStarted( anyObject( TransferEvent.class ) );
++ transferListener.debug( anyString() );
++ expectLastCall().anyTimes();
++ transferListener.transferError( anyObject( TransferEvent.class ) );
++ replay( transferListener );
+
+ try
+ {
+@@ -423,7 +413,7 @@
+ assertTrue( true );
+ }
+
+- transferListenerControl.verify();
++ verify( transferListener );
+ }
+
+ public void testPutTransferEvents()
+@@ -431,12 +421,11 @@
+ AuthorizationException
+ {
+ transferListener.debug( "deploy debug message" );
+- transferListenerControl.setDefaultMatcher( MockControl.ALWAYS_MATCHER );
+- transferListener.transferInitiated( null );
+- transferListener.transferStarted( null );
+- transferListener.transferProgress( null, null, 0 );
+- transferListener.transferCompleted( null );
+- transferListenerControl.replay();
++ transferListener.transferInitiated( anyObject( TransferEvent.class ) );
++ transferListener.transferStarted( anyObject( TransferEvent.class ) );
++ transferListener.transferProgress( anyObject( TransferEvent.class ), anyObject( byte[].class ), anyInt() );
++ transferListener.transferCompleted( anyObject( TransferEvent.class ) );
++ replay( transferListener );
+
+ wagon.fireTransferDebug( "deploy debug message" );
+
+@@ -446,7 +435,7 @@
+
+ wagon.put( source, artifact );
+
+- transferListenerControl.verify();
++ verify( transferListener );
+ }
+
+ public void testStreamShutdown()
+@@ -543,52 +532,38 @@
+
+ Resource resource = new Resource( "resource" );
+
+- transferListener.transferInitiated( null );
+- transferListenerControl.setMatcher( MockControl.ALWAYS_MATCHER );
+- transferListener.transferStarted( null );
+- transferListenerControl.setMatcher( MockControl.ALWAYS_MATCHER );
++ transferListener.transferInitiated(anyObject(TransferEvent.class));
++ transferListener.transferStarted(anyObject(TransferEvent.class));
+ TransferEvent event =
+ new TransferEvent( wagon, resource, TransferEvent.TRANSFER_PROGRESS, TransferEvent.REQUEST_PUT );
+ event.setLocalFile( tempFile );
+- transferListener.transferProgress( event, content.getBytes(), content.length() );
+- ProgressArgumentMatcher matcher = new ProgressArgumentMatcher();
+- transferListenerControl.setMatcher( matcher );
+- transferListener.transferCompleted( null );
+- transferListenerControl.setMatcher( MockControl.ALWAYS_MATCHER );
+- transferListenerControl.replay();
++ transferListener.transferProgress( eq( event ), anyObject( byte[].class ), eq( content.length() ) );
++ ProgressAnswer answer = new ProgressAnswer();
++ expectLastCall().andAnswer( answer );
++ transferListener.transferCompleted( anyObject( TransferEvent.class ) );
++ replay( transferListener );
+
+ wagon.postProcessListeners( resource, tempFile, TransferEvent.REQUEST_PUT );
+
+- assertEquals( content.length(), matcher.getSize() );
+- assertEquals( new String( content.getBytes() ), new String( matcher.getBytes() ) );
++ assertEquals( content.length(), answer.getSize() );
++ assertEquals( new String( content.getBytes() ), new String( answer.getBytes() ) );
+
+ tempFile.delete();
+ }
+
+- static final class ProgressArgumentMatcher
+- extends AbstractMatcher
++ static final class ProgressAnswer implements IAnswer
+ {
+ private ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+ private int size;
+
+- private byte[] lastArray;
+-
+- protected boolean argumentMatches( Object expected, Object actual )
++ public Object answer() throws Throwable
+ {
+- if ( actual instanceof byte[] )
+- {
+- lastArray = (byte[]) actual;
+- return true;
+- }
+- if ( actual instanceof Integer )
+- {
+- int length = ( (Integer) actual ).intValue();
+- baos.write( lastArray, 0, length );
+- size += length;
+- return true;
+- }
+- return super.argumentMatches( expected, actual );
++ byte[] buffer = (byte[]) getCurrentArguments()[1];
++ int length = (Integer) getCurrentArguments()[2];
++ baos.write( buffer, 0, length );
++ size += length;
++ return null;
+ }
+
+ public int getSize()
+--- a/wagon-provider-api/src/test/java/org/apache/maven/wagon/events/SessionEventSupportTest.java
++++ b/wagon-provider-api/src/test/java/org/apache/maven/wagon/events/SessionEventSupportTest.java
+@@ -22,7 +22,7 @@
+ import junit.framework.TestCase;
+
+ import org.apache.maven.wagon.Wagon;
+-import org.easymock.MockControl;
++import org.easymock.EasyMock;
+
+ /**
+ * @author <a href="michal.maczka at dimatics.com">Michal Maczka</a>
+@@ -34,8 +34,6 @@
+
+ private SessionEventSupport eventSupport;
+
+- private MockControl wagonMockControl;
+-
+ private Wagon wagon;
+
+ /**
+@@ -49,9 +47,7 @@
+ eventSupport = new SessionEventSupport();
+
+ // TODO: actually test it gets called?
+- wagonMockControl = MockControl.createControl( Wagon.class );
+-
+- wagon = (Wagon) wagonMockControl.getMock();
++ wagon = (Wagon) EasyMock.createMock( Wagon.class );
+ }
+
+ public void testSessionListenerRegistration()
+--- a/wagon-provider-api/src/test/java/org/apache/maven/wagon/events/SessionEventTest.java
++++ b/wagon-provider-api/src/test/java/org/apache/maven/wagon/events/SessionEventTest.java
+@@ -24,7 +24,7 @@
+ import org.apache.maven.wagon.Wagon;
+ import org.apache.maven.wagon.authentication.AuthenticationException;
+ import org.apache.maven.wagon.repository.Repository;
+-import org.easymock.MockControl;
++import org.easymock.EasyMock;
+
+ /**
+ * @author <a href="michal.maczka at dimatics.com">Michal Maczka</a>
+@@ -41,7 +41,7 @@
+ throws ConnectionException, AuthenticationException
+ {
+
+- final Wagon wagon = (Wagon) MockControl.createControl( Wagon.class ).getMock();
++ final Wagon wagon = (Wagon) EasyMock.createMock(Wagon.class);
+ final Repository repo = new Repository();
+
+ wagon.connect( repo );
+--- a/wagon-provider-api/src/test/java/org/apache/maven/wagon/events/TransferEventSupportTest.java
++++ b/wagon-provider-api/src/test/java/org/apache/maven/wagon/events/TransferEventSupportTest.java
+@@ -21,7 +21,7 @@
+
+ import junit.framework.TestCase;
+ import org.apache.maven.wagon.Wagon;
+-import org.easymock.MockControl;
++import org.easymock.EasyMock;
+
+ /**
+ * @author <a href="michal.maczka at dimatics.com">Michal Maczka</a>
+@@ -33,8 +33,6 @@
+ {
+ private TransferEventSupport eventSupport;
+
+- private MockControl wagonMockControl;
+-
+ private Wagon wagon;
+
+ /**
+@@ -48,9 +46,7 @@
+ eventSupport = new TransferEventSupport();
+
+ // TODO: actually test it gets called?
+- wagonMockControl = MockControl.createControl( Wagon.class );
+-
+- wagon = (Wagon) wagonMockControl.getMock();
++ wagon = (Wagon) EasyMock.createMock(Wagon.class);
+ }
+
+ public void testTransferListenerRegistration()
+--- a/wagon-provider-api/src/test/java/org/apache/maven/wagon/events/TransferEventTest.java
++++ b/wagon-provider-api/src/test/java/org/apache/maven/wagon/events/TransferEventTest.java
+@@ -25,7 +25,7 @@
+ import org.apache.maven.wagon.authentication.AuthenticationException;
+ import org.apache.maven.wagon.repository.Repository;
+ import org.apache.maven.wagon.resource.Resource;
+-import org.easymock.MockControl;
++import org.easymock.EasyMock;
+
+ /**
+ * @author <a href="michal.maczka at dimatics.com">Michal Maczka</a>
+@@ -41,7 +41,7 @@
+ public void testTransferEventProperties()
+ throws ConnectionException, AuthenticationException
+ {
+- final Wagon wagon = (Wagon) MockControl.createControl( Wagon.class ).getMock();
++ final Wagon wagon = (Wagon) EasyMock.createMock(Wagon.class);
+
+ final Repository repo = new Repository();
+
+--- a/wagon-provider-api/src/test/java/org/apache/maven/wagon/StreamWagonTest.java
++++ b/wagon-provider-api/src/test/java/org/apache/maven/wagon/StreamWagonTest.java
+@@ -36,7 +36,8 @@
+ import org.codehaus.plexus.util.IOUtil;
+ import org.codehaus.plexus.util.StringInputStream;
+ import org.codehaus.plexus.util.StringOutputStream;
+-import org.easymock.MockControl;
++
++import static org.easymock.EasyMock.*;
+
+ public class StreamWagonTest
+ extends TestCase
+@@ -78,15 +79,13 @@
+ }
+ };
+
+- MockControl control = MockControl.createControl( TransferListener.class );
+- TransferListener listener = (TransferListener) control.getMock();
+- listener.transferInitiated( null );
+- control.setMatcher( MockControl.ALWAYS_MATCHER );
++ TransferListener listener = createMock( TransferListener.class );
++ listener.transferInitiated( anyObject( TransferEvent.class ) );
+ TransferEvent transferEvent =
+ new TransferEvent( wagon, new Resource( "resource" ), new TransferFailedException( "" ),
+ TransferEvent.REQUEST_GET );
+ listener.transferError( transferEvent );
+- control.replay();
++ replay( listener );
+
+ wagon.connect( repository );
+ wagon.addTransferListener( listener );
+@@ -104,7 +103,7 @@
+ wagon.disconnect();
+ }
+
+- control.verify();
++ verify( listener );
+ }
+
+ public void testNullOutputStream()
+@@ -118,15 +117,13 @@
+ }
+ };
+
+- MockControl control = MockControl.createControl( TransferListener.class );
+- TransferListener listener = (TransferListener) control.getMock();
+- listener.transferInitiated( null );
+- control.setMatcher( MockControl.ALWAYS_MATCHER );
++ TransferListener listener = createMock( TransferListener.class );
++ listener.transferInitiated( anyObject( TransferEvent.class ) );
+ TransferEvent transferEvent =
+ new TransferEvent( wagon, new Resource( "resource" ), new TransferFailedException( "" ),
+ TransferEvent.REQUEST_PUT );
+ listener.transferError( transferEvent );
+- control.replay();
++ replay( listener );
+
+ wagon.connect( repository );
+ wagon.addTransferListener( listener );
+@@ -144,7 +141,7 @@
+ wagon.disconnect();
+ }
+
+- control.verify();
++ verify( listener );
+ }
+
+ public void testTransferFailedExceptionOnInput()
+@@ -173,15 +170,13 @@
+ }
+ };
+
+- MockControl control = MockControl.createControl( TransferListener.class );
+- TransferListener listener = (TransferListener) control.getMock();
+- listener.transferInitiated( null );
+- control.setMatcher( MockControl.ALWAYS_MATCHER );
++ TransferListener listener = createMock( TransferListener.class );
++ listener.transferInitiated( anyObject( TransferEvent.class ) );
+ TransferEvent transferEvent =
+ new TransferEvent( wagon, new Resource( "resource" ), new TransferFailedException( "" ),
+ TransferEvent.REQUEST_PUT );
+ listener.transferError( transferEvent );
+- control.replay();
++ replay( listener );
+
+ wagon.connect( repository );
+ wagon.addTransferListener( listener );
+@@ -197,7 +192,7 @@
+ finally
+ {
+ wagon.disconnect();
+- control.verify();
++ verify( listener );
+ }
+ }
+
+@@ -253,14 +248,12 @@
+ }
+ };
+
+- MockControl control = MockControl.createControl( TransferListener.class );
+- TransferListener listener = (TransferListener) control.getMock();
+- listener.transferInitiated( null );
+- control.setMatcher( MockControl.ALWAYS_MATCHER );
++ TransferListener listener = createMock( TransferListener.class );
++ listener.transferInitiated( anyObject( TransferEvent.class ) );
+ TransferEvent transferEvent =
+ new TransferEvent( wagon, new Resource( "resource" ), exception, TransferEvent.REQUEST_GET );
+ listener.transferError( transferEvent );
+- control.replay();
++ replay( listener );
+
+ wagon.connect( repository );
+ wagon.addTransferListener( listener );
+@@ -272,7 +265,7 @@
+ finally
+ {
+ wagon.disconnect();
+- control.verify();
++ verify( listener );
+ }
+ }
+
+--- a/wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java
++++ b/wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java
+@@ -143,7 +143,7 @@
+ {
+ StreamingWagon wagon = (StreamingWagon) getWagon();
+
+- ProgressArgumentMatcher progressArgumentMatcher = setupGetIfNewerTest( wagon, expectedResult, expectedSize );
++ ProgressAnswer progressAnswer = setupGetIfNewerTest( wagon, expectedResult, expectedSize );
+
+ connectWagon( wagon );
+
+@@ -161,7 +161,7 @@
+
+ disconnectWagon( wagon );
+
+- assertGetIfNewerTest( progressArgumentMatcher, expectedResult, expectedSize );
++ assertGetIfNewerTest( progressAnswer, expectedResult, expectedSize );
+
+ tearDownWagonTestingFixtures();
+ }
+@@ -244,7 +244,7 @@
+
+ StreamingWagon wagon = (StreamingWagon) getWagon();
+
+- ProgressArgumentMatcher progressArgumentMatcher = replayMockForPut( resource, content, wagon );
++ ProgressAnswer progressAnswer = replayMockForPut( resource, content, wagon );
+
+ message( "Putting test artifact: " + resource + " into test repository " + testRepository );
+
+@@ -264,7 +264,7 @@
+
+ disconnectWagon( wagon );
+
+- verifyMock( progressArgumentMatcher, content.length() );
++ verifyMock( progressAnswer, content.length() );
+ return content.length();
+ }
+
+@@ -276,7 +276,7 @@
+
+ StreamingWagon wagon = (StreamingWagon) getWagon();
+
+- ProgressArgumentMatcher progressArgumentMatcher = replaceMockForGet( wagon, expectedSize );
++ ProgressAnswer progressAnswer = replaceMockForGet( wagon, expectedSize );
+
+ message( "Getting test artifact from test repository " + testRepository );
+
+@@ -296,6 +296,6 @@
+
+ disconnectWagon( wagon );
+
+- verifyMock( progressArgumentMatcher, expectedSize );
++ verifyMock( progressAnswer, expectedSize );
+ }
+ }
+--- 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
+@@ -40,8 +40,9 @@
+ import org.apache.maven.wagon.resource.Resource;
+ import org.codehaus.plexus.PlexusTestCase;
+ import org.codehaus.plexus.util.FileUtils;
+-import org.easymock.AbstractMatcher;
+-import org.easymock.MockControl;
++import org.easymock.IAnswer;
++
++import static org.easymock.EasyMock.*;
+
+ /**
+ * @author <a href="mailto:jason at maven.org">Jason van Zyl</a>
+@@ -50,23 +51,15 @@
+ public abstract class WagonTestCase
+ extends PlexusTestCase
+ {
+- static final class ProgressArgumentMatcher
+- extends AbstractMatcher
++ static final class ProgressAnswer implements IAnswer
+ {
+ private int size;
+
+- protected boolean argumentMatches( Object expected, Object actual )
++ public Object answer() throws Throwable
+ {
+- if ( actual instanceof byte[] )
+- {
+- return true;
+- }
+- if ( actual instanceof Integer )
+- {
+- size += ( (Integer) actual ).intValue();
+- return true;
+- }
+- return super.argumentMatches( expected, actual );
++ int length = (Integer) getCurrentArguments()[2];
++ size += length;
++ return null;
+ }
+
+ public int getSize()
+@@ -97,8 +90,6 @@
+
+ protected TransferListener mockTransferListener;
+
+- protected MockControl mockTransferListenerControl;
+-
+ // ----------------------------------------------------------------------
+ // Constructors
+ // ----------------------------------------------------------------------
+@@ -108,8 +99,7 @@
+ {
+ checksumObserver = new ChecksumObserver();
+
+- mockTransferListenerControl = MockControl.createControl( TransferListener.class );
+- mockTransferListener = (TransferListener) mockTransferListenerControl.getMock();
++ mockTransferListener = createMock( TransferListener.class );
+
+ super.setUp();
+ }
+@@ -294,7 +284,7 @@
+ {
+ Wagon wagon = getWagon();
+
+- ProgressArgumentMatcher progressArgumentMatcher = setupGetIfNewerTest( wagon, expectedResult, expectedSize );
++ ProgressAnswer progressAnswer = setupGetIfNewerTest( wagon, expectedResult, expectedSize );
+
+ connectWagon( wagon );
+
+@@ -303,18 +293,18 @@
+
+ disconnectWagon( wagon );
+
+- assertGetIfNewerTest( progressArgumentMatcher, expectedResult, expectedSize );
++ assertGetIfNewerTest( progressAnswer, expectedResult, expectedSize );
+
+ tearDownWagonTestingFixtures();
+ }
+
+- protected void assertGetIfNewerTest( ProgressArgumentMatcher progressArgumentMatcher, boolean expectedResult,
++ protected void assertGetIfNewerTest( ProgressAnswer progressAnswer, boolean expectedResult,
+ int expectedSize )
+ throws IOException
+ {
+ if ( expectedResult == true )
+ {
+- verifyMock( progressArgumentMatcher, expectedSize );
++ verifyMock( progressAnswer, expectedSize );
+
+ assertNotNull( "check checksum is not null", checksumObserver.getActualChecksum() );
+
+@@ -330,9 +320,9 @@
+ }
+ else
+ {
+- mockTransferListenerControl.verify();
++ verify( mockTransferListener );
+
+- mockTransferListenerControl.reset();
++ reset( mockTransferListener );
+
+ assertNull( "check checksum is null", checksumObserver.getActualChecksum() );
+
+@@ -340,7 +330,7 @@
+ }
+ }
+
+- protected ProgressArgumentMatcher setupGetIfNewerTest( Wagon wagon, boolean expectedResult, int expectedSize )
++ protected ProgressAnswer setupGetIfNewerTest( Wagon wagon, boolean expectedResult, int expectedSize )
+ throws NoSuchAlgorithmException, IOException
+ {
+ checksumObserver = new ChecksumObserver();
+@@ -350,16 +340,16 @@
+ assertFalse( destFile.exists() );
+ destFile.deleteOnExit();
+
+- ProgressArgumentMatcher progressArgumentMatcher = null;
++ ProgressAnswer progressAnswer = null;
+ if ( expectedResult == true )
+ {
+- progressArgumentMatcher = replaceMockForGet( wagon, expectedSize );
++ progressAnswer = replaceMockForGet( wagon, expectedSize );
+ }
+ else
+ {
+ replaceMockForSkippedGetIfNewer( wagon, expectedSize );
+ }
+- return progressArgumentMatcher;
++ return progressAnswer;
+ }
+
+ private void replaceMockForSkippedGetIfNewer( Wagon wagon, int expectedSize )
+@@ -374,11 +364,10 @@
+ // mockTransferListener.transferSkipped( createTransferEvent( wagon, resource, TransferEvent.TRANSFER_STARTED,
+ // TransferEvent.REQUEST_GET, destFile ) );
+
+- mockTransferListener.debug( null );
+- mockTransferListenerControl.setMatcher( MockControl.ALWAYS_MATCHER );
+- mockTransferListenerControl.setVoidCallable( MockControl.ZERO_OR_MORE );
++ mockTransferListener.debug( anyString() );
++ expectLastCall().anyTimes();
+
+- mockTransferListenerControl.replay();
++ replay( mockTransferListener );
+ }
+
+ public void testWagonPutDirectory()
+@@ -873,7 +862,7 @@
+
+ Wagon wagon = getWagon();
+
+- ProgressArgumentMatcher progressArgumentMatcher = replayMockForPut( resourceName, content, wagon );
++ ProgressAnswer progressAnswer = replayMockForPut( resourceName, content, wagon );
+
+ message( "Putting test artifact: " + resourceName + " into test repository " + testRepository );
+
+@@ -883,10 +872,10 @@
+
+ disconnectWagon( wagon );
+
+- verifyMock( progressArgumentMatcher, content.length() );
++ verifyMock( progressAnswer, content.length() );
+ }
+
+- protected ProgressArgumentMatcher replayMockForPut( String resourceName, String content, Wagon wagon )
++ protected ProgressAnswer replayMockForPut( String resourceName, String content, Wagon wagon )
+ {
+ Resource resource = new Resource( resourceName );
+ mockTransferListener.transferInitiated( createTransferEvent( wagon, resource, TransferEvent.TRANSFER_INITIATED,
+@@ -896,21 +885,20 @@
+ resource.setLastModified( sourceFile.lastModified() );
+ mockTransferListener.transferStarted( createTransferEvent( wagon, resource, TransferEvent.TRANSFER_STARTED,
+ TransferEvent.REQUEST_PUT, sourceFile ) );
+- mockTransferListener.transferProgress( createTransferEvent( wagon, resource, TransferEvent.TRANSFER_PROGRESS,
+- TransferEvent.REQUEST_PUT, sourceFile ),
+- new byte[] {}, 0 );
+- ProgressArgumentMatcher progressArgumentMatcher = new ProgressArgumentMatcher();
+- mockTransferListenerControl.setMatcher( progressArgumentMatcher );
+-
+- mockTransferListener.debug( null );
+- mockTransferListenerControl.setMatcher( MockControl.ALWAYS_MATCHER );
+- mockTransferListenerControl.setVoidCallable( MockControl.ZERO_OR_MORE );
++ mockTransferListener.transferProgress(
++ eq( createTransferEvent( wagon, resource, TransferEvent.TRANSFER_PROGRESS, TransferEvent.REQUEST_PUT,
++ sourceFile ) ), anyObject( byte[].class ), anyInt() );
++ ProgressAnswer progressAnswer = new ProgressAnswer();
++ expectLastCall().andStubAnswer( progressAnswer );
++
++ mockTransferListener.debug( anyString() );
++ expectLastCall().anyTimes();
+
+ mockTransferListener.transferCompleted( createTransferEvent( wagon, resource, TransferEvent.TRANSFER_COMPLETED,
+ TransferEvent.REQUEST_PUT, sourceFile ) );
+
+- mockTransferListenerControl.replay();
+- return progressArgumentMatcher;
++ replay( mockTransferListener );
++ return progressAnswer;
+ }
+
+ protected TransferEvent createTransferEvent( Wagon wagon, Resource resource, int eventType, int requestType,
+@@ -937,7 +925,7 @@
+
+ Wagon wagon = getWagon();
+
+- ProgressArgumentMatcher progressArgumentMatcher = replaceMockForGet( wagon, expectedSize );
++ ProgressAnswer progressAnswer = replaceMockForGet( wagon, expectedSize );
+
+ message( "Getting test artifact from test repository " + testRepository );
+
+@@ -947,16 +935,16 @@
+
+ disconnectWagon( wagon );
+
+- verifyMock( progressArgumentMatcher, expectedSize );
++ verifyMock( progressAnswer, expectedSize );
+ }
+
+- protected void verifyMock( ProgressArgumentMatcher progressArgumentMatcher, int length )
++ protected void verifyMock( ProgressAnswer progressAnswer, int length )
+ {
+- mockTransferListenerControl.verify();
++ verify( mockTransferListener );
+
+- assertEquals( length, progressArgumentMatcher.getSize() );
++ assertEquals(length, progressAnswer.getSize());
+
+- mockTransferListenerControl.reset();
++ reset( mockTransferListener );
+ }
+
+ protected void disconnectWagon( Wagon wagon )
+@@ -979,7 +967,7 @@
+ wagon.connect( testRepository, getAuthInfo() );
+ }
+
+- protected ProgressArgumentMatcher replaceMockForGet( Wagon wagon, int expectedSize )
++ protected ProgressAnswer replaceMockForGet( Wagon wagon, int expectedSize )
+ {
+ Resource resource = new Resource( this.resource );
+ mockTransferListener.transferInitiated( createTransferEvent( wagon, resource, TransferEvent.TRANSFER_INITIATED,
+@@ -989,20 +977,20 @@
+ resource.setLastModified( getExpectedLastModifiedOnGet( testRepository, resource ) );
+ mockTransferListener.transferStarted( createTransferEvent( wagon, resource, TransferEvent.TRANSFER_STARTED,
+ TransferEvent.REQUEST_GET, destFile ) );
+- mockTransferListener.transferProgress( new TransferEvent( wagon, resource, TransferEvent.TRANSFER_PROGRESS,
+- TransferEvent.REQUEST_GET ), new byte[] {}, 0 );
+- ProgressArgumentMatcher progressArgumentMatcher = new ProgressArgumentMatcher();
+- mockTransferListenerControl.setMatcher( progressArgumentMatcher );
+-
+- mockTransferListener.debug( null );
+- mockTransferListenerControl.setMatcher( MockControl.ALWAYS_MATCHER );
+- mockTransferListenerControl.setVoidCallable( MockControl.ZERO_OR_MORE );
++ mockTransferListener.transferProgress(
++ eq( new TransferEvent( wagon, resource, TransferEvent.TRANSFER_PROGRESS, TransferEvent.REQUEST_GET ) ),
++ anyObject( byte[].class ), anyInt() );
++ ProgressAnswer progressAnswer = new ProgressAnswer();
++ expectLastCall().andAnswer( progressAnswer );
++
++ mockTransferListener.debug( anyString() );
++ expectLastCall().anyTimes();
+
+ mockTransferListener.transferCompleted( createTransferEvent( wagon, resource, TransferEvent.TRANSFER_COMPLETED,
+ TransferEvent.REQUEST_GET, destFile ) );
+
+- mockTransferListenerControl.replay();
+- return progressArgumentMatcher;
++ replay( mockTransferListener );
++ return progressAnswer;
+ }
+
+ protected int getExpectedContentLengthOnGet( int expectedSize )
Deleted: tags/wagon/1.0.0-5/debian/patches/series
===================================================================
--- trunk/wagon/debian/patches/series 2014-03-13 09:21:14 UTC (rev 17889)
+++ tags/wagon/1.0.0-5/debian/patches/series 2014-03-14 17:36:04 UTC (rev 17896)
@@ -1,4 +0,0 @@
-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
Copied: tags/wagon/1.0.0-5/debian/patches/series (from rev 17890, trunk/wagon/debian/patches/series)
===================================================================
--- tags/wagon/1.0.0-5/debian/patches/series (rev 0)
+++ tags/wagon/1.0.0-5/debian/patches/series 2014-03-14 17:36:04 UTC (rev 17896)
@@ -0,0 +1,5 @@
+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
+0005-easymock-compatibility.patch
More information about the pkg-java-commits
mailing list