[jackson-dataformat-smile] 03/05: 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-smile.

commit 5b20e092c4603105ff29d1667e88f0d46d47fe35
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 19 18:53:11 2016 +0100

    Inherit from the parent POM and simplified the packaging
---
 debian/changelog                         |  1 +
 debian/control                           |  8 +++++---
 debian/libjackson2-dataformat-smile.poms |  2 +-
 debian/maven.ignoreRules                 |  1 -
 debian/maven.rules                       |  3 ++-
 debian/patches/fix-bundle-build.diff     | 15 --------------
 debian/patches/series                    |  1 -
 debian/replace-generate.sh               | 34 --------------------------------
 debian/rules                             | 10 ----------
 9 files changed, 9 insertions(+), 66 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b60d09a..00d2a36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jackson-dataformat-smile (2.7.3-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * 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 d23c6eb..80b1418 100644
--- a/debian/control
+++ b/debian/control
@@ -10,12 +10,14 @@ Build-Depends:
  default-jdk,
  javahelper (>= 0.32),
  junit4,
- libjackson2-annotations-java (>= 2.7.3),
- libjackson2-core-java (>= 2.7.3),
+ libbuild-helper-maven-plugin-java,
+ libjackson2-annotations-java (>= 2.8.5),
+ libjackson2-core-java (>= 2.8.5),
  libjackson2-core-java-doc,
- libjackson2-databind-java (>= 2.7.3),
+ libjackson2-databind-java (>= 2.8.5),
  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/libjackson2-dataformat-smile.poms b/debian/libjackson2-dataformat-smile.poms
index 64b1188..1d885c3 100644
--- a/debian/libjackson2-dataformat-smile.poms
+++ b/debian/libjackson2-dataformat-smile.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 857aa68..8b13789 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,2 +1 @@
 
-com.google.code.maven-replacer-plugin replacer * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index b6127d9..428e9d3 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,6 +1,7 @@
 
+com.fasterxml.jackson jackson-parent pom s/.*/debian/ * *
 com.fasterxml.jackson.core jackson-annotations jar s/.*/2.x/ * *
 com.fasterxml.jackson.core jackson-core jar s/.*/2.x/ * *
 com.fasterxml.jackson.core jackson-databind jar s/.*/2.x/ * *
 com.fasterxml.jackson.dataformat jackson-dataformat-smile bundle s/2\..*/2.x/ * *
-junit junit jar s/4\..*/4.x/ * *
+junit junit jar s/.*/4.x/ * *
diff --git a/debian/patches/fix-bundle-build.diff b/debian/patches/fix-bundle-build.diff
deleted file mode 100644
index f62ee4c..0000000
--- a/debian/patches/fix-bundle-build.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/pom.xml
-+++ b/pom.xml
-@@ -86,6 +86,12 @@
-           </excludes>
-         </configuration>
-       </plugin>
-+      <plugin>
-+        <groupId>org.apache.felix</groupId>
-+        <artifactId>maven-bundle-plugin</artifactId>
-+        <version>2.3.5</version>
-+        <extensions>true</extensions>
-+      </plugin>
-     </plugins>
-   </build>
- </project>
diff --git a/debian/patches/series b/debian/patches/series
index 2460051..ea144f5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-fix-bundle-build.diff
 depend-on-junit.diff
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 a52e9aa..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/smile/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-smile.git