[maven-shared-utils] 03/08: Simplify and refresh Maven rules

Tue May 24 09:43:04 UTC 2016

This is an automated email from the git hooks/post-receive script.

seamlik-guest pushed a commit to branch master
in repository maven-shared-utils.

commit a0ebb4823df796b5812fff03ce563a959e1368a6
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Tue May 24 16:08:45 2016 +0800

    Simplify and refresh Maven rules
---
 debian/.gitignore                      |  9 +++++++++
 debian/libmaven-shared-utils-java.poms | 27 ---------------------------
 debian/maven.ignoreRules               |  3 ++-
 debian/maven.properties                | 11 +----------
 debian/maven.rules                     | 27 +++++----------------------
 5 files changed, 17 insertions(+), 60 deletions(-)

diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..f129f7b
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,9 @@
+*.log
+*.substvars
+debhelper-build-stamp
+files
+libmaven-shared-utils-java*/
+maven-repo/
+maven.cleanIgnoreRules
+maven.publishedRules
+stamp-poms-patched
\ No newline at end of file
diff --git a/debian/libmaven-shared-utils-java.poms b/debian/libmaven-shared-utils-java.poms
index 8545d14..43e746b 100644
--- a/debian/libmaven-shared-utils-java.poms
+++ b/debian/libmaven-shared-utils-java.poms
@@ -1,28 +1 @@
-# List of POM files for the package
-# Format of this file is:
-# <path to pom file> [option]*
-# where option can be:
-#   --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
-#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
-#      of the version for the package.
-#   --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. [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. [mh_install]
-#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
-#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
-#     Empty by default. [mh_install]
-#
 pom.xml --no-parent
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index fcdfeae..881fad4 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,4 +1,5 @@
 org.apache.maven.plugins maven-assembly-plugin * * * *
+org.apache.maven.plugins maven-checkstyle-plugin * * * *
 org.apache.maven.plugins maven-shade-plugin * * * *
 * apache-rat-plugin * * * *
-* findbugs-maven-plugin * * * *
+* findbugs-maven-plugin * * * *
\ No newline at end of file
diff --git a/debian/maven.properties b/debian/maven.properties
index 48ffadf..286111e 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -1,10 +1 @@
-# Include here properties to pass to Maven during the build.
-# For example:
-# maven.test.skip=true
-
-maven.test.skip=true
-
-maven.compiler.source=1.5
-maven.compiler.target=1.5
-
-project.build.sourceEncoding=UTF-8
+maven.test.skip=true
\ No newline at end of file
diff --git a/debian/maven.rules b/debian/maven.rules
index df6a688..3d68921 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,22 +1,5 @@
-# Maven rules - transform Maven dependencies and plugins
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-#   for the version. In this case, the element is simply matched
-#   and left as it is
-# - * (the star character, alone). In this case, anything will
-#   match and be left as it is. For example, using * on the
-#  position of the artifact field will match any artifact id
-# - a regular expression of the form s/match/replace/
-#   in this case, elements that match are transformed using
-#   the regex rule.
-# 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/
-
-s/com.google.code.findbugs/org.jsr-305/ jsr305 * s/.*/0.x/
-junit junit * s/4\..*/4.x/
-org.apache.commons commons-lang3 * s/3\..*/3.x/
-s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/
+junit junit * s/4\..*/4.x/ * *
+org.apache.commons commons-lang3 * s/3\..*/3.x/ * *
+org.apache.maven maven-core * s/.*/3.x/ * *
+s/com.google.code.findbugs/org.jsr-305/ jsr305 * s/.*/0.x/ * *
+s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ * *
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-shared-utils.git

