[jackson-dataformat-xml] 01/01: Use the maven-replacer-plugin instead of debian/replace-generate.sh

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository jackson-dataformat-xml.

commit bb097be3be5652e3b5d2c917543be94b290b778a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jan 19 12:35:34 2017 +0100

    Use the maven-replacer-plugin instead of debian/replace-generate.sh
---
 debian/changelog           |  1 +
 debian/control             |  2 ++
 debian/maven.ignoreRules   |  1 -
 debian/replace-generate.sh | 34 ----------------------------------
 debian/rules               | 12 +-----------
 5 files changed, 4 insertions(+), 46 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0b626fb..ba36fd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ jackson-dataformat-xml (2.8.6-1) UNRELEASED; urgency=medium
 
   [ Emmanuel Bourg ]
   * Inherit from the parent POM and removed the POM patches.
+  * Use the maven-replacer-plugin instead of debian/replace-generate.sh
 
   [ Markus Koschany ]
   * New upstream version 2.8.6.
diff --git a/debian/control b/debian/control
index f147d0a..6e56b7e 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends:
  debhelper (>= 10),
  default-jdk,
  default-jdk-doc,
+ libbuild-helper-maven-plugin-java,
  libjackson2-annotations-java (>= 2.8.5),
  libjackson2-annotations-java-doc,
  libjackson2-core-java (>= 2.8.5),
@@ -17,6 +18,7 @@ Build-Depends:
  libjackson2-module-jaxb-annotations-java,
  libmaven-bundle-plugin-java,
  libmaven-javadoc-plugin-java,
+ libreplacer-java,
  libstax2-api-java (>= 3.1.1),
  maven-debian-helper (>= 1.5),
  xmlstarlet
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index e7a7cf2..f3aee17 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,5 +1,4 @@
 
-com.google.code.maven-replacer-plugin replacer * * * *
 javax.xml.stream stax-api * * * *
 com.fasterxml.woodstox woodstox-core * * * *
 junit junit * * * *
diff --git a/debian/replace-generate.sh b/debian/replace-generate.sh
deleted file mode 100755
index 9993bf0..0000000
--- a/debian/replace-generate.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-# Simple replacement for maven-replacer-plugin
-
-set -e
-
-TARGET=$1; shift
-
-TEMPLATE=$TARGET.in
-
-get_attr() {
-    < pom.xml xmlstarlet sel \
-        -N pom=http://maven.apache.org/POM/4.0.0 \
-        -T -t -v $1
-}
-
-package=$(dirname $TARGET | sed -e 's,.*src/main/java/\(.*\)$,\1,' | tr / .)
-projectversion=$(get_attr '/pom:project/pom:version')
-projectgroupid=$(get_attr '/pom:project/pom:groupId')
-projectartifactid=$(get_attr '/pom:project/pom:artifactId')
-
-sed \
-    -e "s, at package@,$package,g" \
-    -e "s, at projectversion@,$projectversion,g" \
-    -e "s, at projectgroupid@,$projectgroupid,g" \
-    -e "s, at projectartifactid@,$projectartifactid,g" \
-    < $TEMPLATE > $TARGET.t
-
-if grep -i '@[a-z]*@' $TARGET.t >&2; then
-    echo 'Not all tags were
-    replaced' >&2 exit 1
-fi
-
-mv $TARGET.t $TARGET
diff --git a/debian/rules b/debian/rules
index 428eda4..b2b3f78 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,7 @@
 #!/usr/bin/make -f
-export JAVA_HOME=/usr/lib/jvm/default-java
-VERSION_FILE=src/main/java/com/fasterxml/jackson/dataformat/xml/PackageVersion.java
 
 %:
-	dh $@ --buildsystem=maven
-
-override_dh_auto_configure:
-	sh debian/replace-generate.sh $(VERSION_FILE)
-	dh_auto_configure
-
-override_dh_auto_clean:
-	rm -f $(VERSION_FILE)
-	dh_auto_clean
+	dh $@
 
 override_dh_installchangelogs:
 	dh_installchangelogs release-notes/VERSION

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-dataformat-xml.git