[pkg-java] r15381 - in tags/maven-ant-helper: . 7.5 7.5/debian

Ludovic Claude ludovicc-guest at alioth.debian.org
Sun Nov 13 22:44:29 UTC 2011


Author: ludovicc-guest
Date: 2011-11-13 22:44:28 +0000 (Sun, 13 Nov 2011)
New Revision: 15381

Added:
   tags/maven-ant-helper/7.5/
   tags/maven-ant-helper/7.5/debian/changelog
   tags/maven-ant-helper/7.5/maven-build.xml
   tags/maven-ant-helper/7.5/maven-defaults.properties
Removed:
   tags/maven-ant-helper/7.5/debian/changelog
   tags/maven-ant-helper/7.5/maven-build.xml
   tags/maven-ant-helper/7.5/maven-defaults.properties
Log:
[svn-buildpackage] Tagging maven-ant-helper 7.5

Deleted: tags/maven-ant-helper/7.5/debian/changelog
===================================================================
--- trunk/maven-ant-helper/debian/changelog	2011-11-10 21:34:11 UTC (rev 15373)
+++ tags/maven-ant-helper/7.5/debian/changelog	2011-11-13 22:44:28 UTC (rev 15381)
@@ -1,190 +0,0 @@
-maven-ant-helper (7.4) unstable; urgency=low
-
-  [ Ludovic Claude ]
-  * process-test-resources now ignores Java files when copying
-
-  [ Torsten Werner ]
-  * Remove Trydge and Paul from Uploaders list.
-
- -- Torsten Werner <twerner at debian.org>  Tue, 27 Sep 2011 17:38:59 +0200
-
-maven-ant-helper (7.3) unstable; urgency=low
-
-  * maven-build.xml: Fix read of properties in *.poms files by changing
-    regexp and set cleaner.options only if not already defined.
-    (Closes: #629894).
-  * debian/rules: Remove ant-trax from classpath (doesn't exist anymore since
-    Ant 1.8).
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 26 Jun 2011 19:14:05 +0200
-
-maven-ant-helper (7.2) unstable; urgency=low
-
-  * Upload to unstable.
-
- -- Torsten Werner <twerner at debian.org>  Wed, 09 Feb 2011 21:34:32 +0100
-
-maven-ant-helper (7.1) experimental; urgency=low
-
-  [ Ludovic Claude ]
-  * Add a javadoc-jar target which generates a jar file containing the javadoc
-  * Add a default build-all target which can run the build and optionally
-    generate javadoc and its jar if generate.javadoc property is set
-
-  [ Damien Raude-Morvan ]
-  * d/rules: Remove simple-patchsys.mk since d/source/format is 3.0 (native).
-  * d/control, d/compat: Bump debhelper compat level to 7.
-  * d/control: Add myself as Uploaders.
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 05 Dec 2010 20:01:13 +0100
-
-maven-ant-helper (7.0) experimental; urgency=low
-
-  * Update Standards-Version to 3.9.1, use source format 3.0 (native)  
-  * Use default-jdk-doc instead of openjdk-6-doc when linking
-    Javadoc files (Closes: #587361)
-  * d/control: add Suggests: default-jdk-doc, move all Recommends: to Suggest
-    as they are not needed except when Maven is called within the Ant build,
-    add maven-repo-helper to Depends as it's now always used from the jar task
-  * maven-build.xml: add -N option to Maven to avoid recursive actions,
-    reorder actions in mvn-package and give to the POMCleaner the location
-    of the local Maven repository which can be used when deciding when to
-    replace a parent version by a its symbolic version (fixes
-    maven-debian-helper build),
-    add local-install and package-and-local-install target to deal with
-    composite projects which need to install some of their build elements in
-    the local repository, for consuption by other parts of the build,
-    deprecate passing the 'version' variable to Ant as it's read from the POM file,
-    remove macro prepare-package-list, update paths to the JDK docs.
- 
- -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 14 Oct 2010 00:08:38 +0200
-
-maven-ant-helper (6.8) unstable; urgency=low
-
-  * Use default-jdk-doc instead of openjdk-6-doc when linking
-    Javadoc files
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 28 Mar 2010 21:55:57 +0200
-
-maven-ant-helper (6.7) unstable; urgency=low
-
-  * Do no longer <gunzip/> the package-list file from openjdk-6-doc.
-    (Closes: #573660)
-
- -- Torsten Werner <twerner at debian.org>  Sat, 13 Mar 2010 10:24:35 +0100
-
-maven-ant-helper (6.6) unstable; urgency=low
-
-  * Revert previous change as openjdk6-doc is not required
-    for most builds. Update the affected packages in a
-    separate update.
-  * Bump up Standards-Version to 3.8.3, no changes
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Wed, 02 Sep 2009 21:22:49 +0100
-
-maven-ant-helper (6.5) unstable; urgency=low
-
-  * Add Build-Depends: openjdk-6-doc to fix build errors. (Closes: #543106,
-    #543112, #543115, #543116)
-
- -- Torsten Werner <twerner at debian.org>  Sun, 23 Aug 2009 10:13:54 +0200
-
-maven-ant-helper (6.4) unstable; urgency=low
-
-  * Upload to unstable.
-
- -- Torsten Werner <twerner at debian.org>  Sun, 09 Aug 2009 13:04:01 +0200
-
-maven-ant-helper (6.3) experimental; urgency=low
-
-  * Update Standards-Version to 3.8.2
-  * Add ant and ant-optional to Depends:
-  * Add more Suggest: packages (libmaven-plugin-plugin-java and
-    libplexus-components-metadata-java as they provide useful
-    Maven plugin often used in the build)
-  * Add support for linking generated Javadoc to other 
-    documented libraries.
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 16 Jul 2009 22:34:35 +0100
-
-maven-ant-helper (6.2) experimental; urgency=low
-
-  * Fix a bug introduced by previous version. It was affecting
-    only the builds which execute a Maven plugin.
-  * Add more workaround to use gcj with maven-ant-helper, this time
-    avoid using gnu xml stream when reading XML documents.
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Wed, 08 Jul 2009 23:41:02 +0100
-
-maven-ant-helper (6.1) unstable; urgency=low
-
-  * Provide a workaround to use gcj with maven-ant-helper
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Tue, 07 Jul 2009 22:46:18 +0100
-
-maven-ant-helper (6) unstable; urgency=low
-
-  * Add support for custom manifest
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Tue, 07 Jul 2009 19:46:22 +0100
-
-maven-ant-helper (5) unstable; urgency=low
-
-  * Change section to java, bump up Standards-Version: 3.8.1.
-  * Add myself to uploaders
-  * Add a Build-Depends-Indep dependency on ${misc:Depends}
-  * Fix ModelloTask to work with modello >= 1.0, add new properties
-    useJava5 and encoding. 
-  * maven-build.xml: add build.javaVersion property to allow
-    building Java 1.5 sources with this script, defaults to 1.4,
-    fix javadoc target to use any packages under the current sources
-  * Change the dependency on java-gcj to default-jdk (Closes: #526298)
-  * Support optional source folders
-  * Use maven-repo-helper to clean and include the pom information
-    into the META-INF folder, as Maven does
-  * Add support for running Maven plugins without using the full Maven
-    program. Great for building core Maven plugins used in the Maven
-    build itself.
-  * Add Recommends on libmaven2-core-java and maven-repo-helper as those
-    are used in optional parts of maven-build.xml
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Mon, 30 Mar 2009 18:11:32 +0100
-
-maven-ant-helper (4) experimental; urgency=low
-
-  * Update modello ant task to support the new modello package.
-  * Add myself to Uploaders.
-  * Add Homepage and Vcs headers in debian/control.
-  * Bump up Standards-Version: 3.8.0.
-  * Do no longer quote the full text of the Apache license in
-    debian/copyright.
-  * Add a copyright statement.
-
- -- Torsten Werner <twerner at debian.org>  Wed, 07 Jan 2009 20:07:51 +0100
-
-maven-ant-helper (3) unstable; urgency=low
-
-  * Changed "Depends: libmodello-java" to a "Recommends".
-    - Some clients may not use the Modello Ant task.
-
- -- Paul Cager <paul-debian at home.paulcager.org>  Fri, 15 Jun 2007 21:53:48 +0100
-
-maven-ant-helper (2) unstable; urgency=low
-
-  * Initial public release (Closes: #428643)
-  
-  * Changes following review by Michael Koch:
-    - Copyright file changed to follow dh_make's format.
-    - Version number changed to single integer.
-    - Ported to CDBS format.
-    - Created ITP closed by this upload.
-
-  * Added brief usage notes in README.
-
- -- Paul Cager <paul-debian at home.paulcager.org>  Wed, 13 Jun 2007 11:03:27 +0100
-
-maven-ant-helper (1.0) unstable; urgency=low
-
-  * Initial Release to pkg-java project.
-
- -- Trygve Laugstol <trygvis at inamo.no>  Sun, 27 May 2007 03:30:35 +0200

Copied: tags/maven-ant-helper/7.5/debian/changelog (from rev 15380, trunk/maven-ant-helper/debian/changelog)
===================================================================
--- tags/maven-ant-helper/7.5/debian/changelog	                        (rev 0)
+++ tags/maven-ant-helper/7.5/debian/changelog	2011-11-13 22:44:28 UTC (rev 15381)
@@ -0,0 +1,199 @@
+maven-ant-helper (7.5) unstable; urgency=low
+
+  * Use Java 1.5 for compiling and source level compatibility
+    by default (Closes: #644941)
+  * Fix issue when test sources are missing and maven.test.skip is not set
+    to true
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 30 Oct 2011 19:56:27 +0100
+
+maven-ant-helper (7.4) unstable; urgency=low
+
+  [ Ludovic Claude ]
+  * process-test-resources now ignores Java files when copying
+
+  [ Torsten Werner ]
+  * Remove Trydge and Paul from Uploaders list.
+
+ -- Torsten Werner <twerner at debian.org>  Tue, 27 Sep 2011 17:38:59 +0200
+
+maven-ant-helper (7.3) unstable; urgency=low
+
+  * maven-build.xml: Fix read of properties in *.poms files by changing
+    regexp and set cleaner.options only if not already defined.
+    (Closes: #629894).
+  * debian/rules: Remove ant-trax from classpath (doesn't exist anymore since
+    Ant 1.8).
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 26 Jun 2011 19:14:05 +0200
+
+maven-ant-helper (7.2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Torsten Werner <twerner at debian.org>  Wed, 09 Feb 2011 21:34:32 +0100
+
+maven-ant-helper (7.1) experimental; urgency=low
+
+  [ Ludovic Claude ]
+  * Add a javadoc-jar target which generates a jar file containing the javadoc
+  * Add a default build-all target which can run the build and optionally
+    generate javadoc and its jar if generate.javadoc property is set
+
+  [ Damien Raude-Morvan ]
+  * d/rules: Remove simple-patchsys.mk since d/source/format is 3.0 (native).
+  * d/control, d/compat: Bump debhelper compat level to 7.
+  * d/control: Add myself as Uploaders.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 05 Dec 2010 20:01:13 +0100
+
+maven-ant-helper (7.0) experimental; urgency=low
+
+  * Update Standards-Version to 3.9.1, use source format 3.0 (native)  
+  * Use default-jdk-doc instead of openjdk-6-doc when linking
+    Javadoc files (Closes: #587361)
+  * d/control: add Suggests: default-jdk-doc, move all Recommends: to Suggest
+    as they are not needed except when Maven is called within the Ant build,
+    add maven-repo-helper to Depends as it's now always used from the jar task
+  * maven-build.xml: add -N option to Maven to avoid recursive actions,
+    reorder actions in mvn-package and give to the POMCleaner the location
+    of the local Maven repository which can be used when deciding when to
+    replace a parent version by a its symbolic version (fixes
+    maven-debian-helper build),
+    add local-install and package-and-local-install target to deal with
+    composite projects which need to install some of their build elements in
+    the local repository, for consuption by other parts of the build,
+    deprecate passing the 'version' variable to Ant as it's read from the POM file,
+    remove macro prepare-package-list, update paths to the JDK docs.
+ 
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 14 Oct 2010 00:08:38 +0200
+
+maven-ant-helper (6.8) unstable; urgency=low
+
+  * Use default-jdk-doc instead of openjdk-6-doc when linking
+    Javadoc files
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 28 Mar 2010 21:55:57 +0200
+
+maven-ant-helper (6.7) unstable; urgency=low
+
+  * Do no longer <gunzip/> the package-list file from openjdk-6-doc.
+    (Closes: #573660)
+
+ -- Torsten Werner <twerner at debian.org>  Sat, 13 Mar 2010 10:24:35 +0100
+
+maven-ant-helper (6.6) unstable; urgency=low
+
+  * Revert previous change as openjdk6-doc is not required
+    for most builds. Update the affected packages in a
+    separate update.
+  * Bump up Standards-Version to 3.8.3, no changes
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Wed, 02 Sep 2009 21:22:49 +0100
+
+maven-ant-helper (6.5) unstable; urgency=low
+
+  * Add Build-Depends: openjdk-6-doc to fix build errors. (Closes: #543106,
+    #543112, #543115, #543116)
+
+ -- Torsten Werner <twerner at debian.org>  Sun, 23 Aug 2009 10:13:54 +0200
+
+maven-ant-helper (6.4) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Torsten Werner <twerner at debian.org>  Sun, 09 Aug 2009 13:04:01 +0200
+
+maven-ant-helper (6.3) experimental; urgency=low
+
+  * Update Standards-Version to 3.8.2
+  * Add ant and ant-optional to Depends:
+  * Add more Suggest: packages (libmaven-plugin-plugin-java and
+    libplexus-components-metadata-java as they provide useful
+    Maven plugin often used in the build)
+  * Add support for linking generated Javadoc to other 
+    documented libraries.
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 16 Jul 2009 22:34:35 +0100
+
+maven-ant-helper (6.2) experimental; urgency=low
+
+  * Fix a bug introduced by previous version. It was affecting
+    only the builds which execute a Maven plugin.
+  * Add more workaround to use gcj with maven-ant-helper, this time
+    avoid using gnu xml stream when reading XML documents.
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Wed, 08 Jul 2009 23:41:02 +0100
+
+maven-ant-helper (6.1) unstable; urgency=low
+
+  * Provide a workaround to use gcj with maven-ant-helper
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Tue, 07 Jul 2009 22:46:18 +0100
+
+maven-ant-helper (6) unstable; urgency=low
+
+  * Add support for custom manifest
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Tue, 07 Jul 2009 19:46:22 +0100
+
+maven-ant-helper (5) unstable; urgency=low
+
+  * Change section to java, bump up Standards-Version: 3.8.1.
+  * Add myself to uploaders
+  * Add a Build-Depends-Indep dependency on ${misc:Depends}
+  * Fix ModelloTask to work with modello >= 1.0, add new properties
+    useJava5 and encoding. 
+  * maven-build.xml: add build.javaVersion property to allow
+    building Java 1.5 sources with this script, defaults to 1.4,
+    fix javadoc target to use any packages under the current sources
+  * Change the dependency on java-gcj to default-jdk (Closes: #526298)
+  * Support optional source folders
+  * Use maven-repo-helper to clean and include the pom information
+    into the META-INF folder, as Maven does
+  * Add support for running Maven plugins without using the full Maven
+    program. Great for building core Maven plugins used in the Maven
+    build itself.
+  * Add Recommends on libmaven2-core-java and maven-repo-helper as those
+    are used in optional parts of maven-build.xml
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Mon, 30 Mar 2009 18:11:32 +0100
+
+maven-ant-helper (4) experimental; urgency=low
+
+  * Update modello ant task to support the new modello package.
+  * Add myself to Uploaders.
+  * Add Homepage and Vcs headers in debian/control.
+  * Bump up Standards-Version: 3.8.0.
+  * Do no longer quote the full text of the Apache license in
+    debian/copyright.
+  * Add a copyright statement.
+
+ -- Torsten Werner <twerner at debian.org>  Wed, 07 Jan 2009 20:07:51 +0100
+
+maven-ant-helper (3) unstable; urgency=low
+
+  * Changed "Depends: libmodello-java" to a "Recommends".
+    - Some clients may not use the Modello Ant task.
+
+ -- Paul Cager <paul-debian at home.paulcager.org>  Fri, 15 Jun 2007 21:53:48 +0100
+
+maven-ant-helper (2) unstable; urgency=low
+
+  * Initial public release (Closes: #428643)
+  
+  * Changes following review by Michael Koch:
+    - Copyright file changed to follow dh_make's format.
+    - Version number changed to single integer.
+    - Ported to CDBS format.
+    - Created ITP closed by this upload.
+
+  * Added brief usage notes in README.
+
+ -- Paul Cager <paul-debian at home.paulcager.org>  Wed, 13 Jun 2007 11:03:27 +0100
+
+maven-ant-helper (1.0) unstable; urgency=low
+
+  * Initial Release to pkg-java project.
+
+ -- Trygve Laugstol <trygvis at inamo.no>  Sun, 27 May 2007 03:30:35 +0200

Deleted: tags/maven-ant-helper/7.5/maven-build.xml
===================================================================
--- trunk/maven-ant-helper/maven-build.xml	2011-11-10 21:34:11 UTC (rev 15373)
+++ tags/maven-ant-helper/7.5/maven-build.xml	2011-11-13 22:44:28 UTC (rev 15381)
@@ -1,475 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="pkg-java" default="build-all" basedir="." xmlns:c="antlib:net.sf.antcontrib">
-    <taskdef uri="antlib:net.sf.antcontrib"
-            resource="net/sf/antcontrib/antlib.xml"
-            classpath="/usr/share/java/ant-contrib.jar"/>
-
-    <!--
-       maven-build.xml - an Ant build script that reproduces the Maven build life-cycle.
-
-       You can use the following properties when launching this script:
-       
-       basedir: you need to supply the basedir, otherwise Ant will use the current location of this script,
-         which is not what you want. For example, use: 
-           DEB_ANT_ARGS := -Dpackage=$(realpath .)
-       package: the name of the source package. For example, use: 
-           DEB_ANT_ARGS := -Dversion=$(DEB_SOURCE_PACKAGE) 
-       bin.package: the name of the binary package. Defaults to lib${package}-java
-       version: DEPRECATED - the version of the project, used in the name of the jar. 
-       debian.dir: the location of the debian directory. Defaults to ${basedir}/debian
-       project.dir: the location of the current project. Defaults to ""
-       pom.name: the name of the pom file. Must appear as it is in the debian/${bin.package}.poms file
-       pom.file: the location of the pom file. Defaults to ${pom.name}
-       maven.generate.target: if set, calls Maven with the given target before compiling code. For example, use
-          maven.generate.target = plugin:generate to generate the plugin descriptor for a Maven plugin.
-       maven.generate.target2: if set, calls Maven with another given target before compiling code. For example, use
-          maven.generate.target2 = org.codehaus.plexus:plexus-component-metadata:${plexus-component-metadata.version}:generate-metadata
-          to generate the Plexus components descriptor.
-       maven.package.target: if set, calls Maven with the given target after packaging the jar. For example, use
-          maven.target.target = shade:shade to use the shade plugin and repackage the contents of the jar.
-       keep-cleaned-pom: if set, keeps the cleaned pom after packaging. If can be restored later by calling
-          maven-build.xml with the restore-pom target (without the keep-cleaned-pom property set).
-       use-local-repo: if set, then Maven will use a local repository copied from /usr/share/maven-repo into
-          debian/.mh. This allows you to install some custom or intermediate artifacts, handy for multi modules builds.
-       dependency, dependency2, dependency3...: Give the name of the dependent packages. Those packages will be
-          used to form the links to the Javadoc APIs from the generated Javadoc. 
-          The links are of the form: file:///usr/share/doc/${dependency}/api
-          Up to 15 dependencies can be defined here. Example use:
-            dependency=libcommons-lang-java
-            dependency2=libcommons-logging-java
-       javadoc.generate: if set, the default target (build-all) will build the project and generate the Javadoc
-
-       The properties can be defined also in debian/build.properties, and they will override properties
-       defined in /usr/share/maven-ant-helper/maven-defaults.properties.
-
-       If you provide a pom file to your project, or the project already contains a pom file,
-       then it will be read. You need to add /usr/share/java/ant-nodeps.jar to the classpath
-       for this functionality to work.
- 
-       When using the Maven target, you need to add libmaven2-core-java to Build-Depends, as well as the
-       library containing the Maven plugin to execute (libmaven-plugin-tools-java for plugin:generate, 
-       libplexus-component-metadata-java for org.codehaus.plexus:plexus-component-metadata:generate-metadata)
-     -->
-
-    <property name="bin.package" value="lib${package}-java" />
-    <property name="debian.dir" value="${basedir}/debian" />
-    <property name="project.dir" value="" />
-    <property name="debian.poms" value="${debian.dir}/${bin.package}.poms" />
-    <property file="${debian.dir}/build.properties"/>
-    <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
-    <property name="xml-input-factory" value="com.bea.xml.stream.MXParserFactory" />
-    <property name="xml-output-factory" value="com.bea.xml.stream.XMLOutputFactoryBase" />
-
-    <target name="init.pom">
-        <condition property="use-local-repo" value="true">
-            <isset property="maven.package.target" />
-        </condition>
-        <condition property="pom.file" value="pom.xml">
-            <not>
-                <isset property="pom.name" />
-            </not>
-        </condition>
-        <condition property="pom.name" value="pom.xml" else="${project.dir}/pom.xml">
-            <equals arg1="" arg2="${project.dir}" />
-        </condition>
-        <property name="pom.file" value="${pom.name}" />
-        <condition property="available.pom">
-            <and>
-                <available file="${debian.poms}"/>
-                <available file="${pom.file}"/>
-            </and>
-        </condition>
-
-        <echo message="Base dir is ${basedir}" />
-        <echo message="Pom name in ${debian.poms}: ${pom.name}" />
-        <echo message="Pom file ${pom.file} available? ${available.pom}" />
-
-        <path id="repo-helper.classpath">
-          <fileset dir="/usr/share/maven-repo">
-            <include name="org/debian/maven/maven-repo-helper/debian/maven-repo-helper-debian.jar" />
-            <include name="stax/stax-api/debian/stax-api-debian.jar" />
-            <include name="stax/stax/debian/stax-debian.jar" />
-            <include name="xml-apis/xml-apis/debian/xml-apis-debian.jar" />
-          </fileset>
-        </path>
-
-        <path id="maven.classpath">
-          <pathelement location="/usr/share/maven-ant-helper/bootstrap"/>
-          <fileset dir="/usr/share/maven-repo">
-            <include name="backport-util-concurrent/backport-util-concurrent/debian/backport-util-concurrent-debian.jar"/>
-            <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="xml-apis/xml-apis/debian/xml-apis-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-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>
-
-    <!-- /usr/share/java/ant-nodeps.jar must be in the classpath -->
-    <target name="read.pom" depends="init.pom" if="available.pom">
-
-        <loadfile srcfile="${debian.poms}" property="cleaner.options">
-            <filterchain>
-               <linecontainsregexp>
-                   <regexp pattern="^${pom.name}" />
-               </linecontainsregexp>
-               <tokenfilter>
-                 <containsregex
-                     pattern="[^ ]*(.*)"
-                     replace="\1"/>
-               </tokenfilter>
-               <striplinebreaks/>
-            </filterchain>
-        </loadfile>
-        <!-- Default value -->
-        <condition property="cleaner.options" value="">
-            <not>  
-                <isset property="cleaner.options"/>
-            </not>
-        </condition>
-
-        <mkdir dir="${debian.dir}/.mh" /> 
-        <delete>
-           <fileset dir="${debian.dir}/.mh">
-              <include name="pom.xml" />
-              <include name="pom.properties" />
-           </fileset>
-        </delete> 
-
-        <property name="pom.loc" location="${pom.file}" />
-        <c:if>
-            <not><equals arg1="pom.xml" arg2="${pom.name}"/></not>
-            <then>
-                <c:var name="cleaner.options" value="${cleaner.options} --keep-parent-version" />
-            </then>
-        </c:if>
-        <echo message="Cleaner options:${cleaner.options}" />
-
-        <java fork="true" dir="." 
-           classname="org.debian.maven.repo.POMCleaner">
-           <classpath refid="repo-helper.classpath"/>
-           <sysproperty key="javax.xml.stream.XMLInputFactory" value="${xml-input-factory}" />
-           <sysproperty key="javax.xml.stream.XMLOutputFactory" value="${xml-output-factory}" />
-           <arg value="-p${bin.package}" />
-           <arg value="-r${debian.dir}/maven.rules" />
-           <arg value="-i${debian.dir}/maven.publishedRules" />
-           <arg value="--maven-repo=${debian.dir}/.mh/maven-repo" />
-           <arg value="--verbose" />
-           <arg line="${cleaner.options} --keep-pom-version" />
-           <arg value="${pom.loc}" />
-           <arg value="${debian.dir}/.mh/pom.xml" />
-           <arg value="${debian.dir}/.mh/pom.properties" />
-        </java> 
-        <copy file="${pom.file}" tofile="${pom.file}.save" />
-        <!-- force the pom file to be located in the current dir, we'll need it when running Maven plugins -->
-        <copy file="${debian.dir}/.mh/pom.xml" tofile="${pom.file}" overwrite="true" />
-
-        <!-- Read groupId, artifactId, version from the POM file -->
-        <c:var name="groupId" unset="true" /> 
-        <c:var name="artifactId" unset="true" /> 
-        <c:var name="version" unset="true" /> 
-        <c:var name="debianVersion" unset="true" /> 
-        <c:var name="classifier" unset="true" /> 
-        <c:var name="type" unset="true" />
-        <property file="${debian.dir}/.mh/pom.properties"/>
-
-        <pathconvert property="groupPath">
-            <path location="${groupId}"/>
-            <filtermapper>
-                <replacestring from="." to="/"/>
-            </filtermapper>
-        </pathconvert>
-
-        <echo message="Properties read from the POM file:" />
-        <echo message="  groupId: ${groupId}, artifactId: ${artifactId}, version: ${version}, debianVersion: ${debianVersion}" />
-    </target>
-
-    <target name="init" depends="read.pom">
-        <available property="available.sources" file="${build.sourceDirectory}"/>
-        <available property="available.resources" file="${build.resourcesDirectory}"/>
-        <available property="available.testResources" file="${build.testResourcesDirectory}"/>
-        <available property="available.testSources" file="${build.testSourceDirectory}"/>
-
-        <fail unless="artifactId" message="Missing required property: artifactId"/>
-        <fail unless="version" message="Missing required property: version"/>
-        <fail unless="basedir" message="Missing required property: basedir"/>
-
-        <echo message="Compile classpath: ${classpath.full.compile}"/>
-        <echo message="Test classpath: ${classpath.full.test}"/>
-    </target>
-
-    <!--
-     | LIFECYCLE: Clean
-     |-->
-
-    <target name="clean">
-        <delete dir="${build.directory}"/>
-    </target>
-
-    <!--
-     | LIFECYCLE: jar
-     |
-     | This mimics the default Maven build life-cycle: http://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html
-     |-->
-
-     <target name="process-resources" depends="init" if="available.resources">
-        <mkdir dir="${build.outputDirectory}"/>
-        <copy todir="${build.outputDirectory}">
-            <fileset dir="${build.resourcesDirectory}"/>
-        </copy>
-     </target>
-
-    <target name="process-pom" depends="init" if="available.pom">
-        <mkdir dir="${build.outputDirectory}/META-INF/maven/${groupId}/${artifactId}"/>
-        <copy todir="${build.outputDirectory}/META-INF/maven/${groupId}/${artifactId}">
-            <fileset dir="${debian.dir}/.mh">
-               <include name="pom.xml" />
-               <include name="pom.properties" />
-            </fileset>
-        </copy>
-    </target>
-
-    <macrodef name="run-maven">
-      <attribute name="target"/>
-      <sequential>
-        <java fork="true" dir="." classname="org.apache.maven.cli.MavenCli" failonerror="true">
-          <jvmarg value="-Xmx256M"/>
-          <classpath refid="maven.classpath"/>
-          <arg value="-Dmaven.test.skip"/>
-          <arg value="--offline"/>
-          <arg value="-e"/>
-          <arg value="-B"/>
-          <arg value="-N"/>
-          <arg value="-s${debian.dir}/maven-settings.xml"/>
-          <arg value="@{target}"/>
-        </java>
-      </sequential>      
-    </macrodef>
-
-    <macrodef name="run-maven-local-repo">
-      <attribute name="target"/>
-      <element name="before-maven" optional="true" />
-      <sequential>
-        <mkdir dir="${debian.dir}/.mh/maven-repo" /> 
-        <copy todir="${debian.dir}/.mh/maven-repo">
-            <fileset dir="/usr/share/maven-repo" />
-        </copy>
-
-        <before-maven/>
-
-        <java fork="true" dir="." classname="org.apache.maven.cli.MavenCli" failonerror="true">
-          <jvmarg value="-Xmx256M"/>
-          <classpath refid="maven.classpath"/>
-          <arg value="-Dmaven.test.skip"/>
-          <arg value="--offline"/>
-          <arg value="-e"/>
-          <arg value="-B"/>
-          <arg value="-N"/>
-          <arg value="--offline"/>
-          <arg value="-Dmaven.repo.local=${debian.dir}/.mh/maven-repo"/>
-          <arg value="@{target}"/>
-        </java>
-      </sequential>      
-    </macrodef>
-
-    <target name="mvn-shared-repo" unless="use-local-repo">
-        <!-- Calls mvn ${maven.generate.target} -->
-        <run-maven target="${_target}" />
-    </target>
-    <target name="mvn-local-repo" if="use-local-repo">
-        <!-- Calls mvn ${maven.generate.target} -->
-        <run-maven-local-repo target="${_target}" />
-    </target>
-    <target name="mvn" depends="mvn-shared-repo,mvn-local-repo" />
-
-    <target name="mvn-generate" depends="init" if="maven.generate.target">
-        <antcall target="mvn" inheritRefs="true">
-            <param name="_target" value="${maven.generate.target}" />
-        </antcall> 
-    </target>
-
-    <target name="mvn-generate2" depends="init" if="maven.generate.target2">
-        <antcall target="mvn" inheritRefs="true">
-            <param name="_target" value="${maven.generate.target2}" />
-        </antcall> 
-    </target>
-
-    <target name="compile" depends="process-resources,process-pom,mvn-generate,mvn-generate2" if="available.sources">
-        <mkdir dir="${build.outputDirectory}"/>
-        <mkdir dir="${build.directory}/generated-sources"/>
-        <javac
-            destdir="${build.outputDirectory}"
-            classpath="${classpath.compile}"
-            nowarn="true"
-            source="${build.javaVersion}" target="${build.javaVersion}"
-            debug="on">
-            <src path="${build.sourceDirectory}"/>
-            <src path="${build.directory}/generated-sources"/>
-        </javac>
-    </target>
-
-    <target name="process-test-resources" depends="compile" if="available.testResources" unless="maven.test.skip">
-        <mkdir dir="${build.testOutputDirectory}"/>
-        <copy todir="${build.testOutputDirectory}">
-            <fileset dir="${build.testResourcesDirectory}">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-     </target>
-
-    <target name="test-compile" depends="process-test-resources" if="available.testSources" unless="maven.test.skip">
-        <mkdir dir="${build.testOutputDirectory}"/>
-        <javac
-            destdir="${build.testOutputDirectory}"
-            classpath="${classpath.full.test}"
-            nowarn="true"
-            source="${build.javaVersion}" target="${build.javaVersion}"
-            debug="on">
-            <src path="${build.testSourceDirectory}"/>
-        </javac>
-    </target>
-
-    <target name="test" depends="test-compile" unless="maven.test.skip">
-        <mkdir dir="${build.directory}/test-output"/>
-        <junit printsummary="yes" haltonfailure="no"> <!--  fork="yes" forkmode="once" -->
-            <sysproperty key="basedir" value="${basedir}"/>
-            <classpath>
-                <pathelement path="${classpath.full.test}"/>
-            </classpath>
-
-            <formatter type="plain"/>
-            <batchtest todir="${build.directory}/test-output">
-                <fileset dir="${build.testSourceDirectory}">
-                    <include name="**/*Test.java"/>
-                    <exclude name="**/Abstract*"/>
-                    <exclude name="${maven.test.exclude}"/>
-                </fileset>
-            </batchtest>
-        </junit>
-    </target>
-
-    <target name="jar" depends="test">
-        <jar jarfile="${build.directory}/${artifactId}-${version}.jar"
-            basedir="${build.outputDirectory}"
-            manifest="${manifest}" />
-    </target>
-
-    <target name="mvn-package" depends="jar" if="maven.package.target">
-        <!-- Calls mvn ${maven.package.target} -->
-        <run-maven-local-repo target="${maven.package.target}" />
-    </target>
-
-    <target name="local-install" depends="jar">
-        <mkdir dir="${debian.dir}/.mh/maven-repo/${groupPath}/${artifactId}/${version}" />
-        <copy file="${pom.file}" tofile="${debian.dir}/.mh/maven-repo/${groupPath}/${artifactId}/${version}/${artifactId}-${version}.pom" />
-        <c:if>
-          <or>
-            <equals arg1="${type}" arg2="jar" />
-            <equals arg1="${type}" arg2="bundle" />
-          </or>
-          <then>
-            <copy file="${build.directory}/${artifactId}-${version}.jar" todir="${debian.dir}/.mh/maven-repo/${groupPath}/${artifactId}/" />
-          </then>
-        </c:if>
-    </target>
-
-    <target name="restore-pom" depends="init.pom" unless="keep-cleaned-pom"> 
-        <!-- restore the pom file -->
-        <copy file="${pom.file}.save" tofile="${pom.file}" overwrite="true"/>
-    </target>
- 
-    <target name="package" depends="jar,mvn-package,restore-pom" />
-    <target name="package-and-local-install" depends="package,local-install" />
-
-    <target name="build-all" depends="package">
-        <c:if>
-            <isset property="javadoc.generate" />
-            <then>
-                <antcall target="javadoc-jar" />
-            </then> 
-        </c:if>
-    </target>
-
-    <!--
-     | Javadoc
-     |-->
-
-    <target name="javadoc" depends="read.pom">
-        <mkdir dir="${javadoc.dir}"/>
-        <javadoc 
-            source="${build.javaVersion}"
-            sourcepath="${build.sourceDirectory}"
-            destdir="${javadoc.dir}"
-            author="true"
-            version="true"
-            windowtitle="${package} API"
-            doctitle="${package} - ${version}"
-            classpath="${classpath.full.compile}" >
-
-            <packageset dir="${build.sourceDirectory}" defaultexcludes="yes">
-                <include name="**"/>
-            </packageset>
-            <link href="file:///usr/share/doc/default-jdk-doc/api" packagelistLoc="/usr/share/doc/default-jdk/api/" />
-            <link href="file:///usr/share/doc/openjdk-6-doc/api" packagelistLoc="/usr/share/doc/openjdk-6/api/" />
-            <link href="file:///usr/share/doc/classpath-doc/api" />
-            <link href="file:///usr/share/doc/${dependency}/api" />
-            <link href="file:///usr/share/doc/${dependency2}/api" />
-            <link href="file:///usr/share/doc/${dependency3}/api" />
-            <link href="file:///usr/share/doc/${dependency4}/api" />
-            <link href="file:///usr/share/doc/${dependency5}/api" />
-            <link href="file:///usr/share/doc/${dependency6}/api" />
-            <link href="file:///usr/share/doc/${dependency7}/api" />
-            <link href="file:///usr/share/doc/${dependency8}/api" />
-            <link href="file:///usr/share/doc/${dependency9}/api" />
-            <link href="file:///usr/share/doc/${dependency10}/api" />
-            <link href="file:///usr/share/doc/${dependency11}/api" />
-            <link href="file:///usr/share/doc/${dependency12}/api" />
-            <link href="file:///usr/share/doc/${dependency13}/api" />
-            <link href="file:///usr/share/doc/${dependency14}/api" />
-            <link href="file:///usr/share/doc/${dependency15}/api" />
-        </javadoc>
-    </target>
-
-    <target name="javadoc-jar" depends="javadoc">
-        <echoxml file="${build.directory}/${artifactId}.javadoc.pom">
-            <project>
-                <modelVersion>4.0.0</modelVersion>
-                <groupId>${groupId}</groupId>
-                <artifactId>${artifactId}</artifactId>
-                <version>${version}</version>
-            </project>
-        </echoxml>
-        <jar jarfile="${build.directory}/${artifactId}.javadoc.jar"
-            basedir="${javadoc.dir}" />
-    </target>
-
-</project>

Copied: tags/maven-ant-helper/7.5/maven-build.xml (from rev 15378, trunk/maven-ant-helper/maven-build.xml)
===================================================================
--- tags/maven-ant-helper/7.5/maven-build.xml	                        (rev 0)
+++ tags/maven-ant-helper/7.5/maven-build.xml	2011-11-13 22:44:28 UTC (rev 15381)
@@ -0,0 +1,475 @@
+<?xml version="1.0"?>
+
+<project name="pkg-java" default="build-all" basedir="." xmlns:c="antlib:net.sf.antcontrib">
+    <taskdef uri="antlib:net.sf.antcontrib"
+            resource="net/sf/antcontrib/antlib.xml"
+            classpath="/usr/share/java/ant-contrib.jar"/>
+
+    <!--
+       maven-build.xml - an Ant build script that reproduces the Maven build life-cycle.
+
+       You can use the following properties when launching this script:
+       
+       basedir: you need to supply the basedir, otherwise Ant will use the current location of this script,
+         which is not what you want. For example, use: 
+           DEB_ANT_ARGS := -Dpackage=$(realpath .)
+       package: the name of the source package. For example, use: 
+           DEB_ANT_ARGS := -Dversion=$(DEB_SOURCE_PACKAGE) 
+       bin.package: the name of the binary package. Defaults to lib${package}-java
+       version: DEPRECATED - the version of the project, used in the name of the jar. 
+       debian.dir: the location of the debian directory. Defaults to ${basedir}/debian
+       project.dir: the location of the current project. Defaults to ""
+       pom.name: the name of the pom file. Must appear as it is in the debian/${bin.package}.poms file
+       pom.file: the location of the pom file. Defaults to ${pom.name}
+       maven.generate.target: if set, calls Maven with the given target before compiling code. For example, use
+          maven.generate.target = plugin:generate to generate the plugin descriptor for a Maven plugin.
+       maven.generate.target2: if set, calls Maven with another given target before compiling code. For example, use
+          maven.generate.target2 = org.codehaus.plexus:plexus-component-metadata:${plexus-component-metadata.version}:generate-metadata
+          to generate the Plexus components descriptor.
+       maven.package.target: if set, calls Maven with the given target after packaging the jar. For example, use
+          maven.target.target = shade:shade to use the shade plugin and repackage the contents of the jar.
+       keep-cleaned-pom: if set, keeps the cleaned pom after packaging. If can be restored later by calling
+          maven-build.xml with the restore-pom target (without the keep-cleaned-pom property set).
+       use-local-repo: if set, then Maven will use a local repository copied from /usr/share/maven-repo into
+          debian/.mh. This allows you to install some custom or intermediate artifacts, handy for multi modules builds.
+       dependency, dependency2, dependency3...: Give the name of the dependent packages. Those packages will be
+          used to form the links to the Javadoc APIs from the generated Javadoc. 
+          The links are of the form: file:///usr/share/doc/${dependency}/api
+          Up to 15 dependencies can be defined here. Example use:
+            dependency=libcommons-lang-java
+            dependency2=libcommons-logging-java
+       javadoc.generate: if set, the default target (build-all) will build the project and generate the Javadoc
+
+       The properties can be defined also in debian/build.properties, and they will override properties
+       defined in /usr/share/maven-ant-helper/maven-defaults.properties.
+
+       If you provide a pom file to your project, or the project already contains a pom file,
+       then it will be read. You need to add /usr/share/java/ant-nodeps.jar to the classpath
+       for this functionality to work.
+ 
+       When using the Maven target, you need to add libmaven2-core-java to Build-Depends, as well as the
+       library containing the Maven plugin to execute (libmaven-plugin-tools-java for plugin:generate, 
+       libplexus-component-metadata-java for org.codehaus.plexus:plexus-component-metadata:generate-metadata)
+     -->
+
+    <property name="bin.package" value="lib${package}-java" />
+    <property name="debian.dir" value="${basedir}/debian" />
+    <property name="project.dir" value="" />
+    <property name="debian.poms" value="${debian.dir}/${bin.package}.poms" />
+    <property file="${debian.dir}/build.properties"/>
+    <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
+    <property name="xml-input-factory" value="com.bea.xml.stream.MXParserFactory" />
+    <property name="xml-output-factory" value="com.bea.xml.stream.XMLOutputFactoryBase" />
+
+    <target name="init.pom">
+        <condition property="use-local-repo" value="true">
+            <isset property="maven.package.target" />
+        </condition>
+        <condition property="pom.file" value="pom.xml">
+            <not>
+                <isset property="pom.name" />
+            </not>
+        </condition>
+        <condition property="pom.name" value="pom.xml" else="${project.dir}/pom.xml">
+            <equals arg1="" arg2="${project.dir}" />
+        </condition>
+        <property name="pom.file" value="${pom.name}" />
+        <condition property="available.pom">
+            <and>
+                <available file="${debian.poms}"/>
+                <available file="${pom.file}"/>
+            </and>
+        </condition>
+
+        <echo message="Base dir is ${basedir}" />
+        <echo message="Pom name in ${debian.poms}: ${pom.name}" />
+        <echo message="Pom file ${pom.file} available? ${available.pom}" />
+
+        <path id="repo-helper.classpath">
+          <fileset dir="/usr/share/maven-repo">
+            <include name="org/debian/maven/maven-repo-helper/debian/maven-repo-helper-debian.jar" />
+            <include name="stax/stax-api/debian/stax-api-debian.jar" />
+            <include name="stax/stax/debian/stax-debian.jar" />
+            <include name="xml-apis/xml-apis/debian/xml-apis-debian.jar" />
+          </fileset>
+        </path>
+
+        <path id="maven.classpath">
+          <pathelement location="/usr/share/maven-ant-helper/bootstrap"/>
+          <fileset dir="/usr/share/maven-repo">
+            <include name="backport-util-concurrent/backport-util-concurrent/debian/backport-util-concurrent-debian.jar"/>
+            <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="xml-apis/xml-apis/debian/xml-apis-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-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>
+
+    <!-- /usr/share/java/ant-nodeps.jar must be in the classpath -->
+    <target name="read.pom" depends="init.pom" if="available.pom">
+
+        <loadfile srcfile="${debian.poms}" property="cleaner.options">
+            <filterchain>
+               <linecontainsregexp>
+                   <regexp pattern="^${pom.name}" />
+               </linecontainsregexp>
+               <tokenfilter>
+                 <containsregex
+                     pattern="[^ ]*(.*)"
+                     replace="\1"/>
+               </tokenfilter>
+               <striplinebreaks/>
+            </filterchain>
+        </loadfile>
+        <!-- Default value -->
+        <condition property="cleaner.options" value="">
+            <not>  
+                <isset property="cleaner.options"/>
+            </not>
+        </condition>
+
+        <mkdir dir="${debian.dir}/.mh" /> 
+        <delete>
+           <fileset dir="${debian.dir}/.mh">
+              <include name="pom.xml" />
+              <include name="pom.properties" />
+           </fileset>
+        </delete> 
+
+        <property name="pom.loc" location="${pom.file}" />
+        <c:if>
+            <not><equals arg1="pom.xml" arg2="${pom.name}"/></not>
+            <then>
+                <c:var name="cleaner.options" value="${cleaner.options} --keep-parent-version" />
+            </then>
+        </c:if>
+        <echo message="Cleaner options:${cleaner.options}" />
+
+        <java fork="true" dir="." 
+           classname="org.debian.maven.repo.POMCleaner">
+           <classpath refid="repo-helper.classpath"/>
+           <sysproperty key="javax.xml.stream.XMLInputFactory" value="${xml-input-factory}" />
+           <sysproperty key="javax.xml.stream.XMLOutputFactory" value="${xml-output-factory}" />
+           <arg value="-p${bin.package}" />
+           <arg value="-r${debian.dir}/maven.rules" />
+           <arg value="-i${debian.dir}/maven.publishedRules" />
+           <arg value="--maven-repo=${debian.dir}/.mh/maven-repo" />
+           <arg value="--verbose" />
+           <arg line="${cleaner.options} --keep-pom-version" />
+           <arg value="${pom.loc}" />
+           <arg value="${debian.dir}/.mh/pom.xml" />
+           <arg value="${debian.dir}/.mh/pom.properties" />
+        </java> 
+        <copy file="${pom.file}" tofile="${pom.file}.save" />
+        <!-- force the pom file to be located in the current dir, we'll need it when running Maven plugins -->
+        <copy file="${debian.dir}/.mh/pom.xml" tofile="${pom.file}" overwrite="true" />
+
+        <!-- Read groupId, artifactId, version from the POM file -->
+        <c:var name="groupId" unset="true" /> 
+        <c:var name="artifactId" unset="true" /> 
+        <c:var name="version" unset="true" /> 
+        <c:var name="debianVersion" unset="true" /> 
+        <c:var name="classifier" unset="true" /> 
+        <c:var name="type" unset="true" />
+        <property file="${debian.dir}/.mh/pom.properties"/>
+
+        <pathconvert property="groupPath">
+            <path location="${groupId}"/>
+            <filtermapper>
+                <replacestring from="." to="/"/>
+            </filtermapper>
+        </pathconvert>
+
+        <echo message="Properties read from the POM file:" />
+        <echo message="  groupId: ${groupId}, artifactId: ${artifactId}, version: ${version}, debianVersion: ${debianVersion}" />
+    </target>
+
+    <target name="init" depends="read.pom">
+        <available property="available.sources" file="${build.sourceDirectory}"/>
+        <available property="available.resources" file="${build.resourcesDirectory}"/>
+        <available property="available.testResources" file="${build.testResourcesDirectory}"/>
+        <available property="available.testSources" file="${build.testSourceDirectory}"/>
+
+        <fail unless="artifactId" message="Missing required property: artifactId"/>
+        <fail unless="version" message="Missing required property: version"/>
+        <fail unless="basedir" message="Missing required property: basedir"/>
+
+        <echo message="Compile classpath: ${classpath.full.compile}"/>
+        <echo message="Test classpath: ${classpath.full.test}"/>
+    </target>
+
+    <!--
+     | LIFECYCLE: Clean
+     |-->
+
+    <target name="clean">
+        <delete dir="${build.directory}"/>
+    </target>
+
+    <!--
+     | LIFECYCLE: jar
+     |
+     | This mimics the default Maven build life-cycle: http://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html
+     |-->
+
+     <target name="process-resources" depends="init" if="available.resources">
+        <mkdir dir="${build.outputDirectory}"/>
+        <copy todir="${build.outputDirectory}">
+            <fileset dir="${build.resourcesDirectory}"/>
+        </copy>
+     </target>
+
+    <target name="process-pom" depends="init" if="available.pom">
+        <mkdir dir="${build.outputDirectory}/META-INF/maven/${groupId}/${artifactId}"/>
+        <copy todir="${build.outputDirectory}/META-INF/maven/${groupId}/${artifactId}">
+            <fileset dir="${debian.dir}/.mh">
+               <include name="pom.xml" />
+               <include name="pom.properties" />
+            </fileset>
+        </copy>
+    </target>
+
+    <macrodef name="run-maven">
+      <attribute name="target"/>
+      <sequential>
+        <java fork="true" dir="." classname="org.apache.maven.cli.MavenCli" failonerror="true">
+          <jvmarg value="-Xmx256M"/>
+          <classpath refid="maven.classpath"/>
+          <arg value="-Dmaven.test.skip"/>
+          <arg value="--offline"/>
+          <arg value="-e"/>
+          <arg value="-B"/>
+          <arg value="-N"/>
+          <arg value="-s${debian.dir}/maven-settings.xml"/>
+          <arg value="@{target}"/>
+        </java>
+      </sequential>      
+    </macrodef>
+
+    <macrodef name="run-maven-local-repo">
+      <attribute name="target"/>
+      <element name="before-maven" optional="true" />
+      <sequential>
+        <mkdir dir="${debian.dir}/.mh/maven-repo" /> 
+        <copy todir="${debian.dir}/.mh/maven-repo">
+            <fileset dir="/usr/share/maven-repo" />
+        </copy>
+
+        <before-maven/>
+
+        <java fork="true" dir="." classname="org.apache.maven.cli.MavenCli" failonerror="true">
+          <jvmarg value="-Xmx256M"/>
+          <classpath refid="maven.classpath"/>
+          <arg value="-Dmaven.test.skip"/>
+          <arg value="--offline"/>
+          <arg value="-e"/>
+          <arg value="-B"/>
+          <arg value="-N"/>
+          <arg value="--offline"/>
+          <arg value="-Dmaven.repo.local=${debian.dir}/.mh/maven-repo"/>
+          <arg value="@{target}"/>
+        </java>
+      </sequential>      
+    </macrodef>
+
+    <target name="mvn-shared-repo" unless="use-local-repo">
+        <!-- Calls mvn ${maven.generate.target} -->
+        <run-maven target="${_target}" />
+    </target>
+    <target name="mvn-local-repo" if="use-local-repo">
+        <!-- Calls mvn ${maven.generate.target} -->
+        <run-maven-local-repo target="${_target}" />
+    </target>
+    <target name="mvn" depends="mvn-shared-repo,mvn-local-repo" />
+
+    <target name="mvn-generate" depends="init" if="maven.generate.target">
+        <antcall target="mvn" inheritRefs="true">
+            <param name="_target" value="${maven.generate.target}" />
+        </antcall> 
+    </target>
+
+    <target name="mvn-generate2" depends="init" if="maven.generate.target2">
+        <antcall target="mvn" inheritRefs="true">
+            <param name="_target" value="${maven.generate.target2}" />
+        </antcall> 
+    </target>
+
+    <target name="compile" depends="process-resources,process-pom,mvn-generate,mvn-generate2" if="available.sources">
+        <mkdir dir="${build.outputDirectory}"/>
+        <mkdir dir="${build.directory}/generated-sources"/>
+        <javac
+            destdir="${build.outputDirectory}"
+            classpath="${classpath.compile}"
+            nowarn="true"
+            source="${build.javaVersion}" target="${build.javaVersion}"
+            debug="on">
+            <src path="${build.sourceDirectory}"/>
+            <src path="${build.directory}/generated-sources"/>
+        </javac>
+    </target>
+
+    <target name="process-test-resources" depends="compile" if="available.testResources" unless="maven.test.skip">
+        <mkdir dir="${build.testOutputDirectory}"/>
+        <copy todir="${build.testOutputDirectory}">
+            <fileset dir="${build.testResourcesDirectory}">
+                <exclude name="**/*.java" />
+            </fileset>
+        </copy>
+     </target>
+
+    <target name="test-compile" depends="process-test-resources" if="available.testSources" unless="maven.test.skip">
+        <mkdir dir="${build.testOutputDirectory}"/>
+        <javac
+            destdir="${build.testOutputDirectory}"
+            classpath="${classpath.full.test}"
+            nowarn="true"
+            source="${build.javaVersion}" target="${build.javaVersion}"
+            debug="on">
+            <src path="${build.testSourceDirectory}"/>
+        </javac>
+    </target>
+
+    <target name="test" depends="test-compile" if="available.testSources" unless="maven.test.skip">
+        <mkdir dir="${build.directory}/test-output"/>
+        <junit printsummary="yes" haltonfailure="no"> <!--  fork="yes" forkmode="once" -->
+            <sysproperty key="basedir" value="${basedir}"/>
+            <classpath>
+                <pathelement path="${classpath.full.test}"/>
+            </classpath>
+
+            <formatter type="plain"/>
+            <batchtest todir="${build.directory}/test-output">
+                <fileset dir="${build.testSourceDirectory}">
+                    <include name="**/*Test.java"/>
+                    <exclude name="**/Abstract*"/>
+                    <exclude name="${maven.test.exclude}"/>
+                </fileset>
+            </batchtest>
+        </junit>
+    </target>
+
+    <target name="jar" depends="test">
+        <jar jarfile="${build.directory}/${artifactId}-${version}.jar"
+            basedir="${build.outputDirectory}"
+            manifest="${manifest}" />
+    </target>
+
+    <target name="mvn-package" depends="jar" if="maven.package.target">
+        <!-- Calls mvn ${maven.package.target} -->
+        <run-maven-local-repo target="${maven.package.target}" />
+    </target>
+
+    <target name="local-install" depends="jar">
+        <mkdir dir="${debian.dir}/.mh/maven-repo/${groupPath}/${artifactId}/${version}" />
+        <copy file="${pom.file}" tofile="${debian.dir}/.mh/maven-repo/${groupPath}/${artifactId}/${version}/${artifactId}-${version}.pom" />
+        <c:if>
+          <or>
+            <equals arg1="${type}" arg2="jar" />
+            <equals arg1="${type}" arg2="bundle" />
+          </or>
+          <then>
+            <copy file="${build.directory}/${artifactId}-${version}.jar" todir="${debian.dir}/.mh/maven-repo/${groupPath}/${artifactId}/" />
+          </then>
+        </c:if>
+    </target>
+
+    <target name="restore-pom" depends="init.pom" unless="keep-cleaned-pom"> 
+        <!-- restore the pom file -->
+        <copy file="${pom.file}.save" tofile="${pom.file}" overwrite="true"/>
+    </target>
+ 
+    <target name="package" depends="jar,mvn-package,restore-pom" />
+    <target name="package-and-local-install" depends="package,local-install" />
+
+    <target name="build-all" depends="package">
+        <c:if>
+            <isset property="javadoc.generate" />
+            <then>
+                <antcall target="javadoc-jar" />
+            </then> 
+        </c:if>
+    </target>
+
+    <!--
+     | Javadoc
+     |-->
+
+    <target name="javadoc" depends="read.pom">
+        <mkdir dir="${javadoc.dir}"/>
+        <javadoc 
+            source="${build.javaVersion}"
+            sourcepath="${build.sourceDirectory}"
+            destdir="${javadoc.dir}"
+            author="true"
+            version="true"
+            windowtitle="${package} API"
+            doctitle="${package} - ${version}"
+            classpath="${classpath.full.compile}" >
+
+            <packageset dir="${build.sourceDirectory}" defaultexcludes="yes">
+                <include name="**"/>
+            </packageset>
+            <link href="file:///usr/share/doc/default-jdk-doc/api" packagelistLoc="/usr/share/doc/default-jdk/api/" />
+            <link href="file:///usr/share/doc/openjdk-6-doc/api" packagelistLoc="/usr/share/doc/openjdk-6/api/" />
+            <link href="file:///usr/share/doc/classpath-doc/api" />
+            <link href="file:///usr/share/doc/${dependency}/api" />
+            <link href="file:///usr/share/doc/${dependency2}/api" />
+            <link href="file:///usr/share/doc/${dependency3}/api" />
+            <link href="file:///usr/share/doc/${dependency4}/api" />
+            <link href="file:///usr/share/doc/${dependency5}/api" />
+            <link href="file:///usr/share/doc/${dependency6}/api" />
+            <link href="file:///usr/share/doc/${dependency7}/api" />
+            <link href="file:///usr/share/doc/${dependency8}/api" />
+            <link href="file:///usr/share/doc/${dependency9}/api" />
+            <link href="file:///usr/share/doc/${dependency10}/api" />
+            <link href="file:///usr/share/doc/${dependency11}/api" />
+            <link href="file:///usr/share/doc/${dependency12}/api" />
+            <link href="file:///usr/share/doc/${dependency13}/api" />
+            <link href="file:///usr/share/doc/${dependency14}/api" />
+            <link href="file:///usr/share/doc/${dependency15}/api" />
+        </javadoc>
+    </target>
+
+    <target name="javadoc-jar" depends="javadoc">
+        <echoxml file="${build.directory}/${artifactId}.javadoc.pom">
+            <project>
+                <modelVersion>4.0.0</modelVersion>
+                <groupId>${groupId}</groupId>
+                <artifactId>${artifactId}</artifactId>
+                <version>${version}</version>
+            </project>
+        </echoxml>
+        <jar jarfile="${build.directory}/${artifactId}.javadoc.jar"
+            basedir="${javadoc.dir}" />
+    </target>
+
+</project>

Deleted: tags/maven-ant-helper/7.5/maven-defaults.properties
===================================================================
--- trunk/maven-ant-helper/maven-defaults.properties	2011-11-10 21:34:11 UTC (rev 15373)
+++ tags/maven-ant-helper/7.5/maven-defaults.properties	2011-11-13 22:44:28 UTC (rev 15381)
@@ -1,21 +0,0 @@
-# Set the default Maven locations.
-# See http://maven.apache.org/ref/current/maven-model/maven.html for names
-build.sourceDirectory=src/main/java
-build.testSourceDirectory=src/test/java
-build.resourcesDirectory=src/main/resources
-build.testResourcesDirectory=src/test/resources
-
-build.directory=build
-build.outputDirectory=${build.directory}/classes
-build.testOutputDirectory=${build.directory}/test-classes
-build.javaVersion=1.4
-javadoc.dir=${build.directory}/docs/api
-classpath.compile=
-classpath.test=
-classpath.full.compile=${build.outputDirectory}:${classpath.compile}
-classpath.full.test=${build.testOutputDirectory}:${classpath.test}:${build.outputDirectory}:${classpath.compile}
-manifest=/usr/share/maven-ant-helper/manifest.mf
-
-# To skip tests, set this property to true
-#maven.test.skip=true
-maven.test.excludes=

Copied: tags/maven-ant-helper/7.5/maven-defaults.properties (from rev 15378, trunk/maven-ant-helper/maven-defaults.properties)
===================================================================
--- tags/maven-ant-helper/7.5/maven-defaults.properties	                        (rev 0)
+++ tags/maven-ant-helper/7.5/maven-defaults.properties	2011-11-13 22:44:28 UTC (rev 15381)
@@ -0,0 +1,21 @@
+# Set the default Maven locations.
+# See http://maven.apache.org/ref/current/maven-model/maven.html for names
+build.sourceDirectory=src/main/java
+build.testSourceDirectory=src/test/java
+build.resourcesDirectory=src/main/resources
+build.testResourcesDirectory=src/test/resources
+
+build.directory=build
+build.outputDirectory=${build.directory}/classes
+build.testOutputDirectory=${build.directory}/test-classes
+build.javaVersion=1.5
+javadoc.dir=${build.directory}/docs/api
+classpath.compile=
+classpath.test=
+classpath.full.compile=${build.outputDirectory}:${classpath.compile}
+classpath.full.test=${build.testOutputDirectory}:${classpath.test}:${build.outputDirectory}:${classpath.compile}
+manifest=/usr/share/maven-ant-helper/manifest.mf
+
+# To skip tests, set this property to true
+#maven.test.skip=true
+maven.test.excludes=




More information about the pkg-java-commits mailing list