[jackson-dataformat-xml] 01/01: Inherit from the parent POM and removed the POM patches

[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-xml.

commit d4e40fb6563c1600a7f08ee5519303989639d222
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Dec 18 06:39:24 2016 +0100

    Inherit from the parent POM and removed the POM patches
---
 debian/changelog                                   |  7 ++++++
 debian/control                                     |  4 ++--
 debian/libjackson2-dataformat-xml-java.poms        |  2 +-
 debian/patches/fix-bundle-build.patch              | 25 ----------------------
 .../jackson-annotations-dependency-version.patch   | 20 -----------------
 debian/patches/series                              |  2 --
 6 files changed, 10 insertions(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 48a27cc..5349f08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jackson-dataformat-xml (2.8.5-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Inherit from the parent POM and removed the POM patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sun, 18 Dec 2016 06:39:12 +0100
+
 jackson-dataformat-xml (2.8.5-1) unstable; urgency=medium
 
   * New upstream version 2.8.5.
diff --git a/debian/control b/debian/control
index 55953cf..f147d0a 100644
--- a/debian/control
+++ b/debian/control
@@ -8,9 +8,9 @@ Build-Depends:
  debhelper (>= 10),
  default-jdk,
  default-jdk-doc,
- libjackson2-annotations-java,
+ libjackson2-annotations-java (>= 2.8.5),
  libjackson2-annotations-java-doc,
- libjackson2-core-java,
+ libjackson2-core-java (>= 2.8.5),
  libjackson2-core-java-doc,
  libjackson2-databind-java,
  libjackson2-databind-java-doc,
diff --git a/debian/libjackson2-dataformat-xml-java.poms b/debian/libjackson2-dataformat-xml-java.poms
index 5ad70f2..1d885c3 100644
--- a/debian/libjackson2-dataformat-xml-java.poms
+++ b/debian/libjackson2-dataformat-xml-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/patches/fix-bundle-build.patch b/debian/patches/fix-bundle-build.patch
deleted file mode 100644
index 741e755..0000000
--- a/debian/patches/fix-bundle-build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Mon, 11 May 2015 15:00:53 +0200
-Subject: fix bundle build
-
----
- pom.xml | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/pom.xml b/pom.xml
-index e7b35dc..79147fd 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -126,6 +126,12 @@ Some data-binding types overridden as well (ObjectMapper sub-classed as XmlMappe
-             </includes>
-           </configuration>
-         </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/jackson-annotations-dependency-version.patch b/debian/patches/jackson-annotations-dependency-version.patch
deleted file mode 100644
index 410d39a..0000000
--- a/debian/patches/jackson-annotations-dependency-version.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Sun, 18 Dec 2016 01:39:29 +0100
-Subject: jackson annotations dependency version
-
----
- pom.xml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/pom.xml b/pom.xml
-index 79147fd..d6d615d 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -46,6 +46,7 @@ Some data-binding types overridden as well (ObjectMapper sub-classed as XmlMappe
-     <dependency>
-       <groupId>com.fasterxml.jackson.core</groupId>
-       <artifactId>jackson-annotations</artifactId>
-+      <version>2.8.5</version>
-     </dependency>
-     <dependency>
-       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/debian/patches/series b/debian/patches/series
index 47dbb92..124332c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-fix-bundle-build.patch
 fix-wrong-parameters.patch
-jackson-annotations-dependency-version.patch

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