[jackson-dataformat-yaml] 06/07: Inherit from the parent POM and simplified the packaging

[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-yaml.

commit 4bb795a53242d257347c64988509c24c35c4d97e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 19 18:28:07 2016 +0100

    Inherit from the parent POM and simplified the packaging
---
 debian/changelog                        |  1 +
 debian/control                          |  1 +
 debian/libjackson2-dataformat-yaml.poms |  2 +-
 debian/maven.ignoreRules                |  1 -
 debian/maven.rules                      |  2 +-
 debian/replace-generate.sh              | 34 ---------------------------------
 debian/rules                            | 10 ----------
 7 files changed, 4 insertions(+), 47 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e8384f9..ca1263e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ jackson-dataformat-yaml (2.8.5-1) UNRELEASED; urgency=medium
   * New upstream release
     - Refreshed the patches
     - Depend on libjackson2-{core,annotations,databind}-java (>= 2.8.5)
+  * Inherit from the parent POM and simplified the packaging
   * Merged the Build-Depends-Indep field into Build-Depends
   * Switch to debhelper level 10
 
diff --git a/debian/control b/debian/control
index a2ddb37..5c76169 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Build-Depends:
  libmaven-bundle-plugin-java,
  libmaven-javadoc-plugin-java,
  libmaven-shade-plugin-java,
+ libreplacer-java,
  libyaml-snake-java (>= 1.15),
  libyaml-snake-java-doc,
  maven-debian-helper (>= 1.6.5),
diff --git a/debian/libjackson2-dataformat-yaml.poms b/debian/libjackson2-dataformat-yaml.poms
index 64b1188..1d885c3 100644
--- a/debian/libjackson2-dataformat-yaml.poms
+++ b/debian/libjackson2-dataformat-yaml.poms
@@ -25,4 +25,4 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-pom.xml --no-parent --has-package-version --java-lib
+pom.xml --has-package-version --java-lib
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 663dbff..0682031 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,5 +1,4 @@
 
-com.google.code.maven-replacer-plugin replacer * * * *
 org.apache.maven.plugins maven-failsafe-plugin * * * *
 org.apache.servicemix.tooling depends-maven-plugin * * * *
 org.ops4j.pax* * * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 0fbefa7..4246f29 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -6,6 +6,6 @@ com.fasterxml.jackson.core jackson-core jar s/.*/2.x/ * *
 com.fasterxml.jackson.core jackson-databind bundle s/.*/2.x/ * *
 com.fasterxml.jackson.core jackson-databind jar s/.*/2.x/ * *
 com.fasterxml.jackson.dataformat jackson-dataformat-yaml * s/.*/2.x/ * *
-junit junit jar s/4\..*/4.x/ * *
+junit junit jar s/.*/4.x/ * *
 org.yaml snakeyaml bundle s/1\..*/1.x/ * *
 org.yaml snakeyaml s/jar/bundle/ s/1\..*/1.x/ * *
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 80cf219..af66655 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,7 @@
 #!/usr/bin/make -f
 
-VERSION_FILE=src/main/java/com/fasterxml/jackson/dataformat/yaml/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-dataformat-yaml.git