[pkg-java] r15427 - in tags/maven-repo-helper: . 1.7 1.7/debian 1.7/doc 1.7/src/main/share

Damien Raude-Morvan drazzib at alioth.debian.org
Sun Nov 20 19:13:38 UTC 2011


Author: drazzib
Date: 2011-11-20 19:13:36 +0000 (Sun, 20 Nov 2011)
New Revision: 15427

Added:
   tags/maven-repo-helper/1.7/
   tags/maven-repo-helper/1.7/debian/changelog
   tags/maven-repo-helper/1.7/doc/tutorial.txt
   tags/maven-repo-helper/1.7/pom.xml
   tags/maven-repo-helper/1.7/src/main/share/mh_lib.sh
Removed:
   tags/maven-repo-helper/1.7/debian/changelog
   tags/maven-repo-helper/1.7/doc/tutorial.txt
   tags/maven-repo-helper/1.7/pom.xml
   tags/maven-repo-helper/1.7/src/main/share/mh_lib.sh
Log:
[svn-buildpackage] Tagging maven-repo-helper 1.7

Deleted: tags/maven-repo-helper/1.7/debian/changelog
===================================================================
--- trunk/maven-repo-helper/debian/changelog	2011-11-20 16:39:11 UTC (rev 15419)
+++ tags/maven-repo-helper/1.7/debian/changelog	2011-11-20 19:13:36 UTC (rev 15427)
@@ -1,296 +0,0 @@
-maven-repo-helper (1.7ubuntu1~ppa1) oneiric; urgency=low
-
-  * Ubuntu build
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 13 Nov 2011 23:51:14 +0100
-
-maven-repo-helper (1.7) unstable; urgency=low
-
-  * add --site-xml=<location> option to mh_install and in the
-    <package>.poms file to explicitly define the location for site.xml.
-    Warning: this forces existing packages to add this option if they
-    need to install site.xml
-  * update the version in the POM and in the documentation
-    (Closes: #644258)
-  * run the unit tests when building the package, fix broken tests after the
-    introduction of relativePath on the parent element of cleaned POM files. 
-  * d/control: add ant-optional, junit, libxmlunit-java, libcommons-io-java to
-    Build-Depend-Indep
-  * d/copyright: update fields to match latest DEP5 spec.
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Tue, 01 Nov 2011 16:32:39 +0200
-
-maven-repo-helper (1.6) unstable; urgency=low
-
-  [ Ludovic Claude ]
-  * Add tutorial, reference and repository specification in documentation
-  * Update options on mh_installpom and mh_installpoms, to use the new arguments
-    added to mh_cleanpom
-  * Add Build-Depend on markdown to build the doc
-  * Add support for packages built with dh 7 and javahelper: use
-    the following line in your rules file:
-     dh $@ --with javahelper --with jh_maven_repo_helper
-    This will build the package with javahelper, and the resulting
-    jar will be installed in the Maven repository (you need of course the
-    <package>.poms file and the POM files in your package).
-  * Add mh_linkjars to link the jars listed in the .poms file, this is used by
-    the jh_maven_repo_helper plugin for dh 7.
-  * Deprecate mh_installjar -i option and replace it with -j to avoid conflicts
-    with -i/--ignore-rules option used elsewhere.
-  * Review all options passed to the mh_* scripts, in particular --set-version
-    for mh_installjar (Closes: #640730)
-
-  [ Damien Raude-Morvan ]
-  * mh_checkrepo: Fix error when launching without any param.
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Mon, 26 Sep 2011 22:55:09 +0100
-
-maven-repo-helper (1.5.2) unstable; urgency=low
-
-  [ Ludovic Claude ]
-  * Match jar with bundle as they are equivalent
-
-  [ Damien Raude-Morvan ]
-  * Keep relativePath attribute on parent pom.
-  * d/control: Fix typo in package description (Closes: #617438).
-  * src/main/java/org/debian/maven/repo/RepositoryReportWriter.java: Add
-    a hack to change output of Maven repository checker.
-  * Bump Standards-Version to 3.9.2 (no changes needed).
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 16 Aug 2011 19:28:03 +0200
-
-maven-repo-helper (1.5.1) unstable; urgency=low
-
-  * Upload to unstable.
-
- -- Torsten Werner <twerner at debian.org>  Wed, 09 Feb 2011 21:39:12 +0100
-
-maven-repo-helper (1.5) experimental; urgency=low
-
-  * Create mh_installsite to install site.xml into the Maven repository,
-    and integrate it with mh_install
-  * Avoid duplication between rules in maven.rules and maven.publishedRules,
-    as well as between maven.ignoreRules and maven.cleanIgnoreRules
-  * Fix ignore modules, make it work in more cases.
-  * mh_clean: clean also files listed in .mh_clean, similar to what jh_clean
-    does.
-  * add support for dh 7 and ant builds: use the following line in your
-    rules file:
-     dh $@ --with ant --with maven_repo_helper
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 11 Nov 2010 18:49:49 +0100
-
-maven-repo-helper (1.4) experimental; urgency=low
-
-  * Better support for inserting properties in the transformed or cleaned
-    POM files. Avoid duplicate properties and allow definition of new
-    properties.
-  * add support for --has-package-version and --keep-elements in the
-    <package>.poms file, for mh_install add --artifact, --java-lib,
-    --usj-name, --usj-version, --no-usj-versionless, --dest-jar
-  * update README.Debian and document the new options.
-  * change license from BSD to Apache 2.0, there's no need to have so many
-    different licenses in this package, MIT and Apache2.0 are already used.
-  * Keep comments in the POM files as much as possible (Closes: #574045)
-  * mh_cleanpom: keep <build>, <report> and <reporting> elements if the type
-    of the POM file is 'pom'.
-  * mh_cleanpom, mh_patchpom: plugin configuration elements containing
-    dependencies such as:
-    <resourceBundle>org.apache:apache-jar-resource-bundle:1.x</resourceBundle>
-    are detected and rules are applied to them
-  * mh_patchpom: --keep-pom-version option keeps the version of the parent POM
-    except when the parent is already registered in the Maven repository
-  * new mh_install command to install in one go the pom files and all jars in
-    the Maven repository
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Fri, 17 Sep 2010 00:07:36 +0200
-
-maven-repo-helper (1.3) experimental; urgency=low
-
-  [ Peter Collingbourne ]
-  * Document the correct order of attributes in rules files
-  * Escape all $ characters in usage messages
-  * Fix a long option quoting bug
-  * Add support for extra rule options on the command line
-  * Add a --no-publish-used-rule option
-
-  [ Ludovic Claude ]
-  * debian/control: Update Standards-Version to 3.9.1, no changes
-  * mh_transformpoms: Remove warning about missing parent dependency
-    when no-parent option is already used
-  * Dependency class: make it Comparable, to allow easy sorting of dependencies.
-  * mh_cleanpoms: rules defined in --clean-ignore-rules (or
-    debian/maven.cleanIgnoreRules) are used in addition to the rules defined in
-    --ignore-rules (or debian/maven.ignoreRules), so there is no need anymore
-    to duplicate the list of rules to ignore when --clean-ignore-rules is used.
-  * Removed small bugs in mh_make (Closes: #591513)
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 16 Sep 2010 23:18:57 +0200
-
-maven-repo-helper (1.2) unstable; urgency=low
-
-  * Fix 'illegal NCName' error when gcj is used to run the mh_* scripts
-  * Expand more Maven properties in POM files.
-  * Support <property/> syntax in <properties> tag
-  * Handle better configuration elements in plugins (ignore them)
-  * Add support for plugin elements in <profile> tags
-  * Add support for dependency classifiers
-  * Add support for <reporting> tags and their plugins
-  * Fix some XML issues when gcj is used
-  * Add new unit tests and fix several small issues
-  * Insert the original versions of the dependencies in the cleaned poms,
-    this will help a future mh_upgrade tool
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Mon, 28 Jun 2010 23:13:51 +0200
-
-maven-repo-helper (1.1) unstable; urgency=low
-
-  * Add mh_patchpom, useful in some situations to patch
-    individual POM files
-  * Add mh_linkrepojar, to create a link from a jar present in the
-    Maven repository
-  * Correctly identify <extension> tag used by Maven (Closes: #584512)
-  * Add documentation for the package and in particular for the syntax
-    of the debian/<package>.poms file (Closes: #586151)
-  * All mh_* scripts now use debian/.mh/ as their temporary work folder
-    instead of debian/tmp, this better satisfies the Debian policies.
-  * Add mh_cleantmp to remove the temporary files produced when using
-    any other mh_* script
-  * Fix typo in package description (Closes: #586573)
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Fri, 21 May 2010 00:11:48 +0200
-
-maven-repo-helper (1.0.6) unstable; urgency=low
-
-  * Rule.java: harden our handling of version string (from pom.xml)
-    to cope with specials chars.
-  * POMTransformer: If we can't find a dependency, just skip it.
-  * Switch to 3.0 (native) format
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 05 Apr 2010 21:44:47 +0200
-
-maven-repo-helper (1.0.5) unstable; urgency=low
-
-  * mh_installjar: Add new -e/--set-version switchs and handle
-    them as we already do in mh_installpom.
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 19 Mar 2010 22:34:26 +0100
-
-maven-repo-helper (1.0.4) unstable; urgency=low
-
-  * Fix "ignores the --no-parent option in the .poms file" (Closes: #573049)
-    - mh_installpom: Pass "--no-parent" option to mh_cleanpom.
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 09 Mar 2010 22:51:04 +0100
-
-maven-repo-helper (1.0.3) unstable; urgency=low
-
-  * mh_installpoms: Fix call to mh_installpom.
-    Use MH_ARGS instead of (non-existing) MH_OPTS variable.
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 02 Mar 2010 21:09:04 +0100
-
-maven-repo-helper (1.0.2) unstable; urgency=low
-
-  * A leak of environment variables activated the no-rules option
-    on mh_cleanpom, preventing mh_installjar to work properly
-    in some cases (Closes: #570863)
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Mon, 01 Mar 2010 00:46:16 +0100
-
-maven-repo-helper (1.0.1) unstable; urgency=low
-
-  * Bump up Standards-Version to 3.8.4
-  * Fix NPE on mh_transformpoms
-  * Looks like I missed many files while merging changes
-    to Debian, it's now fixed.
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Mon, 01 Feb 2010 23:02:27 +0100
-
-maven-repo-helper (1.0) unstable; urgency=low
-
-  * Add more unit tests
-  * maven.ignoreRules now supports eliminating some plugins from the build
-  * maven.rules can be used to repair missing version numbers for
-    plugins and extensions as well as dependencies (Closes: #561420) 
-  * If a pom file is followed by the --ignore option in the file
-    <package>.poms, then it is ignored from the build and all operations
-    (cleaning, patching)
-  * Add support for maven.cleanIgnoreRules to ignore additional dependencies or
-    plugins during the clean phase.
-  * mh_cleanpom automatically adds a published rule for any Maven plugin, this
-    rule is used later by maven-debian-helper to force the versions of the
-    Maven plugins used in a pom.xml file with the versions defined in the
-    repository
-  * Read rules from the Maven repository to force the version of
-    Maven plugins to be  the same as in the repository
-  * Add --debian-build and --no-docs-build options to mh_patchpoms to remove
-    some elements from the POM during a Debian build
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Tue, 12 Jan 2010 00:12:23 +0100
-
-maven-repo-helper (0.9) unstable; urgency=low
-
-  * org/debian/maven/repo/POMReader.java:
-    Extend previous fix to parse much more properties
-    and use expandProperties() like other cases.
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 13 Oct 2009 22:49:43 +0200
-
-maven-repo-helper (0.8) unstable; urgency=low
-
-  * org/debian/maven/repo/POMReader.java:
-    Fix ${parent.version} parsing inside child's pom.xml
-  * Bump Standards-Version to 3.8.3 (no changes needed)
-  * Fix Vcs-* fields: use pkg-java SVN repository
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 11 Oct 2009 18:47:16 +0200
-
-maven-repo-helper (0.7) unstable; urgency=low
-
-  * Install jars in /usr/share/java and create link to them from
-    the Maven repository (as suggested by Marcus Better)
-  * Add a new script, mh_linkjar, which creates links to the jar into
-    /usr/share/maven-repo. Unlike mh_installjar, it does not copy the
-    jar into the build directory.
-  * Use install instead of dh_install in the scripts as it can
-    interfer if there is a .install file in the debian folder.
-  * Add Recommends: debhelper as debhelper is used in some scripts
-    (mh_install* and mh_linkjar)
-  * Add --set-version to mh_cleanpom, mh_installpom, mh_installpoms
-    to be able to force the version of the artifact in Maven without
-    needing patching the original POM file.
-  * More errors detected in repo scan
-  * Use http://maven.apache.org/xsd/maven-4_0_0.xsd as the location of
-    the xsd in the xml namespace declaration to keep gcj happy. It should
-    not affect Maven or other tools, provided that the xsd is registered
-    in a XML catalog.
-  * By default, remove the test dependencies from cleaned POMs (except for
-    multi-module POM) as they are not useful outside building the project
-    itself most of the time and they make checking consistency in the 
-    Maven repository harder.
-  * mh_cleanpom, mh_installpom(s) and mh_transformpoms can remove 
-    dependencies from the POM files
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 16 Jul 2009 10:09:26 +0100
-
-maven-repo-helper (0.6.1) experimental; urgency=low
-
-  * Add a workaround to use gcj with maven-repo-helper:
-    avoid using gnu xml stream when reading or writing XML documents.
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Mon, 13 Jul 2009 20:15:14 +0100
-
-maven-repo-helper (0.6) experimental; urgency=low
-
-  * Move mh_genrules scripts to the maven-debian-helper package,
-    as it needs mh_lspoms and other components from this package.
-  * Repair missing version information on dependencies
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 09 Jul 2009 15:53:25 +0100
-
-maven-repo-helper (0.5) unstable; urgency=low
-
-  * Initial release. (Closes: #521947)
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 12 Mar 2009 20:46:36 +0000

Copied: tags/maven-repo-helper/1.7/debian/changelog (from rev 15425, trunk/maven-repo-helper/debian/changelog)
===================================================================
--- tags/maven-repo-helper/1.7/debian/changelog	                        (rev 0)
+++ tags/maven-repo-helper/1.7/debian/changelog	2011-11-20 19:13:36 UTC (rev 15427)
@@ -0,0 +1,290 @@
+maven-repo-helper (1.7) unstable; urgency=low
+
+  * add --site-xml=<location> option to mh_install and in the
+    <package>.poms file to explicitly define the location for site.xml.
+    Warning: this forces existing packages to add this option if they
+    need to install site.xml
+  * update the version in the POM and in the documentation
+    (Closes: #644258)
+  * run the unit tests when building the package, fix broken tests after the
+    introduction of relativePath on the parent element of cleaned POM files. 
+  * d/control: add ant-optional, junit, libxmlunit-java, libcommons-io-java to
+    Build-Depend-Indep
+  * d/copyright: update fields to match latest DEP5 spec.
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Tue, 01 Nov 2011 16:32:39 +0200
+
+maven-repo-helper (1.6) unstable; urgency=low
+
+  [ Ludovic Claude ]
+  * Add tutorial, reference and repository specification in documentation
+  * Update options on mh_installpom and mh_installpoms, to use the new arguments
+    added to mh_cleanpom
+  * Add Build-Depend on markdown to build the doc
+  * Add support for packages built with dh 7 and javahelper: use
+    the following line in your rules file:
+     dh $@ --with javahelper --with jh_maven_repo_helper
+    This will build the package with javahelper, and the resulting
+    jar will be installed in the Maven repository (you need of course the
+    <package>.poms file and the POM files in your package).
+  * Add mh_linkjars to link the jars listed in the .poms file, this is used by
+    the jh_maven_repo_helper plugin for dh 7.
+  * Deprecate mh_installjar -i option and replace it with -j to avoid conflicts
+    with -i/--ignore-rules option used elsewhere.
+  * Review all options passed to the mh_* scripts, in particular --set-version
+    for mh_installjar (Closes: #640730)
+
+  [ Damien Raude-Morvan ]
+  * mh_checkrepo: Fix error when launching without any param.
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Mon, 26 Sep 2011 22:55:09 +0100
+
+maven-repo-helper (1.5.2) unstable; urgency=low
+
+  [ Ludovic Claude ]
+  * Match jar with bundle as they are equivalent
+
+  [ Damien Raude-Morvan ]
+  * Keep relativePath attribute on parent pom.
+  * d/control: Fix typo in package description (Closes: #617438).
+  * src/main/java/org/debian/maven/repo/RepositoryReportWriter.java: Add
+    a hack to change output of Maven repository checker.
+  * Bump Standards-Version to 3.9.2 (no changes needed).
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 16 Aug 2011 19:28:03 +0200
+
+maven-repo-helper (1.5.1) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Torsten Werner <twerner at debian.org>  Wed, 09 Feb 2011 21:39:12 +0100
+
+maven-repo-helper (1.5) experimental; urgency=low
+
+  * Create mh_installsite to install site.xml into the Maven repository,
+    and integrate it with mh_install
+  * Avoid duplication between rules in maven.rules and maven.publishedRules,
+    as well as between maven.ignoreRules and maven.cleanIgnoreRules
+  * Fix ignore modules, make it work in more cases.
+  * mh_clean: clean also files listed in .mh_clean, similar to what jh_clean
+    does.
+  * add support for dh 7 and ant builds: use the following line in your
+    rules file:
+     dh $@ --with ant --with maven_repo_helper
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 11 Nov 2010 18:49:49 +0100
+
+maven-repo-helper (1.4) experimental; urgency=low
+
+  * Better support for inserting properties in the transformed or cleaned
+    POM files. Avoid duplicate properties and allow definition of new
+    properties.
+  * add support for --has-package-version and --keep-elements in the
+    <package>.poms file, for mh_install add --artifact, --java-lib,
+    --usj-name, --usj-version, --no-usj-versionless, --dest-jar
+  * update README.Debian and document the new options.
+  * change license from BSD to Apache 2.0, there's no need to have so many
+    different licenses in this package, MIT and Apache2.0 are already used.
+  * Keep comments in the POM files as much as possible (Closes: #574045)
+  * mh_cleanpom: keep <build>, <report> and <reporting> elements if the type
+    of the POM file is 'pom'.
+  * mh_cleanpom, mh_patchpom: plugin configuration elements containing
+    dependencies such as:
+    <resourceBundle>org.apache:apache-jar-resource-bundle:1.x</resourceBundle>
+    are detected and rules are applied to them
+  * mh_patchpom: --keep-pom-version option keeps the version of the parent POM
+    except when the parent is already registered in the Maven repository
+  * new mh_install command to install in one go the pom files and all jars in
+    the Maven repository
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Fri, 17 Sep 2010 00:07:36 +0200
+
+maven-repo-helper (1.3) experimental; urgency=low
+
+  [ Peter Collingbourne ]
+  * Document the correct order of attributes in rules files
+  * Escape all $ characters in usage messages
+  * Fix a long option quoting bug
+  * Add support for extra rule options on the command line
+  * Add a --no-publish-used-rule option
+
+  [ Ludovic Claude ]
+  * debian/control: Update Standards-Version to 3.9.1, no changes
+  * mh_transformpoms: Remove warning about missing parent dependency
+    when no-parent option is already used
+  * Dependency class: make it Comparable, to allow easy sorting of dependencies.
+  * mh_cleanpoms: rules defined in --clean-ignore-rules (or
+    debian/maven.cleanIgnoreRules) are used in addition to the rules defined in
+    --ignore-rules (or debian/maven.ignoreRules), so there is no need anymore
+    to duplicate the list of rules to ignore when --clean-ignore-rules is used.
+  * Removed small bugs in mh_make (Closes: #591513)
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 16 Sep 2010 23:18:57 +0200
+
+maven-repo-helper (1.2) unstable; urgency=low
+
+  * Fix 'illegal NCName' error when gcj is used to run the mh_* scripts
+  * Expand more Maven properties in POM files.
+  * Support <property/> syntax in <properties> tag
+  * Handle better configuration elements in plugins (ignore them)
+  * Add support for plugin elements in <profile> tags
+  * Add support for dependency classifiers
+  * Add support for <reporting> tags and their plugins
+  * Fix some XML issues when gcj is used
+  * Add new unit tests and fix several small issues
+  * Insert the original versions of the dependencies in the cleaned poms,
+    this will help a future mh_upgrade tool
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Mon, 28 Jun 2010 23:13:51 +0200
+
+maven-repo-helper (1.1) unstable; urgency=low
+
+  * Add mh_patchpom, useful in some situations to patch
+    individual POM files
+  * Add mh_linkrepojar, to create a link from a jar present in the
+    Maven repository
+  * Correctly identify <extension> tag used by Maven (Closes: #584512)
+  * Add documentation for the package and in particular for the syntax
+    of the debian/<package>.poms file (Closes: #586151)
+  * All mh_* scripts now use debian/.mh/ as their temporary work folder
+    instead of debian/tmp, this better satisfies the Debian policies.
+  * Add mh_cleantmp to remove the temporary files produced when using
+    any other mh_* script
+  * Fix typo in package description (Closes: #586573)
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Fri, 21 May 2010 00:11:48 +0200
+
+maven-repo-helper (1.0.6) unstable; urgency=low
+
+  * Rule.java: harden our handling of version string (from pom.xml)
+    to cope with specials chars.
+  * POMTransformer: If we can't find a dependency, just skip it.
+  * Switch to 3.0 (native) format
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 05 Apr 2010 21:44:47 +0200
+
+maven-repo-helper (1.0.5) unstable; urgency=low
+
+  * mh_installjar: Add new -e/--set-version switchs and handle
+    them as we already do in mh_installpom.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 19 Mar 2010 22:34:26 +0100
+
+maven-repo-helper (1.0.4) unstable; urgency=low
+
+  * Fix "ignores the --no-parent option in the .poms file" (Closes: #573049)
+    - mh_installpom: Pass "--no-parent" option to mh_cleanpom.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 09 Mar 2010 22:51:04 +0100
+
+maven-repo-helper (1.0.3) unstable; urgency=low
+
+  * mh_installpoms: Fix call to mh_installpom.
+    Use MH_ARGS instead of (non-existing) MH_OPTS variable.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 02 Mar 2010 21:09:04 +0100
+
+maven-repo-helper (1.0.2) unstable; urgency=low
+
+  * A leak of environment variables activated the no-rules option
+    on mh_cleanpom, preventing mh_installjar to work properly
+    in some cases (Closes: #570863)
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Mon, 01 Mar 2010 00:46:16 +0100
+
+maven-repo-helper (1.0.1) unstable; urgency=low
+
+  * Bump up Standards-Version to 3.8.4
+  * Fix NPE on mh_transformpoms
+  * Looks like I missed many files while merging changes
+    to Debian, it's now fixed.
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Mon, 01 Feb 2010 23:02:27 +0100
+
+maven-repo-helper (1.0) unstable; urgency=low
+
+  * Add more unit tests
+  * maven.ignoreRules now supports eliminating some plugins from the build
+  * maven.rules can be used to repair missing version numbers for
+    plugins and extensions as well as dependencies (Closes: #561420) 
+  * If a pom file is followed by the --ignore option in the file
+    <package>.poms, then it is ignored from the build and all operations
+    (cleaning, patching)
+  * Add support for maven.cleanIgnoreRules to ignore additional dependencies or
+    plugins during the clean phase.
+  * mh_cleanpom automatically adds a published rule for any Maven plugin, this
+    rule is used later by maven-debian-helper to force the versions of the
+    Maven plugins used in a pom.xml file with the versions defined in the
+    repository
+  * Read rules from the Maven repository to force the version of
+    Maven plugins to be  the same as in the repository
+  * Add --debian-build and --no-docs-build options to mh_patchpoms to remove
+    some elements from the POM during a Debian build
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Tue, 12 Jan 2010 00:12:23 +0100
+
+maven-repo-helper (0.9) unstable; urgency=low
+
+  * org/debian/maven/repo/POMReader.java:
+    Extend previous fix to parse much more properties
+    and use expandProperties() like other cases.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 13 Oct 2009 22:49:43 +0200
+
+maven-repo-helper (0.8) unstable; urgency=low
+
+  * org/debian/maven/repo/POMReader.java:
+    Fix ${parent.version} parsing inside child's pom.xml
+  * Bump Standards-Version to 3.8.3 (no changes needed)
+  * Fix Vcs-* fields: use pkg-java SVN repository
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 11 Oct 2009 18:47:16 +0200
+
+maven-repo-helper (0.7) unstable; urgency=low
+
+  * Install jars in /usr/share/java and create link to them from
+    the Maven repository (as suggested by Marcus Better)
+  * Add a new script, mh_linkjar, which creates links to the jar into
+    /usr/share/maven-repo. Unlike mh_installjar, it does not copy the
+    jar into the build directory.
+  * Use install instead of dh_install in the scripts as it can
+    interfer if there is a .install file in the debian folder.
+  * Add Recommends: debhelper as debhelper is used in some scripts
+    (mh_install* and mh_linkjar)
+  * Add --set-version to mh_cleanpom, mh_installpom, mh_installpoms
+    to be able to force the version of the artifact in Maven without
+    needing patching the original POM file.
+  * More errors detected in repo scan
+  * Use http://maven.apache.org/xsd/maven-4_0_0.xsd as the location of
+    the xsd in the xml namespace declaration to keep gcj happy. It should
+    not affect Maven or other tools, provided that the xsd is registered
+    in a XML catalog.
+  * By default, remove the test dependencies from cleaned POMs (except for
+    multi-module POM) as they are not useful outside building the project
+    itself most of the time and they make checking consistency in the 
+    Maven repository harder.
+  * mh_cleanpom, mh_installpom(s) and mh_transformpoms can remove 
+    dependencies from the POM files
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 16 Jul 2009 10:09:26 +0100
+
+maven-repo-helper (0.6.1) experimental; urgency=low
+
+  * Add a workaround to use gcj with maven-repo-helper:
+    avoid using gnu xml stream when reading or writing XML documents.
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Mon, 13 Jul 2009 20:15:14 +0100
+
+maven-repo-helper (0.6) experimental; urgency=low
+
+  * Move mh_genrules scripts to the maven-debian-helper package,
+    as it needs mh_lspoms and other components from this package.
+  * Repair missing version information on dependencies
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 09 Jul 2009 15:53:25 +0100
+
+maven-repo-helper (0.5) unstable; urgency=low
+
+  * Initial release. (Closes: #521947)
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 12 Mar 2009 20:46:36 +0000

Deleted: tags/maven-repo-helper/1.7/doc/tutorial.txt
===================================================================
--- trunk/maven-repo-helper/doc/tutorial.txt	2011-11-20 16:39:11 UTC (rev 15419)
+++ tags/maven-repo-helper/1.7/doc/tutorial.txt	2011-11-20 19:13:36 UTC (rev 15427)
@@ -1,364 +0,0 @@
-[repository specification](repository.html) | [reference](reference.html) | [tutorial](tutorial.html)
-
-Packaging Java and Maven projects with Maven Repo Helper
-========================================================
-
-The maven-repo-helper package provides tools for installing and maintaining Maven POMs and jars installed in /usr/share/maven-repo.
-
-Maven is a comprehensive build tool for Java and other languages based around the concept of plugins and a repository accessible normally from internet (a la CPAN), and providing access to the libraries used by a project.
-
-To satisfy the requirement that all software must be built from the Debian repository and that no access to Internet is allowed during a build, we have re-created a Maven repository for Debian. This repository is located in /usr/share/maven-repo and Maven POM files installed there must follow some special requirements.
-
-The Debian policy mandates that Java libraries are installed in /usr/share/java, so we have many Java libraries have already been packaged in Debian, but they don't have any Maven descriptors (POMs) associated with them. maven-repo-helper can help by installing those libraries also in /usr/share/maven-repo with their POM files.
-
-The Maven repository maintained by Debian has some special characteristics which make it difficult to use directly upstream POM files without any changes. To allow a smooth upgrade of Java libraries, we create both native and Debian versions of the artifacts, and replace all versions in the dependencies with Debian versions - see the [repository specification](repository.html) document for more informations about this process. In addition, entries in the POM file which are not needed anymore, such as build information, are removed. mh\_make provides the scripts mh\_patchpom and mh\_cleanpom which patch dependencies versions and clean up the POM file respectively. Other scripts often make use of those two scripts to provide more advanced functionality.
-
-maven-repo-helper has no dependency on Maven, so it can be used for any library, including libraries used by Maven itself. It provides the foundations for maven-debian-helper. Its goal is to manage the /usr/share/maven-repo folder properly, and cannot be used alone to build a Java library from source. You will normally use it either with Ant (started by a cdbs rule or dh 7 rule or anything you like), or with javahelper which will take care of building the binaries for your project.
-
-**Important:** If you want your build to use Maven itself, then run mh\_make from the maven-debian-helper package on the upstream sources. mh\_make will guide you for that process and generate all necessary debian files for you.
-You can also use mh\_make --ant to speed up the packaging of a project which uses Ant as the build tool and needs to install its artifacts into the Maven repository.
-
-Quick start
-===========
-
-This section presents some of the recommanded packaging styles:
-
-DH 7 + Ant + maven-repo-helper
-------------------------------
-The build uses dh 7 style, it runs Ant for the build and uses maven-repo-helper to install all jars both in /usr/share/java and in /usr/share/maven-repo with the POM files.
-
-debian/control:
-
-	Source: bnd
-	Section: java
-	Priority: optional
-	Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-	Uploaders: Ludovic Claude <ludovicc at debian.org>
-	Build-Depends: debhelper (>= 8), maven-repo-helper (>= 1.6.1), default-jdk
-	Build-Depends-Indep: junit, libosgi-ee-minimum-api-java (>= 1.2.1)
-	Standards-Version: 3.9.2
-	Homepage: http://www.aqute.biz/Code/Bnd
-	
-	Package: bnd
-	Architecture: all
-	Depends: ${misc:Depends}
-	Description: A tool to create and diagnose OSGi R4 bundles
-	 [...]
-
-Note the Build-Depends on debhelper and maven-repo-helper
-
-debian/rules:
-
-	#!/usr/bin/make -f
-	export JAVA_HOME=/usr/lib/jvm/default-java
-	%:
-		dh $@ --buildsystem=ant --with maven_repo_helper
-
-We use here dh 7 for the build, with ant as the build system, and the maven_repo_helper plugin which will install all generated artifacts in the Maven repository.
-Ant is run with the upstream build.xml file and the default target.
-
-bnd.poms:
-
-	biz.aQute.bndlib/tmp/pom.xml --has-package-version --artifact=biz.aQute.bndlib/tmp/biz.aQute.bndlib.jar --java-lib --usj-name=bndlib
-
-Deploy the jar built in biz.aQute.bndlib/tmp folder (--artifact option) as bndlib.jar (--usj-name option) in /usr/share/java (--java-lib option) and deploy it as well in the Maven repository. We use the POM file created by the build (biz.aQute.bndlib/tmp/pom.xml) as it contains the metadata for the bndlib jar.
-The option --has-package-version tells maven-repo-helper that the version of the POM matches the version of the Debian package, which is a useful hint for 
-mh\_make when packaging another project which uses this library.
-
-maven.rules:
-
-	biz.aQute s/bnd/bndlib/
-
-Change the name of the artifact from bnd to bndlib in the Maven POM. The current version of bndlib will be replaced by a generic 'debian' version.
-
-You can use mh\_lspoms from the maven-debian-helper package to help you locate POM files in your sources and generate both the .poms and maven.rules files.
-
-DH 7 + Ant + maven-ant-helper + maven-repo-helper
--------------------------------------------------
-A variant of the previous solution, where we don't use the upstream build script, but an Ant script which works on something which looks like a Maven project and tries to emulate Maven as best as it can. This is quite handy when you are working on a package used by Maven itself and cannot use Maven during the build. 
-
-debian/control:
-
-	Source: plexus-utils2
-	Section: java
-	Priority: optional
-	Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-	Uploaders: Ludovic Claude <ludovic.claude at laposte.net>
-	Build-Depends: debhelper (>= 7), default-jdk, maven-repo-helper (>= 1.6.1), ant-optional, maven-ant-helper (>= 7) 
-	Build-Depends-Indep: libplexus-parent-java (>= 2.0.6), junit (>= 3.8.2), default-jdk-doc 
-	Standards-Version: 3.9.2
-	Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-utils2
-	Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-utils2
-	Homepage: http://plexus.codehaus.org/plexus-utils 
-
-	Package: libplexus-utils2-java
-	Architecture: all
-	Depends: ${misc:Depends}, libplexus-parent-java (>= 2.0.6)
-	Suggests: libplexus-utils2-java-doc
-	Description: Plexus Common Utilities
-	 [...]
-
-	Package: libplexus-utils2-java-doc
-	Architecture: all
-	Section: doc
-	Depends: ${misc:Depends}, default-jdk-doc
-	Suggests: libplexus-utils2-java
-	Description: Documentation for Plexus Common Utilities
-	 [...]
-
-We define a binary package which will contain the jars and the fragment of the Maven repository for this package (libplexus-utils2-java),
-and a documentation package containing the Javadoc folder (installed in /usr/share/doc) and the Javadoc jar installed in the Maven repository (libplexus-utils2-java-doc).
-
-Note the Build-Depends on debhelper, maven-repo-helper and maven-ant-helper.
-
-debian/rules:
-
-	#!/usr/bin/make -f
-	
-	DEB_SOURCE_PACKAGE   := $(shell dpkg-parsechangelog | grep '^Source:' | cut -f 2 -d ' ')
-	DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | cut -d: -f2- | sed 's/-[^-]*$$//')
-
-	export JAVA_HOME=/usr/lib/jvm/default-java
-	export CLASSPATH=$(shell for jar in `cat debian/build-classpath`; do if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; done)
-	export ANT_ARGS=-Dbasedir=$(realpath .) -Dpackage=$(DEB_SOURCE_PACKAGE) -f /usr/share/maven-ant-helper/maven-build.xml
-	
-	%:
-		dh $@ --buildsystem=ant --with maven_repo_helper
-
-We use here dh 7 for the build, with ant as the build system, and the maven\_repo\_helper plugin which will install all generated artifacts in the Maven repository
-We configure ant to use the maven-ant-helper build script (/usr/share/maven-ant-helper/maven-build.xml) and the classpath defined in debian/build-classpath
-
-libplexus-utils2-java.poms:
-
-	pom.xml --has-package-version --artifact=target/plexus-utils-*.jar --java-lib --usj-name=plexus-utils2
-
-Install the jar as plexus-utils2.jar (--usj-name option) in /usr/share/java (--java-lib option) and install it as well in /usr/share/maven-repo with its POM file.
-The jar is coming from the target/ folder used by Maven (and the maven-repo-helper script) for its builds, and we use a glob pattern (*) to match any version of the jar (--artifact option).
-The option --has-package-version tells maven-repo-helper that the version of the POM matches the version of the Debian package, which is a useful hint for 
-mh\_make when packaging another project which uses this library.
-
-libplexus-utils2-java-doc.poms:
-
-	target/plexus-utils.javadoc.pom --has-package-version --artifact=target/plexus-utils.javadoc.jar --classifier=javadoc --ignore-pom
-
-Install the javadoc jar into /usr/share/maven-repo, without a POM file (--ignore-pom option) because that's the way Maven works - javadoc jars have no dedicated POM files for them. Instead, there is a classifier which tells Maven that this jar contains Javadoc (--classifier option).
-The javadoc jar is packaged in libplexus-utils2-java-doc package.
-
-libplexus-utils2-java-doc.install:
-
-	target/apidocs/* usr/share/doc/libplexus-utils2-java/api
-
-Install the javadoc folder into /usr/share/doc/libplexus-utils2-java/api.
-This folder is packaged in libplexus-utils2-java-doc package.
-
-maven.rules:
-
-	junit junit jar s/3\..*/3.x/ * *
-	org.codehaus.plexus plexus-utils jar s/2\..*/2.x/ * *
-	org.codehaus.plexus plexus pom s/2\..*/2.x/ * *
-
-Adapt versions for Debian in the Maven POMs, as it ease small upgrades.
-
--    junit:junit jar dependencies with a version starting with 3. will use version 3.x instead (and libjunit-java contains a similar rule which install version 3.x in the Maven repository)
--    org.codehaus.plexus:plexus-utils jar dependencies with a version starting with 2. will use version 2.x instead
--    org.codehaus.plexus:plexus pom dependencies with a version starting with 2. will use version 2.x instead
-
-DH 7 + javahelper + maven-repo-helper
--------------------------------------
-
-debian/control:
-
-	Source: httpunit
-	Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-	Uploaders: Miguel Landaeta <miguel at miguel.cc>, Michael Koch <konqueror at gmx.de>
-	Section: java
-	Priority: optional
-	Build-Depends: default-jdk, ant (>= 1.7.0-6), javahelper (>= 0.28),
-	 debhelper (>= 7.0.50~), rhino (>= 1.7R1-2), libjtidy-java (>= 7+svn20070309-2),
-	 libgnujaf-java (>= 1.1.1-4), junit (>= 3.8.2), libgnumail-java (>= 1.1.2-2),
-	 libservlet2.4-java (>= 5.0.30-8), libxerces2-java (>= 2.9.1-2),
-	 libnekohtml-java (>= 0.9.5+dfsg-1.1), maven-repo-helper (>= 1.6.1)
-	Standards-Version: 3.9.2
-	Homepage: http://httpunit.org/
-	Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/httpunit/
-	Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/httpunit
-
-	Package: libhttpunit-java
-	Architecture: all
-	Section: java
-	Priority: optional
-	Depends: ${java:Depends}, libxerces2-java (>= 2.9.1-2), libnekohtml-java (>= 0.9.5+dfsg-1.1),
-	 rhino (>= 1.7R1-2), libjtidy-java (>= 7+svn20070309-2), libservlet2.4-java
-	 (>= 5.0.30-8), ${misc:Depends}
-	Recommends: junit (>= 3.8.2)
-	Suggests: libhttpunit-java-doc (= ${binary:Version})
-	Description: automated web site testing toolkit
-		[...]
-
-Note the Build-Depends on debhelper, javahelper, ant and maven-repo-helper
-
-debian/rules:
-
-	#!/usr/bin/make -f
-	%:
-		dh --with javahelper --with jh_maven_repo_helper $@
-
-We use here dh 7 for the build, with javahelper as the build system (which in turn will launch Ant because build.xml exists),
-and the jh\_maven\_repo\_helper plugin which is adapted to work with javahelper and will install all generated artifacts in the Maven repository.
-
-libhttpunit-java.jlibs:
-
-	lib/httpunit.jar
-
-We tell javahelper to install the httpunit.jar file located in lib into /usr/share/java
-
-libhttpunit-java.poms:
-
-	debian/pom.xml --usj-name=httpunit
-
-Create a link for the jar /usr/share/java/httpunit.jar into the Maven repository
-and use debian/pom.xml as its companion metadata file
-
-CDBS + maven-repo-helper using mh\_install
------------------------------------------
-
-debian/control:
-
-    Source: maven-debian-helper
-    Section: java
-    Priority: optional
-    Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-    Uploaders: Torsten Werner <twerner at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>,
-     Michael Koch <konqueror at gmx.de>, Damien Raude-Morvan <drazzib at debian.org>
-    Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-ant-helper (>= 7), maven-repo-helper (>= 1.6.1), ant-optional, help2man
-    Build-Depends-Indep: junit, libmaven-plugin-tools-java, libplexus-velocity-java
-    Standards-Version: 3.9.2
-    Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-debian-helper
-    Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-debian-helper/
-    Homepage: http://wiki.debian.org/Java/MavenBuilder
-
-    Package: maven-debian-helper
-    Architecture: all
-    Depends: ${misc:Depends}, default-jdk, maven-repo-helper (>= 1.5), maven2 (>= 2.2.1-5),
-     libmaven-clean-plugin-java, libmaven-resources-plugin-java,
-     libmaven-compiler-plugin-java, libmaven-jar-plugin-java, libmaven-site-plugin-java,
-     libsurefire-java, velocity, libplexus-velocity-java
-    Suggests: libmaven-javadoc-plugin-java, apt-file, devscripts, subversion
-    Description: Helper tools for building Debian packages with Maven
-     [...]
-
-Note the Build-Depends on cdbs and maven-repo-helper. maven-ant-helper and ant-optional are also needed for this package, as it's quite complex
-but this is not important for this tutorial.
-
-debian/rules:
-
-    #!/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              := $(shell echo ${DEB_UPSTREAM_VERSION} | sed -r 's/([0-9\.]+).*/\1/')
-    JAVA_HOME            := /usr/lib/jvm/default-java
-    DEB_JARS             := ant-nodeps classworlds maven-core maven-artifact maven-artifact-manager maven-model \
-     maven-compat maven-plugin-api maven-project maven-scm-api velocity file-management plexus-utils \
-     plexus-container-default-alpha maven-repo-helper
-    DEB_ANT_BUILD_TARGET := package
-    DEB_ANT_BUILDFILE    := debian/build.xml
-    DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dbin.package=$(PACKAGE)
-    API_DOCS             := target/api
-    
-    install/$(PACKAGE)::
-        mh_install -p$(PACKAGE)
-        
-    clean::
-        mh_clean
-
-This is a simplified version of debian/rules, which shows how to use the mh\_install and mh\_clean scripts from maven-repo-helper
-with CDBS and Ant.
-mh\_install performs the installation of the built jars into /usr/share/maven-repo and /usr/share/java. It uses the configuration defined
-in maven-debian-helper.poms.
-mh\_clean does the clean up of files left behind during the execution of mh\_install.
-
-maven-debian-helper.poms:
-
-    pom.xml --no-parent --has-package-version
-    maven-debian-helper/pom.xml --has-package-version --artifact=maven-debian-helper/target/maven-debian-helper-*.jar --java-lib
-    maven-debian-plugin/pom.xml --has-package-version --artifact=maven-debian-plugin/target/maven-debian-plugin-*.jar --java-lib
-    maven-build-nodocs/pom.xml --has-package-version --artifact=maven-build-nodocs/target/maven-build-nodocs-*.jar --java-lib
-    maven-packager-utils/pom.xml --has-package-version --artifact=maven-packager-utils/target/maven-packager-utils-*.jar --java-lib
-
-Here we tell mh\_install to deploy the maven-debian-helper project and its sub projects into /usr/share/maven-repo,
-and to deploy all jars also into /usr/share/java (--java-lib option)
-
-CDBS + maven-repo-helper using mh\_installpoms and mh\_installjar
------------------------------------------------------------------
-
-debian/control:
-
-    Source: plexus-io
-    Section: java
-    Priority: optional
-    Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-    Uploaders: Torsten Werner <twerner at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>
-    Build-Depends: debhelper (>= 5), cdbs (>= 0.4.5.3), default-jdk
-    Build-Depends-Indep: maven-repo-helper (>= 1.6.1), maven-ant-helper (>= 7), ant, ant-optional, 
-     libplexus-utils-java, libplexus-containers-java
-    Standards-Version: 3.8.1
-    Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-io
-    Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-io/
-    Homepage: http://plexus.codehaus.org/plexus-components/plexus-io/
-
-    Package: libplexus-io-java
-    Architecture: all
-    Depends: ${misc:Depends}, libplexus-utils-java, libplexus-containers-java
-    Description: Plexus IO Components
-     [...]
-
-Note the Build-Depends on cdbs and maven-repo-helper.
-
-debian/rules:
-
-    #!/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-nodeps plexus-utils plexus-container-default
-    DEB_ANT_BUILD_TARGET := package #javadoc
-    DEB_ANT_BUILDFILE    := /usr/share/maven-ant-helper/maven-build.xml
-    DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
-    API_DOCS             := build/api
-
-    binary-post-install/lib$(PACKAGE)-java::
-        mh_installpoms -plib$(PACKAGE)-java
-        mh_installjar -plib$(PACKAGE)-java -l pom.xml build/$(PACKAGE)-$(VERSION).jar
-
-    clean::
-        mh_clean
-
-No patches for the POM files are needed, all is taken care of by the mh\_installpom script (which uses mh\_cleanpom)
-
-mh\_installpoms will install all POM files registered in debian/lib$package-java.pom into /usr/share/maven-repo,
-
-mh\_installjar will install the jar file associated with the POM into /usr/share/maven-repo and also add a link to the jar in /usr/share/java, with and without the version
-
-debian/libplexus-io-java.pom
-
-    pom.xml --no-parent
-
-It simply lists the pom files in the source tree which need to be installed in the repository, and indicates with the --no-parent option that if the POM inherits
-from a parent POM, then this inheritance relationship will be removed in the cleaned POM. Removing the parent inheritence can often simplify the packaging, as 
-the parent POM mostly does not contain any useful information - we need only the list of dependencies in our repository, the other details for the build are irrelevant.
-
-There is less configuration here because we are using the low-level mh_installpoms and mh_installjar scripts which place the configuration on their command line options.
-
-Typical workflow for packaging a project from source
-----------------------------------------------------
-
-1. Get the original sources and unpack them, copy the debian/ folder if you are working on an existing package.
-1. mh\_make --ant
-1. edit debian/rules (to fix the last remaining packaging details)
-1. edit debian/control (to add maven-repo-helper to Build-Depends: )
-

Copied: tags/maven-repo-helper/1.7/doc/tutorial.txt (from rev 15425, trunk/maven-repo-helper/doc/tutorial.txt)
===================================================================
--- tags/maven-repo-helper/1.7/doc/tutorial.txt	                        (rev 0)
+++ tags/maven-repo-helper/1.7/doc/tutorial.txt	2011-11-20 19:13:36 UTC (rev 15427)
@@ -0,0 +1,364 @@
+[repository specification](repository.html) | [reference](reference.html) | [tutorial](tutorial.html)
+
+Packaging Java and Maven projects with Maven Repo Helper
+========================================================
+
+The maven-repo-helper package provides tools for installing and maintaining Maven POMs and jars installed in /usr/share/maven-repo.
+
+Maven is a comprehensive build tool for Java and other languages based around the concept of plugins and a repository accessible normally from internet (a la CPAN), and providing access to the libraries used by a project.
+
+To satisfy the requirement that all software must be built from the Debian repository and that no access to Internet is allowed during a build, we have re-created a Maven repository for Debian. This repository is located in /usr/share/maven-repo and Maven POM files installed there must follow some special requirements.
+
+The Debian policy mandates that Java libraries are installed in /usr/share/java, so we have many Java libraries have already been packaged in Debian, but they don't have any Maven descriptors (POMs) associated with them. maven-repo-helper can help by installing those libraries also in /usr/share/maven-repo with their POM files.
+
+The Maven repository maintained by Debian has some special characteristics which make it difficult to use directly upstream POM files without any changes. To allow a smooth upgrade of Java libraries, we create both native and Debian versions of the artifacts, and replace all versions in the dependencies with Debian versions - see the [repository specification](repository.html) document for more informations about this process. In addition, entries in the POM file which are not needed anymore, such as build information, are removed. mh\_make provides the scripts mh\_patchpom and mh\_cleanpom which patch dependencies versions and clean up the POM file respectively. Other scripts often make use of those two scripts to provide more advanced functionality.
+
+maven-repo-helper has no dependency on Maven, so it can be used for any library, including libraries used by Maven itself. It provides the foundations for maven-debian-helper. Its goal is to manage the /usr/share/maven-repo folder properly, and cannot be used alone to build a Java library from source. You will normally use it either with Ant (started by a cdbs rule or dh 7 rule or anything you like), or with javahelper which will take care of building the binaries for your project.
+
+**Important:** If you want your build to use Maven itself, then run mh\_make from the maven-debian-helper package on the upstream sources. mh\_make will guide you for that process and generate all necessary debian files for you.
+You can also use mh\_make --ant to speed up the packaging of a project which uses Ant as the build tool and needs to install its artifacts into the Maven repository.
+
+Quick start
+===========
+
+This section presents some of the recommanded packaging styles:
+
+DH 7 + Ant + maven-repo-helper
+------------------------------
+The build uses dh 7 style, it runs Ant for the build and uses maven-repo-helper to install all jars both in /usr/share/java and in /usr/share/maven-repo with the POM files.
+
+debian/control:
+
+	Source: bnd
+	Section: java
+	Priority: optional
+	Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+	Uploaders: Ludovic Claude <ludovicc at debian.org>
+	Build-Depends: debhelper (>= 8), maven-repo-helper (>= 1.7), default-jdk
+	Build-Depends-Indep: junit, libosgi-ee-minimum-api-java (>= 1.2.1)
+	Standards-Version: 3.9.2
+	Homepage: http://www.aqute.biz/Code/Bnd
+	
+	Package: bnd
+	Architecture: all
+	Depends: ${misc:Depends}
+	Description: A tool to create and diagnose OSGi R4 bundles
+	 [...]
+
+Note the Build-Depends on debhelper and maven-repo-helper
+
+debian/rules:
+
+	#!/usr/bin/make -f
+	export JAVA_HOME=/usr/lib/jvm/default-java
+	%:
+		dh $@ --buildsystem=ant --with maven_repo_helper
+
+We use here dh 7 for the build, with ant as the build system, and the maven_repo_helper plugin which will install all generated artifacts in the Maven repository.
+Ant is run with the upstream build.xml file and the default target.
+
+bnd.poms:
+
+	biz.aQute.bndlib/tmp/pom.xml --has-package-version --artifact=biz.aQute.bndlib/tmp/biz.aQute.bndlib.jar --java-lib --usj-name=bndlib
+
+Deploy the jar built in biz.aQute.bndlib/tmp folder (--artifact option) as bndlib.jar (--usj-name option) in /usr/share/java (--java-lib option) and deploy it as well in the Maven repository. We use the POM file created by the build (biz.aQute.bndlib/tmp/pom.xml) as it contains the metadata for the bndlib jar.
+The option --has-package-version tells maven-repo-helper that the version of the POM matches the version of the Debian package, which is a useful hint for 
+mh\_make when packaging another project which uses this library.
+
+maven.rules:
+
+	biz.aQute s/bnd/bndlib/
+
+Change the name of the artifact from bnd to bndlib in the Maven POM. The current version of bndlib will be replaced by a generic 'debian' version.
+
+You can use mh\_lspoms from the maven-debian-helper package to help you locate POM files in your sources and generate both the .poms and maven.rules files.
+
+DH 7 + Ant + maven-ant-helper + maven-repo-helper
+-------------------------------------------------
+A variant of the previous solution, where we don't use the upstream build script, but an Ant script which works on something which looks like a Maven project and tries to emulate Maven as best as it can. This is quite handy when you are working on a package used by Maven itself and cannot use Maven during the build. 
+
+debian/control:
+
+	Source: plexus-utils2
+	Section: java
+	Priority: optional
+	Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+	Uploaders: Ludovic Claude <ludovic.claude at laposte.net>
+	Build-Depends: debhelper (>= 7), default-jdk, maven-repo-helper (>= 1.7), ant-optional, maven-ant-helper (>= 7) 
+	Build-Depends-Indep: libplexus-parent-java (>= 2.0.6), junit (>= 3.8.2), default-jdk-doc 
+	Standards-Version: 3.9.2
+	Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-utils2
+	Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-utils2
+	Homepage: http://plexus.codehaus.org/plexus-utils 
+
+	Package: libplexus-utils2-java
+	Architecture: all
+	Depends: ${misc:Depends}, libplexus-parent-java (>= 2.0.6)
+	Suggests: libplexus-utils2-java-doc
+	Description: Plexus Common Utilities
+	 [...]
+
+	Package: libplexus-utils2-java-doc
+	Architecture: all
+	Section: doc
+	Depends: ${misc:Depends}, default-jdk-doc
+	Suggests: libplexus-utils2-java
+	Description: Documentation for Plexus Common Utilities
+	 [...]
+
+We define a binary package which will contain the jars and the fragment of the Maven repository for this package (libplexus-utils2-java),
+and a documentation package containing the Javadoc folder (installed in /usr/share/doc) and the Javadoc jar installed in the Maven repository (libplexus-utils2-java-doc).
+
+Note the Build-Depends on debhelper, maven-repo-helper and maven-ant-helper.
+
+debian/rules:
+
+	#!/usr/bin/make -f
+	
+	DEB_SOURCE_PACKAGE   := $(shell dpkg-parsechangelog | grep '^Source:' | cut -f 2 -d ' ')
+	DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | cut -d: -f2- | sed 's/-[^-]*$$//')
+
+	export JAVA_HOME=/usr/lib/jvm/default-java
+	export CLASSPATH=$(shell for jar in `cat debian/build-classpath`; do if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; done)
+	export ANT_ARGS=-Dbasedir=$(realpath .) -Dpackage=$(DEB_SOURCE_PACKAGE) -f /usr/share/maven-ant-helper/maven-build.xml
+	
+	%:
+		dh $@ --buildsystem=ant --with maven_repo_helper
+
+We use here dh 7 for the build, with ant as the build system, and the maven\_repo\_helper plugin which will install all generated artifacts in the Maven repository
+We configure ant to use the maven-ant-helper build script (/usr/share/maven-ant-helper/maven-build.xml) and the classpath defined in debian/build-classpath
+
+libplexus-utils2-java.poms:
+
+	pom.xml --has-package-version --artifact=target/plexus-utils-*.jar --java-lib --usj-name=plexus-utils2
+
+Install the jar as plexus-utils2.jar (--usj-name option) in /usr/share/java (--java-lib option) and install it as well in /usr/share/maven-repo with its POM file.
+The jar is coming from the target/ folder used by Maven (and the maven-repo-helper script) for its builds, and we use a glob pattern (*) to match any version of the jar (--artifact option).
+The option --has-package-version tells maven-repo-helper that the version of the POM matches the version of the Debian package, which is a useful hint for 
+mh\_make when packaging another project which uses this library.
+
+libplexus-utils2-java-doc.poms:
+
+	target/plexus-utils.javadoc.pom --has-package-version --artifact=target/plexus-utils.javadoc.jar --classifier=javadoc --ignore-pom
+
+Install the javadoc jar into /usr/share/maven-repo, without a POM file (--ignore-pom option) because that's the way Maven works - javadoc jars have no dedicated POM files for them. Instead, there is a classifier which tells Maven that this jar contains Javadoc (--classifier option).
+The javadoc jar is packaged in libplexus-utils2-java-doc package.
+
+libplexus-utils2-java-doc.install:
+
+	target/apidocs/* usr/share/doc/libplexus-utils2-java/api
+
+Install the javadoc folder into /usr/share/doc/libplexus-utils2-java/api.
+This folder is packaged in libplexus-utils2-java-doc package.
+
+maven.rules:
+
+	junit junit jar s/3\..*/3.x/ * *
+	org.codehaus.plexus plexus-utils jar s/2\..*/2.x/ * *
+	org.codehaus.plexus plexus pom s/2\..*/2.x/ * *
+
+Adapt versions for Debian in the Maven POMs, as it ease small upgrades.
+
+-    junit:junit jar dependencies with a version starting with 3. will use version 3.x instead (and libjunit-java contains a similar rule which install version 3.x in the Maven repository)
+-    org.codehaus.plexus:plexus-utils jar dependencies with a version starting with 2. will use version 2.x instead
+-    org.codehaus.plexus:plexus pom dependencies with a version starting with 2. will use version 2.x instead
+
+DH 7 + javahelper + maven-repo-helper
+-------------------------------------
+
+debian/control:
+
+	Source: httpunit
+	Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+	Uploaders: Miguel Landaeta <miguel at miguel.cc>, Michael Koch <konqueror at gmx.de>
+	Section: java
+	Priority: optional
+	Build-Depends: default-jdk, ant (>= 1.7.0-6), javahelper (>= 0.28),
+	 debhelper (>= 7.0.50~), rhino (>= 1.7R1-2), libjtidy-java (>= 7+svn20070309-2),
+	 libgnujaf-java (>= 1.1.1-4), junit (>= 3.8.2), libgnumail-java (>= 1.1.2-2),
+	 libservlet2.4-java (>= 5.0.30-8), libxerces2-java (>= 2.9.1-2),
+	 libnekohtml-java (>= 0.9.5+dfsg-1.1), maven-repo-helper (>= 1.7)
+	Standards-Version: 3.9.2
+	Homepage: http://httpunit.org/
+	Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/httpunit/
+	Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/httpunit
+
+	Package: libhttpunit-java
+	Architecture: all
+	Section: java
+	Priority: optional
+	Depends: ${java:Depends}, libxerces2-java (>= 2.9.1-2), libnekohtml-java (>= 0.9.5+dfsg-1.1),
+	 rhino (>= 1.7R1-2), libjtidy-java (>= 7+svn20070309-2), libservlet2.4-java
+	 (>= 5.0.30-8), ${misc:Depends}
+	Recommends: junit (>= 3.8.2)
+	Suggests: libhttpunit-java-doc (= ${binary:Version})
+	Description: automated web site testing toolkit
+		[...]
+
+Note the Build-Depends on debhelper, javahelper, ant and maven-repo-helper
+
+debian/rules:
+
+	#!/usr/bin/make -f
+	%:
+		dh --with javahelper --with jh_maven_repo_helper $@
+
+We use here dh 7 for the build, with javahelper as the build system (which in turn will launch Ant because build.xml exists),
+and the jh\_maven\_repo\_helper plugin which is adapted to work with javahelper and will install all generated artifacts in the Maven repository.
+
+libhttpunit-java.jlibs:
+
+	lib/httpunit.jar
+
+We tell javahelper to install the httpunit.jar file located in lib into /usr/share/java
+
+libhttpunit-java.poms:
+
+	debian/pom.xml --usj-name=httpunit
+
+Create a link for the jar /usr/share/java/httpunit.jar into the Maven repository
+and use debian/pom.xml as its companion metadata file
+
+CDBS + maven-repo-helper using mh\_install
+-----------------------------------------
+
+debian/control:
+
+    Source: maven-debian-helper
+    Section: java
+    Priority: optional
+    Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+    Uploaders: Torsten Werner <twerner at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>,
+     Michael Koch <konqueror at gmx.de>, Damien Raude-Morvan <drazzib at debian.org>
+    Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-ant-helper (>= 7), maven-repo-helper (>= 1.7), ant-optional, help2man
+    Build-Depends-Indep: junit, libmaven-plugin-tools-java, libplexus-velocity-java
+    Standards-Version: 3.9.2
+    Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-debian-helper
+    Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-debian-helper/
+    Homepage: http://wiki.debian.org/Java/MavenBuilder
+
+    Package: maven-debian-helper
+    Architecture: all
+    Depends: ${misc:Depends}, default-jdk, maven-repo-helper (>= 1.5), maven2 (>= 2.2.1-5),
+     libmaven-clean-plugin-java, libmaven-resources-plugin-java,
+     libmaven-compiler-plugin-java, libmaven-jar-plugin-java, libmaven-site-plugin-java,
+     libsurefire-java, velocity, libplexus-velocity-java
+    Suggests: libmaven-javadoc-plugin-java, apt-file, devscripts, subversion
+    Description: Helper tools for building Debian packages with Maven
+     [...]
+
+Note the Build-Depends on cdbs and maven-repo-helper. maven-ant-helper and ant-optional are also needed for this package, as it's quite complex
+but this is not important for this tutorial.
+
+debian/rules:
+
+    #!/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              := $(shell echo ${DEB_UPSTREAM_VERSION} | sed -r 's/([0-9\.]+).*/\1/')
+    JAVA_HOME            := /usr/lib/jvm/default-java
+    DEB_JARS             := ant-nodeps classworlds maven-core maven-artifact maven-artifact-manager maven-model \
+     maven-compat maven-plugin-api maven-project maven-scm-api velocity file-management plexus-utils \
+     plexus-container-default-alpha maven-repo-helper
+    DEB_ANT_BUILD_TARGET := package
+    DEB_ANT_BUILDFILE    := debian/build.xml
+    DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dbin.package=$(PACKAGE)
+    API_DOCS             := target/api
+    
+    install/$(PACKAGE)::
+        mh_install -p$(PACKAGE)
+        
+    clean::
+        mh_clean
+
+This is a simplified version of debian/rules, which shows how to use the mh\_install and mh\_clean scripts from maven-repo-helper
+with CDBS and Ant.
+mh\_install performs the installation of the built jars into /usr/share/maven-repo and /usr/share/java. It uses the configuration defined
+in maven-debian-helper.poms.
+mh\_clean does the clean up of files left behind during the execution of mh\_install.
+
+maven-debian-helper.poms:
+
+    pom.xml --no-parent --has-package-version
+    maven-debian-helper/pom.xml --has-package-version --artifact=maven-debian-helper/target/maven-debian-helper-*.jar --java-lib
+    maven-debian-plugin/pom.xml --has-package-version --artifact=maven-debian-plugin/target/maven-debian-plugin-*.jar --java-lib
+    maven-build-nodocs/pom.xml --has-package-version --artifact=maven-build-nodocs/target/maven-build-nodocs-*.jar --java-lib
+    maven-packager-utils/pom.xml --has-package-version --artifact=maven-packager-utils/target/maven-packager-utils-*.jar --java-lib
+
+Here we tell mh\_install to deploy the maven-debian-helper project and its sub projects into /usr/share/maven-repo,
+and to deploy all jars also into /usr/share/java (--java-lib option)
+
+CDBS + maven-repo-helper using mh\_installpoms and mh\_installjar
+-----------------------------------------------------------------
+
+debian/control:
+
+    Source: plexus-io
+    Section: java
+    Priority: optional
+    Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+    Uploaders: Torsten Werner <twerner at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>
+    Build-Depends: debhelper (>= 5), cdbs (>= 0.4.5.3), default-jdk
+    Build-Depends-Indep: maven-repo-helper (>= 1.7), maven-ant-helper (>= 7), ant, ant-optional, 
+     libplexus-utils-java, libplexus-containers-java
+    Standards-Version: 3.8.1
+    Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-io
+    Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-io/
+    Homepage: http://plexus.codehaus.org/plexus-components/plexus-io/
+
+    Package: libplexus-io-java
+    Architecture: all
+    Depends: ${misc:Depends}, libplexus-utils-java, libplexus-containers-java
+    Description: Plexus IO Components
+     [...]
+
+Note the Build-Depends on cdbs and maven-repo-helper.
+
+debian/rules:
+
+    #!/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-nodeps plexus-utils plexus-container-default
+    DEB_ANT_BUILD_TARGET := package #javadoc
+    DEB_ANT_BUILDFILE    := /usr/share/maven-ant-helper/maven-build.xml
+    DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
+    API_DOCS             := build/api
+
+    binary-post-install/lib$(PACKAGE)-java::
+        mh_installpoms -plib$(PACKAGE)-java
+        mh_installjar -plib$(PACKAGE)-java -l pom.xml build/$(PACKAGE)-$(VERSION).jar
+
+    clean::
+        mh_clean
+
+No patches for the POM files are needed, all is taken care of by the mh\_installpom script (which uses mh\_cleanpom)
+
+mh\_installpoms will install all POM files registered in debian/lib$package-java.pom into /usr/share/maven-repo,
+
+mh\_installjar will install the jar file associated with the POM into /usr/share/maven-repo and also add a link to the jar in /usr/share/java, with and without the version
+
+debian/libplexus-io-java.pom
+
+    pom.xml --no-parent
+
+It simply lists the pom files in the source tree which need to be installed in the repository, and indicates with the --no-parent option that if the POM inherits
+from a parent POM, then this inheritance relationship will be removed in the cleaned POM. Removing the parent inheritence can often simplify the packaging, as 
+the parent POM mostly does not contain any useful information - we need only the list of dependencies in our repository, the other details for the build are irrelevant.
+
+There is less configuration here because we are using the low-level mh_installpoms and mh_installjar scripts which place the configuration on their command line options.
+
+Typical workflow for packaging a project from source
+----------------------------------------------------
+
+1. Get the original sources and unpack them, copy the debian/ folder if you are working on an existing package.
+1. mh\_make --ant
+1. edit debian/rules (to fix the last remaining packaging details)
+1. edit debian/control (to add maven-repo-helper to Build-Depends: )
+

Deleted: tags/maven-repo-helper/1.7/pom.xml
===================================================================
--- trunk/maven-repo-helper/pom.xml	2011-11-20 16:39:11 UTC (rev 15419)
+++ tags/maven-repo-helper/1.7/pom.xml	2011-11-20 19:13:36 UTC (rev 15427)
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.debian.maven</groupId>
-    <artifactId>maven-repo-helper</artifactId>
-    <name>Maven Repo helper</name>
-    <packaging>jar</packaging>
-    <version>1.6.1</version>
-    <description>Provides support for managing the Maven repository in a Debian distribution.</description>
-
-    <inceptionYear>2009</inceptionYear>
-    <url>https://code.launchpad.net/maven-packaging-support/</url>
-    <licenses>
-        <license>
-            <name>BSD</name>
-            <url>http://opensource.org/licenses/bsd-license.php</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <developers>
-        <developer>
-            <name>Ludovic Claude</name>
-            <email>ludovic.claude at laposte.net</email>
-            <roles>
-                <role>Developer</role>
-            </roles>
-            <timezone>+0</timezone>
-        </developer>
-    </developers>
-
-    <issueManagement>
-        <system>launchpad</system>
-        <url>https://bugs.launchpad.net/maven-packaging-support</url>
-    </issueManagement>
-    <scm>
-        <connection>scm:bzr:lp:~ludovicc/maven-packaging-support/maven-repo-helper</connection>
-        <developerConnection>scm:bzr:lp:~ludovicc/maven-packaging-support/maven-repo-helper</developerConnection>
-        <url>http://bazaar.launchpad.net/~ludovicc/maven-packaging-support/maven-repo-helper/files</url>
-    </scm>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.4</source>
-                    <target>1.4</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                  <includes>
-                    <include>**/*Test.java</include>
-                  </includes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>xmlunit</groupId>
-            <artifactId>xmlunit</artifactId>
-            <version>1.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>1.4</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>

Copied: tags/maven-repo-helper/1.7/pom.xml (from rev 15425, trunk/maven-repo-helper/pom.xml)
===================================================================
--- tags/maven-repo-helper/1.7/pom.xml	                        (rev 0)
+++ tags/maven-repo-helper/1.7/pom.xml	2011-11-20 19:13:36 UTC (rev 15427)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.debian.maven</groupId>
+    <artifactId>maven-repo-helper</artifactId>
+    <name>Maven Repo helper</name>
+    <packaging>jar</packaging>
+    <version>1.7</version>
+    <description>Provides support for managing the Maven repository in a Debian distribution.</description>
+
+    <inceptionYear>2009</inceptionYear>
+    <url>https://code.launchpad.net/maven-packaging-support/</url>
+    <licenses>
+        <license>
+            <name>BSD</name>
+            <url>http://opensource.org/licenses/bsd-license.php</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <developers>
+        <developer>
+            <name>Ludovic Claude</name>
+            <email>ludovic.claude at laposte.net</email>
+            <roles>
+                <role>Developer</role>
+            </roles>
+            <timezone>+0</timezone>
+        </developer>
+    </developers>
+
+    <issueManagement>
+        <system>launchpad</system>
+        <url>https://bugs.launchpad.net/maven-packaging-support</url>
+    </issueManagement>
+    <scm>
+        <connection>scm:bzr:lp:~ludovicc/maven-packaging-support/maven-repo-helper</connection>
+        <developerConnection>scm:bzr:lp:~ludovicc/maven-packaging-support/maven-repo-helper</developerConnection>
+        <url>http://bazaar.launchpad.net/~ludovicc/maven-packaging-support/maven-repo-helper/files</url>
+    </scm>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.4</source>
+                    <target>1.4</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                  <includes>
+                    <include>**/*Test.java</include>
+                  </includes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>xmlunit</groupId>
+            <artifactId>xmlunit</artifactId>
+            <version>1.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.4</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>

Deleted: tags/maven-repo-helper/1.7/src/main/share/mh_lib.sh
===================================================================
--- trunk/maven-repo-helper/src/main/share/mh_lib.sh	2011-11-20 16:39:11 UTC (rev 15419)
+++ tags/maven-repo-helper/1.7/src/main/share/mh_lib.sh	2011-11-20 19:13:36 UTC (rev 15427)
@@ -1,108 +0,0 @@
-# This is included by mh_* and contains common functions
-#
-# - argument parsing
-# - package selection
-#
-
-MH_VERSION=${MH_VERSION:-1.6.1}
-CLASSPATH=/usr/share/java/stax-api.jar:/usr/share/java/stax.jar:/usr/share/java/xml-apis.jar:/usr/share/java/maven-repo-helper.jar
-JAVA_OPTIONS="-Djavax.xml.stream.XMLOutputFactory=com.bea.xml.stream.XMLOutputFactoryBase -Djavax.xml.stream.XMLInputFactory=com.bea.xml.stream.MXParserFactory"
-
-parseargs()
-{
-   # clean arguments from a previous run
-   unset "${!opt_@}"
-
-   ARGC=0
-   ARGV=()
-   while [ -n "$1" ]; do
-      if [ "-V" = "$1" ] || [ "--version" = "$1" ]; then
-         echo "Maven Repo Helper version $MH_VERSION"
-         exit 0
-      elif [ "-h" = "$1" ] || [ "--help" = "$1" ]; then
-         syntax
-      elif [ "-" = "${1:1:1}" ]; then
-      # long opt
-         optn=$(echo "$1" | sed -n 's/^--\([^=]*\)\(=.*\)*$/\1/p' | sed 's/-/_/g')
-         if [ -z "$optn" ] || ! echo $ARGS | sed 's/-/_/g' | grep $optn >/dev/null; then
-            echo "Invalid option: $optn"
-            syntax
-         fi
-         optv=$(echo "$1" | sed -n 's/^[^=]*=\(.*\)$/\1/p')
-         if [ -z "$optv" ]; then
-            optv=true
-         fi
-         export -a opt_$optn
-         eval opt_$optn'+=("$optv")'
-      elif [ "-" = "${1:0:1}" ]; then
-      # short opt
-         optn="${1:1:1}"
-         if [ "$optn" = "O" ]; then
-            : # skip -O options passed by dh 7
-         elif [ -z "$optn" ] || ! echo $ARGS | sed 's/-/_/g' | grep $optn >/dev/null; then
-            echo "Invalid option: $optn"
-            syntax
-         else
-            optv="${1:2}"
-            if [ -z "$optv" ]; then
-               optv=true
-            fi
-            export -a opt_$optn
-            eval opt_$optn'+=("$optv")'
-         fi
-      else
-      # not-opt arg
-         ARGV[$ARGC]="$1"
-         ARGC=$(( $ARGC + 1 ))
-      fi
-      shift
-   done
-   export ARGC
-   export ARGV
-}
-
-getarg()
-{
-   while [ -n "$1" ]; do
-      optn=$(echo "opt_$1" | sed 's/-/_/g')
-      if [ -n "${!optn[0]}" ]; then
-         echo ${!optn[0]}
-         return
-      fi
-      shift
-   done
-}
-
-getargs()
-{
-   echo -n '('
-   while [ -n "$1" ]; do
-      optn=$(echo "opt_$1" | sed 's/-/_/g')
-      if [ -n "${!optn[0]}" ]; then
-         echo -n '"${'$optn'[@]}" '
-      fi
-      shift
-   done
-   echo ')'
-}
-
-findpackages()
-{
-   if [ -n "$opt_p" ]; then
-      echo $opt_p
-   elif [ -n "$opt_package" ]; then
-      echo $opt_package
-   elif [ -n "$opt_i" ] || [ -n "$opt_indep" ]; then
-      egrep '^(Package|Architecture)' debian/control | grep -B1 'Architecture: all'|sed -n '/^Package:/s/^[^:]*: *//p'
-   elif [ -n "$opt_a" ] || [ -n "$opt_arch" ]; then
-      egrep '^(Package|Architecture)' debian/control | grep -v 'Architecture: all' | grep -B1 Architecture|sed -n '/^Package:/s/^[^:]*: *//p'
-   else
-      sed -n '/^Package:/s/^[^:]*: *//p' debian/control
-   fi
-}
-
-firstpackage()
-{ 
-   findpackages | head -n1
-}
-

Copied: tags/maven-repo-helper/1.7/src/main/share/mh_lib.sh (from rev 15425, trunk/maven-repo-helper/src/main/share/mh_lib.sh)
===================================================================
--- tags/maven-repo-helper/1.7/src/main/share/mh_lib.sh	                        (rev 0)
+++ tags/maven-repo-helper/1.7/src/main/share/mh_lib.sh	2011-11-20 19:13:36 UTC (rev 15427)
@@ -0,0 +1,108 @@
+# This is included by mh_* and contains common functions
+#
+# - argument parsing
+# - package selection
+#
+
+MH_VERSION=${MH_VERSION:-1.7}
+CLASSPATH=/usr/share/java/stax-api.jar:/usr/share/java/stax.jar:/usr/share/java/xml-apis.jar:/usr/share/java/maven-repo-helper.jar
+JAVA_OPTIONS="-Djavax.xml.stream.XMLOutputFactory=com.bea.xml.stream.XMLOutputFactoryBase -Djavax.xml.stream.XMLInputFactory=com.bea.xml.stream.MXParserFactory"
+
+parseargs()
+{
+   # clean arguments from a previous run
+   unset "${!opt_@}"
+
+   ARGC=0
+   ARGV=()
+   while [ -n "$1" ]; do
+      if [ "-V" = "$1" ] || [ "--version" = "$1" ]; then
+         echo "Maven Repo Helper version $MH_VERSION"
+         exit 0
+      elif [ "-h" = "$1" ] || [ "--help" = "$1" ]; then
+         syntax
+      elif [ "-" = "${1:1:1}" ]; then
+      # long opt
+         optn=$(echo "$1" | sed -n 's/^--\([^=]*\)\(=.*\)*$/\1/p' | sed 's/-/_/g')
+         if [ -z "$optn" ] || ! echo $ARGS | sed 's/-/_/g' | grep $optn >/dev/null; then
+            echo "Invalid option: $optn"
+            syntax
+         fi
+         optv=$(echo "$1" | sed -n 's/^[^=]*=\(.*\)$/\1/p')
+         if [ -z "$optv" ]; then
+            optv=true
+         fi
+         export -a opt_$optn
+         eval opt_$optn'+=("$optv")'
+      elif [ "-" = "${1:0:1}" ]; then
+      # short opt
+         optn="${1:1:1}"
+         if [ "$optn" = "O" ]; then
+            : # skip -O options passed by dh 7
+         elif [ -z "$optn" ] || ! echo $ARGS | sed 's/-/_/g' | grep $optn >/dev/null; then
+            echo "Invalid option: $optn"
+            syntax
+         else
+            optv="${1:2}"
+            if [ -z "$optv" ]; then
+               optv=true
+            fi
+            export -a opt_$optn
+            eval opt_$optn'+=("$optv")'
+         fi
+      else
+      # not-opt arg
+         ARGV[$ARGC]="$1"
+         ARGC=$(( $ARGC + 1 ))
+      fi
+      shift
+   done
+   export ARGC
+   export ARGV
+}
+
+getarg()
+{
+   while [ -n "$1" ]; do
+      optn=$(echo "opt_$1" | sed 's/-/_/g')
+      if [ -n "${!optn[0]}" ]; then
+         echo ${!optn[0]}
+         return
+      fi
+      shift
+   done
+}
+
+getargs()
+{
+   echo -n '('
+   while [ -n "$1" ]; do
+      optn=$(echo "opt_$1" | sed 's/-/_/g')
+      if [ -n "${!optn[0]}" ]; then
+         echo -n '"${'$optn'[@]}" '
+      fi
+      shift
+   done
+   echo ')'
+}
+
+findpackages()
+{
+   if [ -n "$opt_p" ]; then
+      echo $opt_p
+   elif [ -n "$opt_package" ]; then
+      echo $opt_package
+   elif [ -n "$opt_i" ] || [ -n "$opt_indep" ]; then
+      egrep '^(Package|Architecture)' debian/control | grep -B1 'Architecture: all'|sed -n '/^Package:/s/^[^:]*: *//p'
+   elif [ -n "$opt_a" ] || [ -n "$opt_arch" ]; then
+      egrep '^(Package|Architecture)' debian/control | grep -v 'Architecture: all' | grep -B1 Architecture|sed -n '/^Package:/s/^[^:]*: *//p'
+   else
+      sed -n '/^Package:/s/^[^:]*: *//p' debian/control
+   fi
+}
+
+firstpackage()
+{ 
+   findpackages | head -n1
+}
+




More information about the pkg-java-commits mailing list