[postgis-java] 05/09: Rely on dh_auto_* defaults for maven buildsystem.

Fri Nov 27 18:29:10 UTC 2015

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

sebastic pushed a commit to tag debian/2.2.0-1.exp1
in repository postgis-java.

commit 9b6cbea201a4848e17f17f04791a56b8eaffee74
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Nov 27 11:01:51 2015 +0100

    Rely on dh_auto_* defaults for maven buildsystem.
---
 debian/changelog              |  1 +
 debian/libpostgis-java.poms   |  4 +++-
 debian/maven.cleanIgnoreRules | 16 ++++++++++++++++
 debian/maven.ignoreRules      | 15 +++++++++++++++
 debian/maven.properties       |  3 +++
 debian/maven.publishedRules   | 19 +++++++++++++++++++
 debian/maven.rules            | 26 ++++++++++++++++++++------
 debian/rules                  | 20 ++++++++------------
 8 files changed, 85 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c45b73..0a997b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ postgis-java (1:2.2.0-1) UNRELEASED; urgency=medium
     - Drop copyright holders for removed ejb{2,3} files
     - Drop unused license paragraph
   * Use default JVM for JAVA_HOME.
+  * Rely on dh_auto_* defaults for maven buildsystem.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 27 Nov 2015 01:54:21 +0100
 
diff --git a/debian/libpostgis-java.poms b/debian/libpostgis-java.poms
index b8650ca..1720aed 100644
--- a/debian/libpostgis-java.poms
+++ b/debian/libpostgis-java.poms
@@ -25,5 +25,7 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
+pom.xml --ignore
 jdbc/pom.xml --no-parent --has-package-version
-jdbc_jtsparser/pom.xml
+jdbc_jtsparser/pom.xml --ignore
+postgis-jdbc-java2d/pom.xml --ignore
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
index 8b13789..b47b61d 100644
--- a/debian/maven.cleanIgnoreRules
+++ b/debian/maven.cleanIgnoreRules
@@ -1 +1,17 @@
+# Maven clean ignore rules - ignore some Maven dependencies and plugins
+# during the clean phase of a Maven build
+# 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
+# All elements much match before a rule can be applied
+# 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/
 
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 8b13789..0088a40 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1 +1,16 @@
+# Maven ignore rules - ignore some 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
+# All elements much match before a rule can be applied
+# 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/
 
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..64b3437
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1,3 @@
+maven.compiler.source=1.7
+maven.compiler.target=1.7
+maven.test.skip=true
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
index 8b13789..9f0b827 100644
--- a/debian/maven.publishedRules
+++ b/debian/maven.publishedRules
@@ -1 +1,20 @@
+# Maven published rules - additional rules to publish, to help
+# the packaging work of Debian maintainers using mh_make
+# 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/
 
+net.postgis postgis-jdbc jar s/.*/debian/ * *
diff --git a/debian/maven.rules b/debian/maven.rules
index f3139b6..7861c69 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,8 +1,25 @@
+# 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/
 
-org.postgis postgis-jdbc jar s/.*/debian/ * *
+net.postgis postgis-jdbc jar s/.*/debian/ * *
 
-postgresql postgresql * s/.*/debian/ * * 
-com.vividsolutions jts s/.*/debian/ * *
+postgresql postgresql * s/.*/9.2.jdbc3/ * *
+com.vividsolutions jts * s/.*/debian/ * *
 
 ch.qos.logback logback-classic * s/.*/debian/ * *
 ch.qos.logback logback-core * s/.*/debian/ * *
@@ -14,13 +31,10 @@ org.apache.maven.plugins maven-compiler-plugin * s/.*/3.2/ * *
 org.apache.maven.plugins maven-dependency-plugin * s/.*/2.7/ * *
 org.apache.maven.plugins maven-ear-plugin * s/.*/2.3.2/ * *
 org.apache.maven.plugins maven-enforcer-plugin * s/.*/1.0/ * *
-#org.apache.maven.plugins maven-gpg-plugin * * * *
 org.apache.maven.plugins maven-install-plugin * s/.*/2.5.2/ * *
 org.apache.maven.plugins maven-jar-plugin * s/.*/2.4/ * *
 org.apache.maven.plugins maven-javadoc-plugin * s/.*/2.10.2/ * *
-#org.apache.maven.plugins maven-jarsigner-plugin * * * *
 org.apache.maven.plugins maven-resources-plugin * s/.*/2.3/ * *
 org.apache.maven.plugins maven-source-plugin * s/.*/2.2.1/ * *
-#org.apache.maven.plugins maven-surefire-plugin * * * *
 org.apache.maven.plugins maven-war-plugin * s/.*/2.1.1/ * *
 
diff --git a/debian/rules b/debian/rules
index c97171b..06300c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,29 +2,25 @@
 
 export JAVA_HOME := /usr/lib/jvm/default-java
 
-# Use maven in offline mode and with the local Debian repo
-MVN = JAVA_HOME=$(JAVA_HOME) mvn --offline \
-	-Dmaven.repo.local=/usr/share/maven-repo \
-	-Dmaven.compiler.source=1.7 \
-	-Dmaven.compiler.target=1.7 \
-	-Dmaven.test.skip=true
-
 UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
 
 %:
 	dh $@ --parallel \
-	      --with maven_repo_helper \
 	      --buildsystem maven
 
 override_dh_auto_clean:
-	-mh_clean
+	dh_auto_clean
+	mh_clean
 
 override_dh_auto_build:
-	(cd jdbc && $(MVN) package)
+	dh_auto_build --sourcedirectory jdbc
+
+override_dh_auto_test:
+	dh_auto_test --sourcedirectory jdbc
 
 override_dh_auto_install:
-	mh_installjar -v -plibpostgis-java -l jdbc/pom.xml jdbc/target/postgis-jdbc-$(UPSTREAM_VERSION).jar
-	mh_installpoms -v -plibpostgis-java
+	mh_installjar -plibpostgis-java -l jdbc/pom.xml jdbc/target/postgis-jdbc-$(UPSTREAM_VERSION).jar
+	mh_installpoms -plibpostgis-java
 
 get-orig-source:
 	. debian/get-orig-source

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis-java.git

