[jackson-jaxrs-providers] 03/10: Inherit from the parent POM and simplified the packaging
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Dec 21 14:08:57 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-jaxrs-providers.
commit 91e25bb8bbfececf56c0157bec6f21c629675a80
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Dec 21 11:48:29 2016 +0100
Inherit from the parent POM and simplified the packaging
---
debian/changelog | 1 +
debian/control | 6 +-
debian/libjackson2-jaxrs-providers-java.poms | 8 +--
debian/maven.ignoreRules | 1 -
debian/maven.rules | 1 +
debian/patches/fix-bundle-dependencies.patch | 26 ++++++--
debian/patches/fix-using-bundle.diff | 19 ------
debian/patches/force-core-version.diff | 89 ----------------------------
debian/patches/series | 2 -
debian/replace-generate.sh | 34 -----------
debian/rules | 16 -----
11 files changed, 30 insertions(+), 173 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8d12ea4..8f1047c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
jackson-jaxrs-providers (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 0def94a..5fc5128 100644
--- a/debian/control
+++ b/debian/control
@@ -6,12 +6,14 @@ Uploaders: Timo Aaltonen <tjaalton at debian.org>
Build-Depends:
debhelper (>= 10),
default-jdk,
- libjackson2-core-java (>= 2.7.3),
- libjackson2-databind-java (>= 2.7.3),
+ libbuild-helper-maven-plugin-java,
+ libjackson2-core-java (>= 2.8.5),
+ libjackson2-databind-java (>= 2.8.5),
libjackson2-dataformat-smile (>= 2.7.3),
libjackson2-module-jaxb-annotations-java (>= 2.4),
libjsr311-api-java,
libmaven-bundle-plugin-java,
+ libreplacer-java,
maven-debian-helper (>= 1.5),
xmlstarlet
Standards-Version: 3.9.8
diff --git a/debian/libjackson2-jaxrs-providers-java.poms b/debian/libjackson2-jaxrs-providers-java.poms
index 4e13043..70e77ce 100644
--- a/debian/libjackson2-jaxrs-providers-java.poms
+++ b/debian/libjackson2-jaxrs-providers-java.poms
@@ -25,10 +25,10 @@
# --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
-base/pom.xml --has-package-version
+pom.xml --has-package-version
+base/pom.xml --has-package-version --java-lib
cbor/pom.xml --ignore
-json/pom.xml --has-package-version
-smile/pom.xml --has-package-version
+json/pom.xml --has-package-version --java-lib
+smile/pom.xml --has-package-version --java-lib
xml/pom.xml --ignore
yaml/pom.xml --ignore
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index f96b231..04ffcdc 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,7 +1,6 @@
com.fasterxml.jackson.jaxrs jackson-jaxrs-cbor-provider bundle * * *
com.fasterxml.jackson.jaxrs jackson-jaxrs-xml-provider bundle * * *
-com.google.code.maven-replacer-plugin replacer * * * *
com.sun.jersey jersey-core * * * *
com.sun.jersey jersey-server * * * *
com.sun.jersey jersey-servlet * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 738eab2..e5d9ccd 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,4 +1,5 @@
+com.fasterxml.jackson jackson-parent pom s/.*/debian/ * *
com.fasterxml.jackson.jaxrs jackson-jaxrs-base * s/.*/2.x/ * *
com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider * s/.*/2.x/ * *
com.fasterxml.jackson.jaxrs jackson-jaxrs-smile-provider * s/.*/2.x/ * *
diff --git a/debian/patches/fix-bundle-dependencies.patch b/debian/patches/fix-bundle-dependencies.patch
index 72a6947..392debb 100644
--- a/debian/patches/fix-bundle-dependencies.patch
+++ b/debian/patches/fix-bundle-dependencies.patch
@@ -1,20 +1,34 @@
--- a/smile/pom.xml
+++ b/smile/pom.xml
-@@ -34,6 +34,7 @@
+@@ -34,12 +34,14 @@
<artifactId>jackson-jaxrs-base</artifactId>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <version>2.7.3</version>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ <type>bundle</type>
</dependency>
<!-- Extends Jackson core, mapper, and also (sort of optionally) on JAXB annotation handler -->
<dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${version.jackson.core}</version>
++ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
--- a/json/pom.xml
+++ b/json/pom.xml
-@@ -34,6 +34,7 @@
+@@ -34,12 +34,14 @@
<artifactId>jackson-jaxrs-base</artifactId>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <version>2.7.3</version>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ <type>bundle</type>
</dependency>
<!-- Extends Jackson core, mapper, and also (sort of optionally) on JAXB annotation handler -->
<dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${version.jackson.core}</version>
++ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/debian/patches/fix-using-bundle.diff b/debian/patches/fix-using-bundle.diff
deleted file mode 100644
index e22e5be..0000000
--- a/debian/patches/fix-using-bundle.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/pom.xml
-+++ b/pom.xml
-@@ -109,4 +109,16 @@
- </dependency>
-
- </dependencies>
-+
-+ <build>
-+ <plugins>
-+ <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/force-core-version.diff b/debian/patches/force-core-version.diff
deleted file mode 100644
index 9d67490..0000000
--- a/debian/patches/force-core-version.diff
+++ /dev/null
@@ -1,89 +0,0 @@
---- a/base/pom.xml
-+++ b/base/pom.xml
-@@ -32,12 +32,12 @@
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
-- <version>${version.jackson.core}</version>
-+ <version>2.7.3</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
-- <version>${version.jackson.core}</version>
-+ <version>2.7.3</version>
- </dependency>
- <!-- test deps should come from parent -->
- </dependencies>
---- a/json/pom.xml
-+++ b/json/pom.xml
-@@ -32,25 +32,25 @@
- <!-- builds on shared base JAX-RS handling code... -->
- <dependency>
- <artifactId>jackson-jaxrs-base</artifactId>
-- <groupId>${project.groupId}</groupId>
-- <version>${project.version}</version>
-+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
-+ <version>2.7.3</version>
- </dependency>
- <!-- Extends Jackson core, mapper, and also (sort of optionally) on JAXB annotation handler -->
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
-- <version>${version.jackson.core}</version>
-+ <version>2.7.3</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
-- <version>${version.jackson.core}</version>
-+ <version>2.7.3</version>
- </dependency>
- <!-- also need JAXB annotation support -->
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
-- <version>${version.jackson.jaxb}</version>
-+ <version>2.7.3</version>
- </dependency>
-
- <!-- test deps should mostly come from parent, including jersey -->
---- a/smile/pom.xml
-+++ b/smile/pom.xml
-@@ -32,30 +32,30 @@
- <!-- builds on shared base JAX-RS handling code... -->
- <dependency>
- <artifactId>jackson-jaxrs-base</artifactId>
-- <groupId>${project.groupId}</groupId>
-- <version>${project.version}</version>
-+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
-+ <version>2.7.3</version>
- </dependency>
- <!-- Extends Jackson core, mapper, and also (sort of optionally) on JAXB annotation handler -->
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
-- <version>${version.jackson.core}</version>
-+ <version>2.7.3</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
-- <version>${version.jackson.core}</version>
-+ <version>2.7.3</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-smile</artifactId>
-- <version>${version.jackson.smile}</version>
-+ <version>2.7.3</version>
- </dependency>
- <!-- may also need JAXB annotation support -->
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
-- <version>${version.jackson.jaxb}</version>
-+ <version>2.7.3</version>
- </dependency>
- </dependencies>
- <build>
diff --git a/debian/patches/series b/debian/patches/series
index 3f8fc1e..b55f6de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-force-core-version.diff
-fix-using-bundle.diff
fix-bundle-dependencies.patch
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 ba55224..5a6351f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,7 @@
#!/usr/bin/make -f
-VERSION_FILES = \
- json/src/main/java/com/fasterxml/jackson/jaxrs/json/PackageVersion.java \
- xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/PackageVersion.java \
- smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/PackageVersion.java \
- cbor/src/main/java/com/fasterxml/jackson/jaxrs/cbor/PackageVersion.java
-
%:
dh $@
-override_dh_auto_configure:
- for file in $(VERSION_FILES); do \
- sh debian/replace-generate.sh $$file \
- ; done
- dh_auto_configure
-
-override_dh_auto_clean:
- rm -f $(VERSION_FILES)
- dh_auto_clean
-
get-orig-source:
uscan --download-current-version --force-download --rename
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-jaxrs-providers.git
More information about the pkg-java-commits
mailing list