[jackson-databind] 02/04: Depend on libjackson2-{core, annotations}-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-databind.

commit 3d75cd29c86585fc6de7d46d522505b8cf8c0e16
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Dec 15 15:56:20 2016 +0100

    Depend on libjackson2-{core,annotations}-java (>= 2.8.5)
---
 debian/changelog                      |  8 ++++++++
 debian/control                        |  4 ++--
 debian/libjackson2-databind-java.poms |  2 +-
 debian/maven.properties               |  5 -----
 debian/patches/fix-using-bundle.diff  | 15 ---------------
 debian/patches/series                 |  1 -
 6 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b9bb615..3594bae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jackson-databind (2.8.5-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Depend on libjackson2-{core,annotations}-java (>= 2.8.5)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 15 Dec 2016 15:42:49 +0100
+
 jackson-databind (2.7.4-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index cbcce61..54aac32 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,8 @@ Build-Depends:
  default-jdk,
  javahelper (>= 0.32),
  maven-debian-helper (>= 1.6.5),
- libjackson2-core-java (>= 2.7.3),
- libjackson2-annotations-java (>= 2.7.3),
+ libjackson2-core-java (>= 2.8.5),
+ libjackson2-annotations-java (>= 2.8.5),
  libmaven-bundle-plugin-java,
  xmlstarlet
 Build-Depends-Indep:
diff --git a/debian/libjackson2-databind-java.poms b/debian/libjackson2-databind-java.poms
index 64b1188..1d885c3 100644
--- a/debian/libjackson2-databind-java.poms
+++ b/debian/libjackson2-databind-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.properties b/debian/maven.properties
index 0c20abc..d2f1b82 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -1,6 +1 @@
-maven.compiler.source=1.6
-maven.compiler.target=1.6
-project.build.sourceEncoding=UTF-8
-
-# Hibernate crap can't be tested.
 maven.test.skip=true
diff --git a/debian/patches/fix-using-bundle.diff b/debian/patches/fix-using-bundle.diff
deleted file mode 100644
index 83f223f..0000000
--- a/debian/patches/fix-using-bundle.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/pom.xml
-+++ b/pom.xml
-@@ -125,6 +125,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

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