[SCM] objenesis - Java library to instantiate a new object of a particular class branch, master, updated. debian/1.2+full-2-2-gd323d0d
Niels Thykier
niels at thykier.net
Tue Jun 19 17:55:58 UTC 2012
The following commit has been merged in the master branch:
commit d323d0df1f44a9959192376612c51d6802b28368
Author: Niels Thykier <niels at thykier.net>
Date: Tue Jun 19 19:55:43 2012 +0200
Refresh the comments in the maven files
Signed-off-by: Niels Thykier <niels at thykier.net>
diff --git a/debian/libobjenesis-java.poms b/debian/libobjenesis-java.poms
index fd2b086..6dd1018 100644
--- a/debian/libobjenesis-java.poms
+++ b/debian/libobjenesis-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,17 +13,17 @@
# --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 --has-package-version
main/pom.xml --has-package-version --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 3fa9731..25415cd 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/
com.google.code.maven-license-plugin maven-license-plugin * * * *
com.keyboardsamurais.maven maven-timestamp-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 9dea1fb..ff2e2e2 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -14,7 +14,7 @@
# 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/3\..*/3.x/ * *
org.objenesis objenesis-parent pom s/.*/debian/ * *
--
objenesis - Java library to instantiate a new object of a particular class
More information about the pkg-java-commits
mailing list