[pkg-java] r16032 - trunk/jtidy/debian

[Tony Mancill]

Author: tmancill
Date: 2012-05-01 04:28:17 +0000 (Tue, 01 May 2012)
New Revision: 16032

Modified:
   trunk/jtidy/debian/libjtidy-java.poms
   trunk/jtidy/debian/maven.cleanIgnoreRules
   trunk/jtidy/debian/maven.ignoreRules
   trunk/jtidy/debian/maven.publishedRules
   trunk/jtidy/debian/maven.rules
Log:
updated d/maven.* files after build

Modified: trunk/jtidy/debian/libjtidy-java.poms
===================================================================
--- trunk/jtidy/debian/libjtidy-java.poms	2012-04-30 20:52:10 UTC (rev 16031)
+++ trunk/jtidy/debian/libjtidy-java.poms	2012-05-01 04:28:17 UTC (rev 16032)
@@ -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

Modified: trunk/jtidy/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/jtidy/debian/maven.cleanIgnoreRules	2012-04-30 20:52:10 UTC (rev 16031)
+++ trunk/jtidy/debian/maven.cleanIgnoreRules	2012-05-01 04:28:17 UTC (rev 16032)
@@ -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/
 

Modified: trunk/jtidy/debian/maven.ignoreRules
===================================================================
--- trunk/jtidy/debian/maven.ignoreRules	2012-04-30 20:52:10 UTC (rev 16031)
+++ trunk/jtidy/debian/maven.ignoreRules	2012-05-01 04:28:17 UTC (rev 16032)
@@ -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 * * * *

Modified: trunk/jtidy/debian/maven.publishedRules
===================================================================
--- trunk/jtidy/debian/maven.publishedRules	2012-04-30 20:52:10 UTC (rev 16031)
+++ trunk/jtidy/debian/maven.publishedRules	2012-05-01 04:28:17 UTC (rev 16032)
@@ -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/
 

Modified: trunk/jtidy/debian/maven.rules
===================================================================
--- trunk/jtidy/debian/maven.rules	2012-04-30 20:52:10 UTC (rev 16031)
+++ trunk/jtidy/debian/maven.rules	2012-05-01 04:28:17 UTC (rev 16032)
@@ -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/ * *