[jackson-module-jaxb-annotations] 05/06: 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-module-jaxb-annotations.

commit 031e804ff2812a9ce4dc5af6864206a5186cd583
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 19 10:09:45 2016 +0100

    Inherit from the parent POM and simplified the packaging
---
 debian/changelog                                   |  1 +
 debian/control                                     |  3 +-
 .../libjackson2-module-jaxb-annotations-java.poms  |  2 +-
 debian/maven.ignoreRules                           |  1 -
 debian/maven.properties                            |  2 --
 debian/patches/fix-using-bundle.diff               | 15 ----------
 debian/patches/series                              |  1 -
 debian/replace-generate.sh                         | 34 ----------------------
 debian/rules                                       | 12 +-------
 9 files changed, 5 insertions(+), 66 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 20b9493..cba1287 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ jackson-module-jaxb-annotations (2.8.5-1) UNRELEASED; urgency=medium
   * New upstream release
     - Refreshed the patch
     - Depend on libjackson2-{core,annotations,databind}-java (>= 2.8.5)
+  * Inherit from the parent POM and simplified the packaging
   * Switch to debhelper level 10
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 15 Dec 2016 17:55:59 +0100
diff --git a/debian/control b/debian/control
index 1e72a63..169dc4a 100644
--- a/debian/control
+++ b/debian/control
@@ -11,10 +11,11 @@ Build-Depends:
 Build-Depends-Indep:
  libbuild-helper-maven-plugin-java,
  libjackson2-annotations-java (>= 2.8.5),
- libjackson2-core-java (>= 2.8.5),
+ libjackson2-core-java (>= 2.8.5-2~),
  libjackson2-databind-java (>= 2.8.5),
  libjaxb-api-java,
  libmaven-bundle-plugin-java,
+ libreplacer-java
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/jackson-module-jaxb-annotations.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jackson-module-jaxb-annotations.git
diff --git a/debian/libjackson2-module-jaxb-annotations-java.poms b/debian/libjackson2-module-jaxb-annotations-java.poms
index 5ad70f2..1d885c3 100644
--- a/debian/libjackson2-module-jaxb-annotations-java.poms
+++ b/debian/libjackson2-module-jaxb-annotations-java.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
+pom.xml --has-package-version --java-lib
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index fc60a4e..985d476 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -2,4 +2,3 @@
 javax.ws.rs jsr311-api * * * *
 junit junit * * * *
 org.apache.maven.plugins maven-surefire-plugin * * * *
-com.google.code.maven-replacer-plugin replacer * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
index a3df5ef..e593715 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -3,5 +3,3 @@
 # maven.test.skip=true
 
 maven.test.skip=true
-project.build.sourceEncoding=UTF-8
-
diff --git a/debian/patches/fix-using-bundle.diff b/debian/patches/fix-using-bundle.diff
deleted file mode 100644
index 1550b66..0000000
--- a/debian/patches/fix-using-bundle.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/pom.xml
-+++ b/pom.xml
-@@ -88,6 +88,12 @@
-           </execution>
-         </executions>
-       </plugin>
-+      <plugin>
-+        <groupId>org.apache.felix</groupId>
-+        <artifactId>maven-bundle-plugin</artifactId>
-+        <version>2.3.5</version>
-+        <extensions>true</extensions>
-+      </plugin>
- 
-     </plugins>
-   </build>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c39825f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-using-bundle.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 856b22c..5a6351f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,7 @@
 #!/usr/bin/make -f
 
-VERSION_FILE := src/main/java/com/fasterxml/jackson/module/jaxb/PackageVersion.java
-
 %:
 	dh $@
 
-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
-
 get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	uscan --download-current-version --force-download --rename

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-module-jaxb-annotations.git