[jackson-databind] 03/04: Use maven-replacer-plugin instead of debian/replace-generate.sh
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Dec 20 23:49:11 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jackson-databind.
commit 959fc520b6168be8d1f6f8136e81aeedfa45cb7c
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Dec 21 00:12:20 2016 +0100
Use maven-replacer-plugin instead of debian/replace-generate.sh
---
debian/changelog | 1 +
debian/control | 1 +
debian/maven.ignoreRules | 2 --
debian/replace-generate.sh | 34 ----------------------------------
debian/rules | 10 ----------
5 files changed, 2 insertions(+), 46 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e989cd9..503a7a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ jackson-databind (2.8.5-2) UNRELEASED; urgency=medium
* Team upload.
* Added the missing build dependency on build-helper-maven-plugin
(Closes: #848734)
+ * Use maven-replacer-plugin instead of debian/replace-generate.sh
* Merged the Build-Depends-Indep field into Build-Depends
-- Emmanuel Bourg <ebourg at apache.org> Mon, 19 Dec 2016 22:38:55 +0100
diff --git a/debian/control b/debian/control
index c47ecba..8f31dd5 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Build-Depends:
libjackson2-core-java-doc,
libmaven-bundle-plugin-java,
libmaven-javadoc-plugin-java,
+ libreplacer-java,
maven-debian-helper (>= 1.6.5),
xmlstarlet
Standards-Version: 3.9.8
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 4464ce6..817835f 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,7 +1,5 @@
-com.google.code.maven-replacer-plugin replacer * * * *
org.hibernate hibernate-cglib-repack * * * *
-com.google.code.maven-replacer-plugin replacer * * * *
org.apache.maven.plugins maven-release-plugin * * * *
org.codehaus.mojo cobertura-maven-plugin * * * *
* * * * * test
diff --git a/debian/replace-generate.sh b/debian/replace-generate.sh
deleted file mode 100755
index e87bb49..0000000
--- a/debian/replace-generate.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-# Simple replacement for mavan-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 b93685c..af66655 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,7 @@
#!/usr/bin/make -f
-VERSION_FILE=./src/main/java/com/fasterxml/jackson/databind/cfg/PackageVersion.java
-
%:
dh $@ --with javahelper
-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
-
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-databind.git
More information about the pkg-java-commits
mailing list