[jackson-datatype-joda] 03/05: Depend on libjackson2-{core, annotations, databind}-java (>= 2.8.5)

[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-datatype-joda.

commit 56ef19d8cd583ad87c5bfcc807d699a876fd38c1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 19 11:56:38 2016 +0100

    Depend on libjackson2-{core,annotations,databind}-java (>= 2.8.5)
---
 debian/changelog                           |  4 +++-
 debian/control                             |  8 +++++---
 debian/libjackson2-datatype-joda-java.poms |  2 +-
 debian/maven.rules                         | 11 ++++-------
 debian/patches/add-junit-dependency.patch  | 20 --------------------
 debian/patches/dont-osgi-bundle.patch      | 14 --------------
 debian/patches/series                      |  2 --
 7 files changed, 13 insertions(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c6db41d..b3bd259 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-jackson-datatype-joda (2.7.3-2) UNRELEASED; urgency=medium
+jackson-datatype-joda (2.8.5-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Depend on libjackson2-{core,annotations,databind}-java (>= 2.8.5)
   * Switch to debhelper level 10
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 19 Dec 2016 10:40:47 +0100
diff --git a/debian/control b/debian/control
index ccd9b7d..3b153b5 100644
--- a/debian/control
+++ b/debian/control
@@ -8,10 +8,12 @@ Build-Depends: debhelper (>= 10),
                default-jdk-doc,
                javahelper,
                junit4,
-               libjackson2-annotations-java,
-               libjackson2-core-java,
-               libjackson2-databind-java,
+               libbuild-helper-maven-plugin-java,
+               libjackson2-annotations-java (>= 2.8.5),
+               libjackson2-core-java (>= 2.8.5),
+               libjackson2-databind-java (>= 2.8.5),
                libjoda-time-java,
+               libmaven-bundle-plugin-java,
                libmaven-javadoc-plugin-java,
                maven-debian-helper,
                xmlstarlet
diff --git a/debian/libjackson2-datatype-joda-java.poms b/debian/libjackson2-datatype-joda-java.poms
index 64b1188..1d885c3 100644
--- a/debian/libjackson2-datatype-joda-java.poms
+++ b/debian/libjackson2-datatype-joda-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 --java-lib
+pom.xml --has-package-version --java-lib
diff --git a/debian/maven.rules b/debian/maven.rules
index 6b2d873..fd0c8b4 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,7 +1,4 @@
-com.fasterxml.jackson.core jackson-core bundle s/.*/2.x/ * *
-com.fasterxml.jackson.core jackson-core jar s/.*/2.x/ * *
-com.fasterxml.jackson.core jackson-annotations bundle s/.*/2.x/ * *
-com.fasterxml.jackson.core jackson-annotations jar s/.*/2.x/ * *
-com.fasterxml.jackson.core jackson-databind bundle s/.*/2.x/ * *
-com.fasterxml.jackson.core jackson-databind jar s/.*/2.x/ * *
-junit junit jar s/4\..*/4.x/ * *
+com.fasterxml.jackson.core jackson-core * s/.*/2.x/ * *
+com.fasterxml.jackson.core jackson-annotations * s/.*/2.x/ * *
+com.fasterxml.jackson.core jackson-databind * s/.*/2.x/ * *
+junit junit jar s/.*/4.x/ * *
diff --git a/debian/patches/add-junit-dependency.patch b/debian/patches/add-junit-dependency.patch
deleted file mode 100644
index e108b76..0000000
--- a/debian/patches/add-junit-dependency.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Add junit as a test dependency. This dependency is inherited
- from the parent pom (jackson-parent) which is ignored in the Debian package.
-Author: Tim Potter <tpot at hp.com>
-Forwarded: not-needed
---- a/pom.xml
-+++ b/pom.xml
-@@ -65,6 +65,13 @@
-         <version>2.4</version>
-     </dependency>
- 
-+    <dependency>
-+      <groupId>junit</groupId>
-+      <artifactId>junit</artifactId>
-+      <version>4.10</version>
-+      <scope>test</scope>
-+    </dependency>
-+
-   </dependencies>
- 
-   <build>
diff --git a/debian/patches/dont-osgi-bundle.patch b/debian/patches/dont-osgi-bundle.patch
deleted file mode 100644
index 2a93dfd..0000000
--- a/debian/patches/dont-osgi-bundle.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Disable OSGI bundling
- OSGI bundling is not supported or required for Debian.
-Author: Tim Potter <tpot at hp.com>
-Forwarded: not-needed
---- a/pom.xml
-+++ b/pom.xml
-@@ -10,7 +10,6 @@
-   <artifactId>jackson-datatype-joda</artifactId>
-   <name>Jackson-datatype-Joda</name>
-   <version>2.7.3</version>
--  <packaging>bundle</packaging>
-   <description>Add-on module for Jackson (http://jackson.codehaus.org) to support
- Joda (http://joda-time.sourceforge.net/) data types.
-   </description>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7a9ca17..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-dont-osgi-bundle.patch
-add-junit-dependency.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-datatype-joda.git