This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jtidy.
commit f3d4ae0c762be9bf33c3a21ada2037fc028266f6 Author: Tony Mancill <[email protected]> Date: Tue May 1 04:28:17 2012 +0000 updated d/maven.* files after build --- debian/libjtidy-java.poms | 14 ++++++++------ debian/maven.cleanIgnoreRules | 2 +- debian/maven.ignoreRules | 2 +- debian/maven.publishedRules | 2 +- debian/maven.rules | 3 ++- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/debian/libjtidy-java.poms b/debian/libjtidy-java.poms index df592fa..6ccad02 100644 --- a/debian/libjtidy-java.poms +++ b/debian/libjtidy-java.poms @@ -2,7 +2,9 @@ # Format of this file is: # <path to pom file> [option]* # where option can be: -# --ignore: ignore this POM or +# --ignore: ignore this POM and its artifact if any +# --ignore-pom: don't install the POM. To use on POM files that are created +# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms] # --no-parent: remove the <parent> tag from the POM # --package=<package>: an alternative package to use when installing this POM # and its artifact @@ -11,16 +13,16 @@ # --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM # during a clean operation with mh_cleanpom or mh_installpom # --artifact=<path>: path to the build artifact associated with this POM, -# it will be installed when using the command mh_install +# it will be installed when using the command mh_install. [mh_install] # --java-lib: install the jar into /usr/share/java to comply with Debian # packaging guidelines # --usj-name=<name>: name to use when installing the library in /usr/share/java # --usj-version=<version>: version to use when installing the library in /usr/share/java # --no-usj-versionless: don't install the versionless link in /usr/share/java -# --dest-jar=<path>: the destination for the real jar -# it will be installed with mh_install. +# --dest-jar=<path>: the destination for the real jar. +# It will be installed with mh_install. [mh_install] # --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. -# --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created -# temporarily for certain artifacts such as Javadoc jars. +# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed. +# Empty by default. [mh_install] # pom.xml --java-lib diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules index b47b61d..d9825b6 100644 --- a/debian/maven.cleanIgnoreRules +++ b/debian/maven.cleanIgnoreRules @@ -13,5 +13,5 @@ # Example rule: match jar with groupid= junit, artifactid= junit # and version starting with 3., this dependency is then removed # from the POM before mvn clean is called -# junit junit jar s/3\\..*/3.x/ +# junit junit jar s/3\..*/3.x/ diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 9c7ef20..1108467 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -12,7 +12,7 @@ # Example rule: match jar with groupid= junit, artifactid= junit # and version starting with 3., this dependency is then removed # from the POM -# junit junit jar s/3\\..*/3.x/ +# junit junit jar s/3\..*/3.x/ org.apache.maven.plugins maven-changelog-plugin * * * * org.apache.maven.plugins maven-checkstyle-plugin * * * * diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules index 822f087..77aa245 100644 --- a/debian/maven.publishedRules +++ b/debian/maven.publishedRules @@ -15,5 +15,5 @@ # All elements much match before a rule can be applied # Example rule: match jar with groupid= junit, artifactid= junit # and version starting with 3., replacing the version with 3.x -# junit junit jar s/3\\..*/3.x/ +# junit junit jar s/3\..*/3.x/ diff --git a/debian/maven.rules b/debian/maven.rules index 1ca0f7b..39e92e7 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -14,9 +14,10 @@ # All elements much match before a rule can be applied # Example rule: match jar with groupid= junit, artifactid= junit # and version starting with 3., replacing the version with 3.x -# junit junit jar s/3\\..*/3.x/ +# junit junit jar s/3\..*/3.x/ junit junit jar s/4\..*/4.x/ * * log4j log4j jar s/1\.2\..*/1.2.x/ * * net.sf.jtidy jtidy jar s/.*/debian/ * * +log4j log4j * s/1\.2\..*/1.2.x/ * * s/ant/org.apache.ant/ * * s/.*/debian/ * * -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jtidy.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
