Author: ebourg-guest Date: 2014-02-10 23:08:06 +0000 (Mon, 10 Feb 2014) New Revision: 17756
Added: tags/maven2/2.2.1-20/ tags/maven2/2.2.1-20/debian/changelog tags/maven2/2.2.1-20/debian/compat tags/maven2/2.2.1-20/debian/control tags/maven2/2.2.1-20/debian/maven.rules tags/maven2/2.2.1-20/debian/patches/build.patch tags/maven2/2.2.1-20/debian/rules Removed: tags/maven2/2.2.1-20/debian/changelog tags/maven2/2.2.1-20/debian/compat tags/maven2/2.2.1-20/debian/control tags/maven2/2.2.1-20/debian/maven.rules tags/maven2/2.2.1-20/debian/patches/build.patch tags/maven2/2.2.1-20/debian/rules Log: [svn-buildpackage] Tagging maven2 2.2.1-20 Deleted: tags/maven2/2.2.1-20/debian/changelog =================================================================== --- trunk/maven2/debian/changelog 2013-10-18 09:06:45 UTC (rev 17347) +++ tags/maven2/2.2.1-20/debian/changelog 2014-02-10 23:08:06 UTC (rev 17756) @@ -1,250 +0,0 @@ -maven2 (2.2.1-14) unstable; urgency=low - - * Team upload. - * Rebuild with libmaven2-core-java 2.2.1-10 (Updates maven-antrun-plugin) - - -- Emmanuel Bourg <[email protected]> Sun, 23 Jun 2013 15:29:15 +0200 - -maven2 (2.2.1-13) unstable; urgency=low - - [ Miguel Landaeta ] - * Team upload. - * Fix permissions of mvnDebug script. (Closes: #687154). - * Remove Michael Koch from Uploaders list. - Thanks for your work on this package. (Closes: #654115). - - [ tony mancill ] - * Fix typo in maven bash completion file. (Closes: #688722) - - Thank you to Oleksandr Gavenko. - - [ Ludovic Claude ] - * Add resolution for the exec plugin in the bash completion. - - [ Emmanuel Bourg ] - * Updated Standards-Version to 3.9.4 (no changes) - * Removed the dependency on backport-util-concurrent - * debian/control: Use canonical URLs for the Vcs-* fields - * debian/maven.rules: Removed the unused rule for maven-clean-plugin - - -- Emmanuel Bourg <[email protected]> Wed, 12 Jun 2013 10:06:15 +0200 - -maven2 (2.2.1-12) unstable; urgency=low - - * Team upload. - * Upload to unstable to allow side-by-side installation of maven (3.x) - and maven2 packages. - * d/control: Bump Standards-Version to 3.9.3: no changes were required. - * d/copyright: Upgrade to copyright format 1.0. - - -- Damien Raude-Morvan <[email protected]> Thu, 16 Aug 2012 21:05:27 +0200 - -maven2 (2.2.1-11) experimental; urgency=low - - * Team upload. - * Use alternative to install /usr/bin/mvn. - - -- Damien Raude-Morvan <[email protected]> Sat, 17 Dec 2011 23:56:39 +0100 - -maven2 (2.2.1-10) unstable; urgency=low - - * Team upload. - * Rebuild now that libmaven2-core-java 2.2.1-8 is in unstable. - - -- tony mancill <[email protected]> Thu, 13 Oct 2011 19:09:11 -0700 - -maven2 (2.2.1-9) unstable; urgency=low - - * Team upload. - * Rebuild to update plugin versions. - * Make copyright DEP-5 compliant. - - -- Miguel Landaeta <[email protected]> Wed, 12 Oct 2011 17:11:45 -0430 - -maven2 (2.2.1-8) unstable; urgency=low - - * Team upload. - * Rebuild to update plugin versions. - - -- Damien Raude-Morvan <[email protected]> Tue, 11 Oct 2011 23:36:37 +0200 - -maven2 (2.2.1-7) unstable; urgency=low - - * Team upload. - * Rebuild to update plugin versions. - - -- Miguel Landaeta <[email protected]> Sun, 14 Aug 2011 15:06:30 -0430 - -maven2 (2.2.1-6) unstable; urgency=low - - * Team upload. - * No change rebuild in order to re-assemble the uber jar. (Closes: #636206). - * Bump Standards-Version to 3.9.2. No changes were required. - - -- Miguel Landaeta <[email protected]> Tue, 02 Aug 2011 21:56:46 -0430 - -maven2 (2.2.1-5) unstable; urgency=low - - * Remove Paul from Uploaders list. - * Add myself to Uploaders list. - * Build with maven2-core 2.2.1-4. - - -- Torsten Werner <[email protected]> Sun, 16 May 2010 13:43:36 +0200 - -maven2 (2.2.1-4) unstable; urgency=low - - * Improve bash completion for maven2, -D options are better - handled for plugins (for example, mvn install:install-file -DpomFile=...) - * Apply patch from Heikki Henriksen <[email protected]> to - fix mvnDebug command. Thanks Heikki! (Closes: #561596) - - -- Ludovic Claude <[email protected]> Tue, 06 Apr 2010 20:38:51 +0200 - -maven2 (2.2.1-3) unstable; urgency=low - - * Team Upload. - * Rebuild with new libmaven2-core-java 2.2.1-2 - (should fix plugins dependencies version issues) - * Update Standards-Version to 3.8.4: no changes needed - * Bump debhelper to >= 7 - * Use 3.0 (quilt) source format: - - Rework debian/README.source - - -- Damien Raude-Morvan <[email protected]> Mon, 05 Apr 2010 21:39:56 +0200 - -maven2 (2.2.1-2) unstable; urgency=low - - * Rebuild to update plugin versions (Closes: #552704, #553046). - - -- Michael Koch <[email protected]> Tue, 03 Nov 2009 14:41:53 +0100 - -maven2 (2.2.1-1) unstable; urgency=low - - * New upstream release (Closes: #542546) - * Update download url for debian/watch and debian/orig-tar.sh - * Update Standards-Version to 3.8.3 - - add debian/README.source - * Fix bash completion to keep working after single options such - as --offline or -Dmaven.test.skip=true - * Ensure that all classes are compiled for Java 1.5 (Closes: #542162) - - -- Ludovic Claude <[email protected]> Thu, 03 Sep 2009 20:42:38 +0100 - -maven2 (2.2.0-2) unstable; urgency=low - - * Upload to unstable. - - -- Torsten Werner <[email protected]> Fri, 14 Aug 2009 14:59:25 +0200 - -maven2 (2.2.0-1) experimental; urgency=low - - * New upstream version - * Added myself to Uploaders. - * Change section to java, bump Standards-Version to 3.8.1 - * Add a Build-Depends-Indep dependency on maven-repo-helper - * Move ant to Build-Depends (needed for clean target) - * Add dependency on java runtimes for the maven2 binary. - * Change the dependency on java-gcj to default-jdk (Closes: #526295) - * Update watch and added orig-tar.sh to download the sources, - get-orig-source in rules now uses uscan - * Use quilt to manage the patches, add a patch to use the upstream - build.xml as the build file, disabling all dependency downloading from it - * Split the package in 2 parts: maven2-core contains all libraries, - this package contains only the uber jar and the scripts - * Updated the build to use Maven and its plugins to bootstrap itself, - based on a patched version of the build.xml boostrap script provided - with Maven. In particular, it now generates properly the shaded uber-jar, - this will avoid potential class versionning conflicts for the shared - libraries used in the plugins. - * Added Build-Depends-Indep on libmaven-clean-plugin-java, - libmaven-compiler-plugin-java, libmaven-install-plugin-java, - libmaven-jar-plugin-java, libmaven-resources-plugin-java, - libmaven-shade-plugin-java and add a Recommends on those libraries. - * Remove debian/META-INF as this information is now generated by the build. - * Improve command line completion. - - -- Ludovic Claude <[email protected]> Mon, 02 Mar 2009 15:04:20 +0000 - -maven2 (2.0.9-2) unstable; urgency=low - - [ Michael Koch ] - * Reworked watch file to support RC versions correctly. - * Added myself to Uploaders. - - [ Paul Cager ] - * Added maven-toolchain to list of sub-projects to build. - (Closes: #486938). - * Standards version 3.8.0 (no changes necessary). - - -- Paul Cager <[email protected]> Sat, 21 Jun 2008 20:49:29 +0000 - -maven2 (2.0.9-1) unstable; urgency=low - - [ Paul Cager ] - * New upstream version - - [ Michael Koch ] - * Added bash-completion file (Closes: #477443). - - -- Paul Cager <[email protected]> Thu, 24 Apr 2008 23:46:29 +0100 - -maven2 (2.0.8-6) unstable; urgency=low - - * Added symlink /usr/share/maven2/bin/mvn -> /usr/bin/mvn - (and the same for m2). - Fixes bug http://jira.codehaus.org/browse/MINVOKER-28 - (thanks to [email protected] for reporting the bug). - - -- Paul Cager <[email protected]> Fri, 04 Apr 2008 20:15:52 +0100 - -maven2 (2.0.8-5) unstable; urgency=low - - * Fixed processing of command line options (Closes: #466860) - - Removed patch to call of commons-cli, and fixed problem in - commons-cli instead (see bug 469082). - - -- Paul Cager <[email protected]> Sun, 16 Mar 2008 11:44:55 +0000 - -maven2 (2.0.8-4) unstable; urgency=low - - * Closes: #458895: Creating empty project with artifacts fails. - Bug appeared when version 1.1 of libcommons-cli-java was uploaded. This - new version conforms more rigorously to its API check which exposed - a bug in the Maven code. (Patch "command-line"). - - -- Paul Cager <[email protected]> Fri, 11 Jan 2008 23:49:29 +0000 - -maven2 (2.0.8-3) unstable; urgency=low - - * Add versioned runtime dependency to libplexus-utils-java. - - -- Paul Cager <[email protected]> Fri, 14 Dec 2007 22:37:09 +0000 - -maven2 (2.0.8-2) unstable; urgency=low - - * Fixed version number. (Closes: #456298) - - -- Paul Cager <[email protected]> Fri, 14 Dec 2007 13:06:50 +0000 - -maven2 (2.0.8-1) unstable; urgency=low - - * New upstream release (Closes: #454087). - * Added min version to Build-Depends for libplexus-utils-java. - * Added Vcs-Svn control fields etc. - * Marked as compliant to standards version 3.7.3. - - -- Paul Cager <[email protected]> Sun, 02 Dec 2007 23:27:21 +0000 - -maven2 (2.0.7-2) unstable; urgency=low - - * Changed to use correct JDK/JRE defined in Debian's alternatives system, or - any one the user has specifically set up. - (Closes: #445006) - * Uses new "Homepage" field in debian/control. - - -- Paul Cager <[email protected]> Sun, 28 Oct 2007 13:58:23 +0000 - -maven2 (2.0.7-1) unstable; urgency=low - - * Initial release. (Closes: #323050) - - -- Paul Cager <[email protected]> Fri, 06 Jul 2007 16:37:52 +0100 Copied: tags/maven2/2.2.1-20/debian/changelog (from rev 17752, trunk/maven2/debian/changelog) =================================================================== --- tags/maven2/2.2.1-20/debian/changelog (rev 0) +++ tags/maven2/2.2.1-20/debian/changelog 2014-02-10 23:08:06 UTC (rev 17756) @@ -0,0 +1,297 @@ +maven2 (2.2.1-20) unstable; urgency=medium + + * Team upload + * Rebuild with libmaven2-core-java 2.2.1-15 (Updates maven-jar-plugin) + + -- Emmanuel Bourg <[email protected]> Mon, 10 Feb 2014 23:29:26 +0100 + +maven2 (2.2.1-19) unstable; urgency=low + + * Team upload + * Updated the dependency on libmaven-shade-plugin-java to 1.7.1 + * debian/rules: Modified the clean target to allow rebuilds + + -- Emmanuel Bourg <[email protected]> Mon, 02 Dec 2013 15:34:06 +0100 + +maven2 (2.2.1-18) unstable; urgency=low + + * Team upload + * Rebuild with libmaven2-core-java 2.2.1-14 (Updates maven-compiler-plugin) + + -- Emmanuel Bourg <[email protected]> Thu, 21 Nov 2013 18:01:39 +0100 + +maven2 (2.2.1-17) unstable; urgency=low + + * Team upload. + * Rebuild with libmaven2-core-java 2.2.1-13 (Updates maven-source-plugin, + maven-install-plugin and maven-javadoc-plugin) + + -- Emmanuel Bourg <[email protected]> Tue, 05 Nov 2013 23:44:28 +0100 + +maven2 (2.2.1-16) unstable; urgency=low + + * Team upload. + * Rebuild with libmaven2-core-java 2.2.1-12 (Updates maven-plugin-plugin) + * Updated Standards-Version to 3.9.5 (no changes) + + -- Emmanuel Bourg <[email protected]> Fri, 18 Oct 2013 19:10:12 +0200 + +maven2 (2.2.1-15) unstable; urgency=low + + * Team upload. + * Rebuild with libmaven2-core-java 2.2.1-11 (Updates maven-javadoc-plugin, + maven-jar-plugin and maven-dependency-plugin) + * Build depend on debhelper >= 9 + + -- Emmanuel Bourg <[email protected]> Fri, 18 Oct 2013 17:52:29 +0200 + +maven2 (2.2.1-14) unstable; urgency=low + + * Team upload. + * Rebuild with libmaven2-core-java 2.2.1-10 (Updates maven-antrun-plugin) + + -- Emmanuel Bourg <[email protected]> Sun, 23 Jun 2013 15:29:15 +0200 + +maven2 (2.2.1-13) unstable; urgency=low + + [ Miguel Landaeta ] + * Team upload. + * Fix permissions of mvnDebug script. (Closes: #687154). + * Remove Michael Koch from Uploaders list. + Thanks for your work on this package. (Closes: #654115). + + [ tony mancill ] + * Fix typo in maven bash completion file. (Closes: #688722) + - Thank you to Oleksandr Gavenko. + + [ Ludovic Claude ] + * Add resolution for the exec plugin in the bash completion. + + [ Emmanuel Bourg ] + * Updated Standards-Version to 3.9.4 (no changes) + * Removed the dependency on backport-util-concurrent + * debian/control: Use canonical URLs for the Vcs-* fields + * debian/maven.rules: Removed the unused rule for maven-clean-plugin + + -- Emmanuel Bourg <[email protected]> Wed, 12 Jun 2013 10:06:15 +0200 + +maven2 (2.2.1-12) unstable; urgency=low + + * Team upload. + * Upload to unstable to allow side-by-side installation of maven (3.x) + and maven2 packages. + * d/control: Bump Standards-Version to 3.9.3: no changes were required. + * d/copyright: Upgrade to copyright format 1.0. + + -- Damien Raude-Morvan <[email protected]> Thu, 16 Aug 2012 21:05:27 +0200 + +maven2 (2.2.1-11) experimental; urgency=low + + * Team upload. + * Use alternative to install /usr/bin/mvn. + + -- Damien Raude-Morvan <[email protected]> Sat, 17 Dec 2011 23:56:39 +0100 + +maven2 (2.2.1-10) unstable; urgency=low + + * Team upload. + * Rebuild now that libmaven2-core-java 2.2.1-8 is in unstable. + + -- tony mancill <[email protected]> Thu, 13 Oct 2011 19:09:11 -0700 + +maven2 (2.2.1-9) unstable; urgency=low + + * Team upload. + * Rebuild to update plugin versions. + * Make copyright DEP-5 compliant. + + -- Miguel Landaeta <[email protected]> Wed, 12 Oct 2011 17:11:45 -0430 + +maven2 (2.2.1-8) unstable; urgency=low + + * Team upload. + * Rebuild to update plugin versions. + + -- Damien Raude-Morvan <[email protected]> Tue, 11 Oct 2011 23:36:37 +0200 + +maven2 (2.2.1-7) unstable; urgency=low + + * Team upload. + * Rebuild to update plugin versions. + + -- Miguel Landaeta <[email protected]> Sun, 14 Aug 2011 15:06:30 -0430 + +maven2 (2.2.1-6) unstable; urgency=low + + * Team upload. + * No change rebuild in order to re-assemble the uber jar. (Closes: #636206). + * Bump Standards-Version to 3.9.2. No changes were required. + + -- Miguel Landaeta <[email protected]> Tue, 02 Aug 2011 21:56:46 -0430 + +maven2 (2.2.1-5) unstable; urgency=low + + * Remove Paul from Uploaders list. + * Add myself to Uploaders list. + * Build with maven2-core 2.2.1-4. + + -- Torsten Werner <[email protected]> Sun, 16 May 2010 13:43:36 +0200 + +maven2 (2.2.1-4) unstable; urgency=low + + * Improve bash completion for maven2, -D options are better + handled for plugins (for example, mvn install:install-file -DpomFile=...) + * Apply patch from Heikki Henriksen <[email protected]> to + fix mvnDebug command. Thanks Heikki! (Closes: #561596) + + -- Ludovic Claude <[email protected]> Tue, 06 Apr 2010 20:38:51 +0200 + +maven2 (2.2.1-3) unstable; urgency=low + + * Team Upload. + * Rebuild with new libmaven2-core-java 2.2.1-2 + (should fix plugins dependencies version issues) + * Update Standards-Version to 3.8.4: no changes needed + * Bump debhelper to >= 7 + * Use 3.0 (quilt) source format: + - Rework debian/README.source + + -- Damien Raude-Morvan <[email protected]> Mon, 05 Apr 2010 21:39:56 +0200 + +maven2 (2.2.1-2) unstable; urgency=low + + * Rebuild to update plugin versions (Closes: #552704, #553046). + + -- Michael Koch <[email protected]> Tue, 03 Nov 2009 14:41:53 +0100 + +maven2 (2.2.1-1) unstable; urgency=low + + * New upstream release (Closes: #542546) + * Update download url for debian/watch and debian/orig-tar.sh + * Update Standards-Version to 3.8.3 + - add debian/README.source + * Fix bash completion to keep working after single options such + as --offline or -Dmaven.test.skip=true + * Ensure that all classes are compiled for Java 1.5 (Closes: #542162) + + -- Ludovic Claude <[email protected]> Thu, 03 Sep 2009 20:42:38 +0100 + +maven2 (2.2.0-2) unstable; urgency=low + + * Upload to unstable. + + -- Torsten Werner <[email protected]> Fri, 14 Aug 2009 14:59:25 +0200 + +maven2 (2.2.0-1) experimental; urgency=low + + * New upstream version + * Added myself to Uploaders. + * Change section to java, bump Standards-Version to 3.8.1 + * Add a Build-Depends-Indep dependency on maven-repo-helper + * Move ant to Build-Depends (needed for clean target) + * Add dependency on java runtimes for the maven2 binary. + * Change the dependency on java-gcj to default-jdk (Closes: #526295) + * Update watch and added orig-tar.sh to download the sources, + get-orig-source in rules now uses uscan + * Use quilt to manage the patches, add a patch to use the upstream + build.xml as the build file, disabling all dependency downloading from it + * Split the package in 2 parts: maven2-core contains all libraries, + this package contains only the uber jar and the scripts + * Updated the build to use Maven and its plugins to bootstrap itself, + based on a patched version of the build.xml boostrap script provided + with Maven. In particular, it now generates properly the shaded uber-jar, + this will avoid potential class versionning conflicts for the shared + libraries used in the plugins. + * Added Build-Depends-Indep on libmaven-clean-plugin-java, + libmaven-compiler-plugin-java, libmaven-install-plugin-java, + libmaven-jar-plugin-java, libmaven-resources-plugin-java, + libmaven-shade-plugin-java and add a Recommends on those libraries. + * Remove debian/META-INF as this information is now generated by the build. + * Improve command line completion. + + -- Ludovic Claude <[email protected]> Mon, 02 Mar 2009 15:04:20 +0000 + +maven2 (2.0.9-2) unstable; urgency=low + + [ Michael Koch ] + * Reworked watch file to support RC versions correctly. + * Added myself to Uploaders. + + [ Paul Cager ] + * Added maven-toolchain to list of sub-projects to build. + (Closes: #486938). + * Standards version 3.8.0 (no changes necessary). + + -- Paul Cager <[email protected]> Sat, 21 Jun 2008 20:49:29 +0000 + +maven2 (2.0.9-1) unstable; urgency=low + + [ Paul Cager ] + * New upstream version + + [ Michael Koch ] + * Added bash-completion file (Closes: #477443). + + -- Paul Cager <[email protected]> Thu, 24 Apr 2008 23:46:29 +0100 + +maven2 (2.0.8-6) unstable; urgency=low + + * Added symlink /usr/share/maven2/bin/mvn -> /usr/bin/mvn + (and the same for m2). + Fixes bug http://jira.codehaus.org/browse/MINVOKER-28 + (thanks to [email protected] for reporting the bug). + + -- Paul Cager <[email protected]> Fri, 04 Apr 2008 20:15:52 +0100 + +maven2 (2.0.8-5) unstable; urgency=low + + * Fixed processing of command line options (Closes: #466860) + - Removed patch to call of commons-cli, and fixed problem in + commons-cli instead (see bug 469082). + + -- Paul Cager <[email protected]> Sun, 16 Mar 2008 11:44:55 +0000 + +maven2 (2.0.8-4) unstable; urgency=low + + * Closes: #458895: Creating empty project with artifacts fails. + Bug appeared when version 1.1 of libcommons-cli-java was uploaded. This + new version conforms more rigorously to its API check which exposed + a bug in the Maven code. (Patch "command-line"). + + -- Paul Cager <[email protected]> Fri, 11 Jan 2008 23:49:29 +0000 + +maven2 (2.0.8-3) unstable; urgency=low + + * Add versioned runtime dependency to libplexus-utils-java. + + -- Paul Cager <[email protected]> Fri, 14 Dec 2007 22:37:09 +0000 + +maven2 (2.0.8-2) unstable; urgency=low + + * Fixed version number. (Closes: #456298) + + -- Paul Cager <[email protected]> Fri, 14 Dec 2007 13:06:50 +0000 + +maven2 (2.0.8-1) unstable; urgency=low + + * New upstream release (Closes: #454087). + * Added min version to Build-Depends for libplexus-utils-java. + * Added Vcs-Svn control fields etc. + * Marked as compliant to standards version 3.7.3. + + -- Paul Cager <[email protected]> Sun, 02 Dec 2007 23:27:21 +0000 + +maven2 (2.0.7-2) unstable; urgency=low + + * Changed to use correct JDK/JRE defined in Debian's alternatives system, or + any one the user has specifically set up. + (Closes: #445006) + * Uses new "Homepage" field in debian/control. + + -- Paul Cager <[email protected]> Sun, 28 Oct 2007 13:58:23 +0000 + +maven2 (2.0.7-1) unstable; urgency=low + + * Initial release. (Closes: #323050) + + -- Paul Cager <[email protected]> Fri, 06 Jul 2007 16:37:52 +0100 Deleted: tags/maven2/2.2.1-20/debian/compat =================================================================== --- trunk/maven2/debian/compat 2013-10-18 09:06:45 UTC (rev 17347) +++ tags/maven2/2.2.1-20/debian/compat 2014-02-10 23:08:06 UTC (rev 17756) @@ -1 +0,0 @@ -7 Copied: tags/maven2/2.2.1-20/debian/compat (from rev 17357, trunk/maven2/debian/compat) =================================================================== --- tags/maven2/2.2.1-20/debian/compat (rev 0) +++ tags/maven2/2.2.1-20/debian/compat 2014-02-10 23:08:06 UTC (rev 17756) @@ -0,0 +1 @@ +9 Deleted: tags/maven2/2.2.1-20/debian/control =================================================================== --- trunk/maven2/debian/control 2013-10-18 09:06:45 UTC (rev 17347) +++ tags/maven2/2.2.1-20/debian/control 2014-02-10 23:08:06 UTC (rev 17756) @@ -1,40 +0,0 @@ -Source: maven2 -Section: java -Priority: optional -Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Ludovic Claude <[email protected]>, - Torsten Werner <[email protected]> -Build-Depends-Indep: maven-repo-helper, ant-optional, junit, libmaven-clean-plugin-java, - libmaven-compiler-plugin-java, libmaven-install-plugin-java, libmaven-jar-plugin-java, - libmaven-resources-plugin-java, libmaven-shade-plugin-java, - libmaven2-core-java (>= 2.2.1-10~), maven-ant-helper -Build-Depends: debhelper (>= 7), cdbs (>= 0.4.5.3), default-jdk, ant -Standards-Version: 3.9.4 -Homepage: http://maven.apache.org -Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/maven2 -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/maven2 - -Package: maven2 -Architecture: all -Depends: ${misc:Depends}, libmaven2-core-java, - default-jre (>= 1.5) | default-jre-headless (>= 1.5) | java2-runtime | java2-runtime-headless -Recommends: libmaven-clean-plugin-java, - libmaven-compiler-plugin-java, libmaven-install-plugin-java, libmaven-jar-plugin-java, - libmaven-resources-plugin-java, libmaven-shade-plugin-java -Conflicts: maven2-binary -Replaces: maven2-binary -Description: Java software project management and comprehension tool - Maven is a software project management and comprehension tool. Based on the - concept of a project object model (POM), Maven can manage a project's build, - reporting and documentation from a central piece of information. - . - Maven's primary goal is to allow a developer to comprehend the complete - state of a development effort in the shortest period of time. In order to - attain this goal there are several areas of concern that Maven attempts - to deal with: - . - * Making the build process easy - * Providing a uniform build system - * Providing quality project information - * Providing guidelines for best practices development - * Allowing transparent migration to new features Copied: tags/maven2/2.2.1-20/debian/control (from rev 17752, trunk/maven2/debian/control) =================================================================== --- tags/maven2/2.2.1-20/debian/control (rev 0) +++ tags/maven2/2.2.1-20/debian/control 2014-02-10 23:08:06 UTC (rev 17756) @@ -0,0 +1,52 @@ +Source: maven2 +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Ludovic Claude <[email protected]>, + Torsten Werner <[email protected]>, + Emmanuel Bourg <[email protected]> +Build-Depends-Indep: ant-optional, + junit, + libmaven-clean-plugin-java, + libmaven-compiler-plugin-java (>= 2.5.1), + libmaven-install-plugin-java (>= 2.4), + libmaven-jar-plugin-java (>= 2.4), + libmaven-resources-plugin-java, + libmaven-shade-plugin-java (>= 1.7.1), + libmaven2-core-java (>= 2.2.1-15~), + maven-ant-helper, + maven-repo-helper +Build-Depends: ant, cdbs (>= 0.4.5.3), debhelper (>= 9), default-jdk +Standards-Version: 3.9.5 +Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/maven2 +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/maven2 +Homepage: http://maven.apache.org + +Package: maven2 +Architecture: all +Depends: default-jre (>= 1.5) | default-jre-headless (>= 1.5) | java2-runtime | java2-runtime-headless, + libmaven2-core-java, + ${misc:Depends} +Recommends: libmaven-clean-plugin-java, + libmaven-compiler-plugin-java (>= 2.5.1), + libmaven-install-plugin-java (>= 2.4), + libmaven-jar-plugin-java, + libmaven-resources-plugin-java, + libmaven-shade-plugin-java (>= 1.7.1) +Conflicts: maven2-binary +Replaces: maven2-binary +Description: Java software project management and comprehension tool + Maven is a software project management and comprehension tool. Based on the + concept of a project object model (POM), Maven can manage a project's build, + reporting and documentation from a central piece of information. + . + Maven's primary goal is to allow a developer to comprehend the complete + state of a development effort in the shortest period of time. In order to + attain this goal there are several areas of concern that Maven attempts + to deal with: + . + * Making the build process easy + * Providing a uniform build system + * Providing quality project information + * Providing guidelines for best practices development + * Allowing transparent migration to new features Deleted: tags/maven2/2.2.1-20/debian/maven.rules =================================================================== --- trunk/maven2/debian/maven.rules 2013-10-18 09:06:45 UTC (rev 17347) +++ tags/maven2/2.2.1-20/debian/maven.rules 2014-02-10 23:08:06 UTC (rev 17756) @@ -1,5 +0,0 @@ -org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ -# keep the version for all Maven plugins as versionless plugins don't work -* * maven-plugin * -junit junit jar s/3\..*/3.x/ - Copied: tags/maven2/2.2.1-20/debian/maven.rules (from rev 17524, trunk/maven2/debian/maven.rules) =================================================================== --- tags/maven2/2.2.1-20/debian/maven.rules (rev 0) +++ tags/maven2/2.2.1-20/debian/maven.rules 2014-02-10 23:08:06 UTC (rev 17756) @@ -0,0 +1,6 @@ +org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ +# keep the version for all Maven plugins as versionless plugins don't work +* * maven-plugin * +junit junit jar s/3\..*/3.x/ + +org.apache.maven.plugins maven-shade-plugin * s/.*/1.7.1/ Deleted: tags/maven2/2.2.1-20/debian/patches/build.patch =================================================================== --- trunk/maven2/debian/patches/build.patch 2013-10-18 09:06:45 UTC (rev 17347) +++ tags/maven2/2.2.1-20/debian/patches/build.patch 2014-02-10 23:08:06 UTC (rev 17756) @@ -1,194 +0,0 @@ ---- a/build.xml -+++ b/build.xml -@@ -33,21 +33,16 @@ - - --> - --<project default="all" basedir="." xmlns:artifact="urn:maven-artifact-ant"> -+<project default="all" basedir="."> - -- <target name="initTaskDefs" unless="taskdefs.inited"> -- <xmlproperty file="pom.xml" prefix="pom.xml" /> -- <path id="maven-ant-tasks.classpath" path="maven-ant-tasks-2.0.8.jar"/> -- <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath"/> -- <property name="taskdefs.inited" value="true"/> -- </target> -+ <property file="debian/build.properties" /> - - <target name="initLocalRepo"> - <property name="maven.repo.local" location="${user.home}/.m2/repository"/> - <echo>Using the local repository at: ${maven.repo.local}</echo> - </target> - -- <target name="isMavenHomeSet" depends="initTaskDefs"> -+ <target name="isMavenHomeSet"> - <property environment="env"/> - <condition property="maven.home" value="${env.M2_HOME}"> - <isset property="env.M2_HOME"/> -@@ -65,22 +60,13 @@ - <echo>Using Maven home at: ${maven.home}</echo> - </target> - -- <target name="read-poms" depends="initTaskDefs,initLocalRepo" unless="pom.version"> -- <copy file="pom.xml" tofile="dependencies.xml"/> -- <replace file="${basedir}/dependencies.xml" token="<!--start-->" value="<!--"/> -- <replace file="${basedir}/dependencies.xml" token="<!--end-->" value="-->"/> -- <artifact:pom file="${basedir}/dependencies.xml" id="pom"> -- <localRepository path="${maven.repo.local}"/> -- </artifact:pom> -- <delete file="${basedir}/dependencies.xml"/> -- -- <artifact:pom file="${basedir}/maven-integration-tests/pom.xml" id="itPom"> -- <localRepository path="${maven.repo.local}"/> -- </artifact:pom> -- </target> -- - <target name="init" depends="isMavenHomeSet,initLocalRepo"> -- <xmlproperty prefix="pom" file="pom.xml"/> -+ <xmlproperty file="pom.xml" prefix="pom" /> -+ <property name="pom.version" value="${pom.project.version}" /> -+ <xmlproperty file="${basedir}/maven-integration-tests/pom.xml" prefix="itPom" /> -+ <property name="itPom.artifactId" value="${itPom.project.artifactId}" /> -+ <property name="itPom.version" value="${itPom.project.version}" /> -+ <path id="pom.pathid" path="${classpath.compile}" /> - <basename file="${maven.home}" property="maven.home.basename"/> - <dirname file="${maven.home}" property="maven.home.dirname"/> - <!-- Initialize properties --> -@@ -88,6 +74,7 @@ - <property name="maven.assembly" location="apache-maven/target/${maven.home.basename.expected}-bin.zip"/> - <property name="surefire.useFile" value="true"/> - <echo>maven.home = ${maven.home}</echo> -+ <echo>maven.repo.local = ${maven.repo.local}</echo> - <echo>maven.assembly = ${maven.assembly}</echo> - </target> - -@@ -95,44 +82,8 @@ - <delete dir="bootstrap"/> - </target> - -- <target name="pull" depends="init, read-poms" unless="skip.pull"> -- <property name="verbose" value="false"/> -- <!-- Pull the dependencies that Maven needs to build --> -- <artifact:dependencies pathId="pom.pathid" filesetId="pom.fileset" verbose="${verbose}" useScope="compile"> -- <localRepository path="${maven.repo.local}"/> -- <pom refid="pom"/> -- </artifact:dependencies> -- -- <!-- Pull the dependencies for Modello --> -- <artifact:dependencies pathId="modello.pathid" filesetId="modello.fileset" verbose="${verbose}"> -- <localRepository path="${maven.repo.local}"/> -- <dependency groupId="org.codehaus.modello" artifactId="modello-maven-plugin" version="1.0"/> -- <dependency groupId="org.codehaus.modello" artifactId="modello-core" version="1.0"/> -- </artifact:dependencies> -- </target> -- -- <target name="generate-sources" depends="pull" description="generates Java sources from Modello mdo model files"> -- <mkdir dir="bootstrap/target"/> -- <mkdir dir="bootstrap/target/generated-sources"/> -- -- <macrodef name="modello-single-mode"> -- <attribute name="file"/> -- <attribute name="mode"/> -- <attribute name="version"/> -- <sequential> -- <java fork="fork" classname="org.codehaus.modello.ModelloCli" failonerror="true"> -- <classpath refid="modello.pathid"/> -- <arg file="@{file}"/> <!-- model file --> -- <arg value="@{mode}"/> <!-- output type --> -- <arg file="bootstrap/target/generated-sources"/> <!-- output directory --> -- <arg value="@{version}"/> <!-- model version --> -- <arg value="false"/> <!-- package with version --> -- <arg value="true"/> <!-- use Java 5 --> -- <arg value="UTF-8"/> <!-- encoding --> -- </java> -- </sequential> -- </macrodef> -- -+ <target name="generate-sources" description="generates Java sources from Modello mdo model files" /> -+<!-- - <macrodef name="modello"> - <attribute name="file"/> - <attribute name="version" default="1.0.0"/> -@@ -154,8 +105,9 @@ - <modello file="maven-toolchain/src/main/mdo/toolchains.mdo"/> - - </target> -- -+--> - <target name="compile-boot" depends="generate-sources" description="compiles the bootstrap sources"> -+<!-- - <path id="sources"> - <dirset dir="."> - <include name="bootstrap/target/generated-sources"/> -@@ -170,16 +122,48 @@ - <src refid="sources"/> - <classpath refid="pom.pathid"/> - </javac> -- -+--> - <!-- DGF generating a fake pom.properties so Maven thinks it has a version number --> -+<!-- - <mkdir dir="bootstrap/target/classes/META-INF/maven/org.apache.maven/maven-core"/> - <echo message="version=${pom.project.version}" - file="bootstrap/target/classes/META-INF/maven/org.apache.maven/maven-core/pom.properties"/> -- -+--> - <path id="maven.classpath"> -- <pathelement location="bootstrap/target/classes"/> -- <path refid="sources"/> -- <path refid="pom.pathid"/> -+ <pathelement location="debian/tmp/bootstrap"/> -+ <fileset dir="/usr/share/maven-repo"> -+ <include name="classworlds/classworlds/debian/classworlds-debian.jar"/> -+ <include name="com/jcraft/jsch/debian/jsch-debian.jar"/> -+ <include name="commons-cli/commons-cli/debian/commons-cli-debian.jar"/> -+ <include name="junit/junit/debian/junit-debian.jar"/> -+ <include name="org/apache/maven/doxia/doxia-logging-api/debian/doxia-logging-api-debian.jar"/> -+ <include name="org/apache/maven/doxia/doxia-sink-api/debian/doxia-sink-api-debian.jar"/> -+ <include name="org/apache/maven/maven-artifact/debian/maven-artifact-debian.jar"/> -+ <include name="org/apache/maven/maven-artifact-manager/debian/maven-artifact-manager-debian.jar"/> -+ <include name="org/apache/maven/maven-compat/debian/maven-compat-debian.jar"/> -+ <include name="org/apache/maven/maven-core/debian/maven-core-debian.jar"/> -+ <include name="org/apache/maven/maven-error-diagnostics/debian/maven-error-diagnostics-debian.jar"/> -+ <include name="org/apache/maven/maven-model/debian/maven-model-debian.jar"/> -+ <include name="org/apache/maven/maven-monitor/debian/maven-monitor-debian.jar"/> -+ <include name="org/apache/maven/maven-plugin-api/debian/maven-plugin-api-debian.jar"/> -+ <include name="org/apache/maven/maven-plugin-descriptor/debian/maven-plugin-descriptor-debian.jar"/> -+ <include name="org/apache/maven/maven-plugin-parameter-documenter/debian/maven-plugin-parameter-documenter-debian.jar"/> -+ <include name="org/apache/maven/maven-plugin-registry/debian/maven-plugin-registry-debian.jar"/> -+ <include name="org/apache/maven/maven-profile/debian/maven-profile-debian.jar"/> -+ <include name="org/apache/maven/maven-project/debian/maven-project-debian.jar"/> -+ <include name="org/apache/maven/maven-repository-metadata/debian/maven-repository-metadata-debian.jar"/> -+ <include name="org/apache/maven/maven-settings/debian/maven-settings-debian.jar"/> -+ <include name="org/apache/maven/reporting/maven-reporting-api/debian/maven-reporting-api-debian.jar"/> -+ <include name="org/apache/maven/wagon/wagon-provider-api/debian/wagon-provider-api-debian.jar"/> -+ <include name="org/apache/maven/wagon/wagon-ssh-common/debian/wagon-ssh-common-debian.jar"/> -+ <include name="org/apache/maven/wagon/wagon-ssh/debian/wagon-ssh-debian.jar"/> -+ <include name="org/codehaus/plexus/plexus-container-default/1.0-alpha/plexus-container-default-1.0-alpha.jar"/> -+ <include name="org/codehaus/plexus/plexus-interactivity-api/debian/plexus-interactivity-api-debian.jar"/> -+ <include name="org/codehaus/plexus/plexus-interpolation/debian/plexus-interpolation-debian.jar"/> -+ <include name="org/codehaus/plexus/plexus-utils/debian/plexus-utils-debian.jar"/> -+ <include name="org/sonatype/plexus/plexus-cipher/debian/plexus-cipher-debian.jar"/> -+ <include name="org/sonatype/plexus/plexus-sec-dispatcher/debian/plexus-sec-dispatcher-debian.jar"/> -+ </fileset> - </path> - </target> - -@@ -193,6 +177,7 @@ - <jvmarg value="-Djava.compiler=NONE"/> --> - - <classpath refid="maven.classpath"/> -+ <arg value="--offline"/> - <arg value="-e"/> - <arg value="-B"/> - <arg value="clean"/> -@@ -314,9 +299,4 @@ - - <target name="with-its" depends="all,run-its"/> - -- <target name="set-temp-maven-home" depends="read-poms"> -- <property name="maven.home" location="${java.io.tmpdir}/apache-maven-${pom.version}"/> -- <echo>Using temporary maven install directory: ${maven.home}</echo> -- </target> -- - </project> Copied: tags/maven2/2.2.1-20/debian/patches/build.patch (from rev 17486, trunk/maven2/debian/patches/build.patch) =================================================================== --- tags/maven2/2.2.1-20/debian/patches/build.patch (rev 0) +++ tags/maven2/2.2.1-20/debian/patches/build.patch 2014-02-10 23:08:06 UTC (rev 17756) @@ -0,0 +1,195 @@ +--- a/build.xml ++++ b/build.xml +@@ -33,21 +33,16 @@ + + --> + +-<project default="all" basedir="." xmlns:artifact="urn:maven-artifact-ant"> ++<project default="all" basedir="."> + +- <target name="initTaskDefs" unless="taskdefs.inited"> +- <xmlproperty file="pom.xml" prefix="pom.xml" /> +- <path id="maven-ant-tasks.classpath" path="maven-ant-tasks-2.0.8.jar"/> +- <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath"/> +- <property name="taskdefs.inited" value="true"/> +- </target> ++ <property file="debian/build.properties" /> + + <target name="initLocalRepo"> + <property name="maven.repo.local" location="${user.home}/.m2/repository"/> + <echo>Using the local repository at: ${maven.repo.local}</echo> + </target> + +- <target name="isMavenHomeSet" depends="initTaskDefs"> ++ <target name="isMavenHomeSet"> + <property environment="env"/> + <condition property="maven.home" value="${env.M2_HOME}"> + <isset property="env.M2_HOME"/> +@@ -65,22 +60,13 @@ + <echo>Using Maven home at: ${maven.home}</echo> + </target> + +- <target name="read-poms" depends="initTaskDefs,initLocalRepo" unless="pom.version"> +- <copy file="pom.xml" tofile="dependencies.xml"/> +- <replace file="${basedir}/dependencies.xml" token="<!--start-->" value="<!--"/> +- <replace file="${basedir}/dependencies.xml" token="<!--end-->" value="-->"/> +- <artifact:pom file="${basedir}/dependencies.xml" id="pom"> +- <localRepository path="${maven.repo.local}"/> +- </artifact:pom> +- <delete file="${basedir}/dependencies.xml"/> +- +- <artifact:pom file="${basedir}/maven-integration-tests/pom.xml" id="itPom"> +- <localRepository path="${maven.repo.local}"/> +- </artifact:pom> +- </target> +- + <target name="init" depends="isMavenHomeSet,initLocalRepo"> +- <xmlproperty prefix="pom" file="pom.xml"/> ++ <xmlproperty file="pom.xml" prefix="pom" /> ++ <property name="pom.version" value="${pom.project.version}" /> ++ <xmlproperty file="${basedir}/maven-integration-tests/pom.xml" prefix="itPom" /> ++ <property name="itPom.artifactId" value="${itPom.project.artifactId}" /> ++ <property name="itPom.version" value="${itPom.project.version}" /> ++ <path id="pom.pathid" path="${classpath.compile}" /> + <basename file="${maven.home}" property="maven.home.basename"/> + <dirname file="${maven.home}" property="maven.home.dirname"/> + <!-- Initialize properties --> +@@ -88,6 +74,7 @@ + <property name="maven.assembly" location="apache-maven/target/${maven.home.basename.expected}-bin.zip"/> + <property name="surefire.useFile" value="true"/> + <echo>maven.home = ${maven.home}</echo> ++ <echo>maven.repo.local = ${maven.repo.local}</echo> + <echo>maven.assembly = ${maven.assembly}</echo> + </target> + +@@ -95,44 +82,8 @@ + <delete dir="bootstrap"/> + </target> + +- <target name="pull" depends="init, read-poms" unless="skip.pull"> +- <property name="verbose" value="false"/> +- <!-- Pull the dependencies that Maven needs to build --> +- <artifact:dependencies pathId="pom.pathid" filesetId="pom.fileset" verbose="${verbose}" useScope="compile"> +- <localRepository path="${maven.repo.local}"/> +- <pom refid="pom"/> +- </artifact:dependencies> +- +- <!-- Pull the dependencies for Modello --> +- <artifact:dependencies pathId="modello.pathid" filesetId="modello.fileset" verbose="${verbose}"> +- <localRepository path="${maven.repo.local}"/> +- <dependency groupId="org.codehaus.modello" artifactId="modello-maven-plugin" version="1.0"/> +- <dependency groupId="org.codehaus.modello" artifactId="modello-core" version="1.0"/> +- </artifact:dependencies> +- </target> +- +- <target name="generate-sources" depends="pull" description="generates Java sources from Modello mdo model files"> +- <mkdir dir="bootstrap/target"/> +- <mkdir dir="bootstrap/target/generated-sources"/> +- +- <macrodef name="modello-single-mode"> +- <attribute name="file"/> +- <attribute name="mode"/> +- <attribute name="version"/> +- <sequential> +- <java fork="fork" classname="org.codehaus.modello.ModelloCli" failonerror="true"> +- <classpath refid="modello.pathid"/> +- <arg file="@{file}"/> <!-- model file --> +- <arg value="@{mode}"/> <!-- output type --> +- <arg file="bootstrap/target/generated-sources"/> <!-- output directory --> +- <arg value="@{version}"/> <!-- model version --> +- <arg value="false"/> <!-- package with version --> +- <arg value="true"/> <!-- use Java 5 --> +- <arg value="UTF-8"/> <!-- encoding --> +- </java> +- </sequential> +- </macrodef> +- ++ <target name="generate-sources" description="generates Java sources from Modello mdo model files" /> ++<!-- + <macrodef name="modello"> + <attribute name="file"/> + <attribute name="version" default="1.0.0"/> +@@ -154,8 +105,9 @@ + <modello file="maven-toolchain/src/main/mdo/toolchains.mdo"/> + + </target> +- ++--> + <target name="compile-boot" depends="generate-sources" description="compiles the bootstrap sources"> ++<!-- + <path id="sources"> + <dirset dir="."> + <include name="bootstrap/target/generated-sources"/> +@@ -170,16 +122,49 @@ + <src refid="sources"/> + <classpath refid="pom.pathid"/> + </javac> +- ++--> + <!-- DGF generating a fake pom.properties so Maven thinks it has a version number --> ++<!-- + <mkdir dir="bootstrap/target/classes/META-INF/maven/org.apache.maven/maven-core"/> + <echo message="version=${pom.project.version}" + file="bootstrap/target/classes/META-INF/maven/org.apache.maven/maven-core/pom.properties"/> +- ++--> + <path id="maven.classpath"> +- <pathelement location="bootstrap/target/classes"/> +- <path refid="sources"/> +- <path refid="pom.pathid"/> ++ <pathelement location="debian/tmp/bootstrap"/> ++ <fileset dir="/usr/share/maven-repo"> ++ <include name="classworlds/classworlds/debian/classworlds-debian.jar"/> ++ <include name="com/jcraft/jsch/debian/jsch-debian.jar"/> ++ <include name="commons-cli/commons-cli/debian/commons-cli-debian.jar"/> ++ <include name="junit/junit/debian/junit-debian.jar"/> ++ <include name="org/apache/maven/doxia/doxia-logging-api/debian/doxia-logging-api-debian.jar"/> ++ <include name="org/apache/maven/doxia/doxia-sink-api/debian/doxia-sink-api-debian.jar"/> ++ <include name="org/apache/maven/maven-artifact/debian/maven-artifact-debian.jar"/> ++ <include name="org/apache/maven/maven-artifact-manager/debian/maven-artifact-manager-debian.jar"/> ++ <include name="org/apache/maven/maven-compat/debian/maven-compat-debian.jar"/> ++ <include name="org/apache/maven/maven-core/debian/maven-core-debian.jar"/> ++ <include name="org/apache/maven/maven-error-diagnostics/debian/maven-error-diagnostics-debian.jar"/> ++ <include name="org/apache/maven/maven-model/debian/maven-model-debian.jar"/> ++ <include name="org/apache/maven/maven-monitor/debian/maven-monitor-debian.jar"/> ++ <include name="org/apache/maven/maven-plugin-api/debian/maven-plugin-api-debian.jar"/> ++ <include name="org/apache/maven/maven-plugin-descriptor/debian/maven-plugin-descriptor-debian.jar"/> ++ <include name="org/apache/maven/maven-plugin-parameter-documenter/debian/maven-plugin-parameter-documenter-debian.jar"/> ++ <include name="org/apache/maven/maven-plugin-registry/debian/maven-plugin-registry-debian.jar"/> ++ <include name="org/apache/maven/maven-profile/debian/maven-profile-debian.jar"/> ++ <include name="org/apache/maven/maven-project/debian/maven-project-debian.jar"/> ++ <include name="org/apache/maven/maven-repository-metadata/debian/maven-repository-metadata-debian.jar"/> ++ <include name="org/apache/maven/maven-settings/debian/maven-settings-debian.jar"/> ++ <include name="org/apache/maven/maven-toolchain/debian/maven-toolchain-debian.jar"/> ++ <include name="org/apache/maven/reporting/maven-reporting-api/debian/maven-reporting-api-debian.jar"/> ++ <include name="org/apache/maven/wagon/wagon-provider-api/debian/wagon-provider-api-debian.jar"/> ++ <include name="org/apache/maven/wagon/wagon-ssh-common/debian/wagon-ssh-common-debian.jar"/> ++ <include name="org/apache/maven/wagon/wagon-ssh/debian/wagon-ssh-debian.jar"/> ++ <include name="org/codehaus/plexus/plexus-container-default/1.0-alpha/plexus-container-default-1.0-alpha.jar"/> ++ <include name="org/codehaus/plexus/plexus-interactivity-api/debian/plexus-interactivity-api-debian.jar"/> ++ <include name="org/codehaus/plexus/plexus-interpolation/debian/plexus-interpolation-debian.jar"/> ++ <include name="org/codehaus/plexus/plexus-utils/debian/plexus-utils-debian.jar"/> ++ <include name="org/sonatype/plexus/plexus-cipher/debian/plexus-cipher-debian.jar"/> ++ <include name="org/sonatype/plexus/plexus-sec-dispatcher/debian/plexus-sec-dispatcher-debian.jar"/> ++ </fileset> + </path> + </target> + +@@ -193,6 +178,7 @@ + <jvmarg value="-Djava.compiler=NONE"/> --> + + <classpath refid="maven.classpath"/> ++ <arg value="--offline"/> + <arg value="-e"/> + <arg value="-B"/> + <arg value="clean"/> +@@ -314,9 +300,4 @@ + + <target name="with-its" depends="all,run-its"/> + +- <target name="set-temp-maven-home" depends="read-poms"> +- <property name="maven.home" location="${java.io.tmpdir}/apache-maven-${pom.version}"/> +- <echo>Using temporary maven install directory: ${maven.home}</echo> +- </target> +- + </project> Deleted: tags/maven2/2.2.1-20/debian/rules =================================================================== --- trunk/maven2/debian/rules 2013-10-18 09:06:45 UTC (rev 17347) +++ tags/maven2/2.2.1-20/debian/rules 2014-02-10 23:08:06 UTC (rev 17756) @@ -1,45 +0,0 @@ -#!/usr/bin/make -f - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk - -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(DEB_UPSTREAM_VERSION) -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := ant-trax -DEB_ANT_BUILD_TARGET := maven-compile -DEB_ANT_BUILDFILE := build.xml -DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -Dmaven.repo.local=$(realpath $(DEB_BUILDDIR))/debian/tmp/maven-repo -API_DOCS := build/doc/api -BASE_MODULES := apache-maven maven-artifact-manager maven-artifact \ - maven-core maven-error-diagnostics maven-model maven-monitor \ - maven-plugin-api maven-plugin-descriptor maven-plugin-parameter-documenter \ - maven-plugin-registry maven-profile maven-project maven-repository-metadata \ - maven-settings maven-toolchain - -get-orig-source: - -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename - -configure/$(PACKAGE):: - mh_patchpoms -p$(PACKAGE) - -makebuilddir/$(PACKAGE):: - install -d $(DEB_BUILDDIR)/debian/tmp/bootstrap/META-INF/plexus - install debian/components.xml $(DEB_BUILDDIR)/debian/tmp/bootstrap/META-INF/plexus/ - install -d $(DEB_BUILDDIR)/debian/tmp/maven-repo - cp -rL /usr/share/maven-repo/* $(DEB_BUILDDIR)/debian/tmp/maven-repo/ - -binary-post-install/$(PACKAGE):: - dh_install -p$(PACKAGE) apache-maven/target/maven-debian-uber.jar usr/share/maven2/lib/ - # compress manpages - find $(DEB_BUILDDIR)/debian/$(PACKAGE)/usr/share/maven2/man -type f | xargs gzip -9v -n - chmod 0755 $(DEB_BUILDDIR)/debian/$(PACKAGE)/usr/share/maven2/bin/mvnDebug - -clean:: - mh_unpatchpoms -p$(PACKAGE) - -rm -rf debian/tmp/mvn-repo - -find . -name target -type d | xargs rm -rf - -# No documentation released yet. -#binary-post-install/$(PACKAGE)-doc:: - Copied: tags/maven2/2.2.1-20/debian/rules (from rev 17524, trunk/maven2/debian/rules) =================================================================== --- tags/maven2/2.2.1-20/debian/rules (rev 0) +++ tags/maven2/2.2.1-20/debian/rules 2014-02-10 23:08:06 UTC (rev 17756) @@ -0,0 +1,47 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/ant.mk + +PACKAGE := $(DEB_SOURCE_PACKAGE) +VERSION := $(DEB_UPSTREAM_VERSION) +JAVA_HOME := /usr/lib/jvm/default-java +DEB_JARS := ant-trax +DEB_ANT_BUILD_TARGET := maven-compile +DEB_ANT_CLEAN_TARGET := clean-bootstrap +DEB_ANT_BUILDFILE := build.xml +DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -Dmaven.repo.local=$(realpath $(DEB_BUILDDIR))/debian/tmp/maven-repo +API_DOCS := build/doc/api +BASE_MODULES := apache-maven maven-artifact-manager maven-artifact \ + maven-core maven-error-diagnostics maven-model maven-monitor \ + maven-plugin-api maven-plugin-descriptor maven-plugin-parameter-documenter \ + maven-plugin-registry maven-profile maven-project maven-repository-metadata \ + maven-settings maven-toolchain + +get-orig-source: + -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename + +configure/$(PACKAGE):: + mh_patchpoms -p$(PACKAGE) + +makebuilddir/$(PACKAGE):: + install -d $(DEB_BUILDDIR)/debian/tmp/bootstrap/META-INF/plexus + install debian/components.xml $(DEB_BUILDDIR)/debian/tmp/bootstrap/META-INF/plexus/ + install -d $(DEB_BUILDDIR)/debian/tmp/maven-repo + cp -rL /usr/share/maven-repo/* $(DEB_BUILDDIR)/debian/tmp/maven-repo/ + +binary-post-install/$(PACKAGE):: + dh_install -p$(PACKAGE) apache-maven/target/maven-debian-uber.jar usr/share/maven2/lib/ + # compress manpages + find $(DEB_BUILDDIR)/debian/$(PACKAGE)/usr/share/maven2/man -type f | xargs gzip -9v -n + chmod 0755 $(DEB_BUILDDIR)/debian/$(PACKAGE)/usr/share/maven2/bin/mvnDebug + +clean:: + # The poms are already unpatched at the end of the build but the pom.xml.save files are still there, why? + rm -Rf apache-maven/pom.xml.save pom.xml.save + -rm -rf debian/tmp/mvn-repo + -find . -name target -type d | xargs rm -rf + +# No documentation released yet. +#binary-post-install/$(PACKAGE)-doc:: + _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
