[jackson-dataformat-cbor] 05/06: Inherit from the parent POM and simplified the packaging
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Dec 19 14:31:38 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-dataformat-cbor.
commit 3741fbf3ad5fae4da0982a24a0ef987e7eed66c4
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Dec 19 15:27:35 2016 +0100
Inherit from the parent POM and simplified the packaging
---
debian/changelog | 1 +
debian/control | 8 +++++---
debian/libjackson2-dataformat-cbor.poms | 2 +-
debian/maven.cleanIgnoreRules | 1 -
debian/maven.ignoreRules | 2 --
debian/maven.rules | 3 ++-
debian/patches/fix-bundle-build.diff | 17 -----------------
debian/patches/series | 1 -
debian/replace-generate.sh | 34 ---------------------------------
debian/rules | 10 ----------
10 files changed, 9 insertions(+), 70 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5673df5..13219fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ jackson-dataformat-cbor (2.7.8-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release
+ * Inherit from the parent POM and simplified the packaging
* Merged the Build-Depends-Indep field into Build-Depends-Indep
* Switch to debhelper level 10
diff --git a/debian/control b/debian/control
index a070ba1..c2856ad 100644
--- a/debian/control
+++ b/debian/control
@@ -9,12 +9,14 @@ Build-Depends:
default-jdk-doc,
javahelper (>= 0.32),
junit4,
- libjackson2-annotations-java (>= 2.4.2),
- libjackson2-core-java (>= 2.4.2),
+ 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.4.2),
+ 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-cbor.poms b/debian/libjackson2-dataformat-cbor.poms
index 64b1188..1d885c3 100644
--- a/debian/libjackson2-dataformat-cbor.poms
+++ b/debian/libjackson2-dataformat-cbor.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.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
deleted file mode 100644
index 8b13789..0000000
--- a/debian/maven.cleanIgnoreRules
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 857aa68..e69de29 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,2 +0,0 @@
-
-com.google.code.maven-replacer-plugin replacer * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index e345375..fd4c72e 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 * s/.*/2.x/ * *
com.fasterxml.jackson.core jackson-core * s/.*/2.x/ * *
com.fasterxml.jackson.core jackson-databind * s/.*/2.x/ * *
com.fasterxml.jackson.dataformat jackson-dataformat-cbor * s/.*/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 ed71331..0000000
--- a/debian/patches/fix-bundle-build.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: jackson-dataformat-cbor/pom.xml
-===================================================================
---- jackson-dataformat-cbor.orig/pom.xml
-+++ jackson-dataformat-cbor/pom.xml
-@@ -74,6 +74,12 @@ encoded data using Jackson abstractions
- </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>
- </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 18fae81..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/cbor/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-cbor.git
More information about the pkg-java-commits
mailing list