[jackrabbit] 20/20: Drop jackson-parent.patch again.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository jackrabbit.

commit 391c702a63fe8d9d4e4dfaf7975606d65a2318de
Author: Markus Koschany <apo at debian.org>
Date:   Sun Nov 5 15:05:06 2017 +0100

    Drop jackson-parent.patch again.
    
    No idea why it is working now..
---
 debian/changelog                    |  1 -
 debian/patches/jackson-parent.patch | 38 -------------------------------------
 debian/patches/series               |  1 -
 3 files changed, 40 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 23d381f..8554117 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,6 @@ jackrabbit (2.14.4-1) unstable; urgency=medium
   * Declare compliance with Debian Policy 4.1.1.
   * Use https for Format field.
   * Remove --no-parent and --has-package-version flag.
-  * Add jackson-parent.patch and work around Debian bug #878461.
   * Ignore jackrabbit-vfs-ext module.
   * Ignore jacoco-maven-plugin.
   * Refresh servlet-api.patch.
diff --git a/debian/patches/jackson-parent.patch b/debian/patches/jackson-parent.patch
deleted file mode 100644
index 0d867c9..0000000
--- a/debian/patches/jackson-parent.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Sun, 5 Nov 2017 02:06:48 +0100
-Subject: jackson-parent
-
-Workaround for https://bugs.debian.org/878461
-
-Forwarded: not-needed
----
- jackrabbit-parent/pom.xml | 2 +-
- pom.xml                   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/jackrabbit-parent/pom.xml b/jackrabbit-parent/pom.xml
-index 40f42b2..c7341c9 100644
---- a/jackrabbit-parent/pom.xml
-+++ b/jackrabbit-parent/pom.xml
-@@ -34,7 +34,7 @@
-   <groupId>org.apache.jackrabbit</groupId>
-   <artifactId>jackrabbit-parent</artifactId>
-   <name>Jackrabbit Parent POM</name>
--  <version>2.14.4</version>
-+  <version>debian</version>
-   <packaging>pom</packaging>
- 
-   <issueManagement>
-diff --git a/pom.xml b/pom.xml
-index 0d074cb..6590c51 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -27,7 +27,7 @@
-   <parent>
-     <groupId>org.apache.jackrabbit</groupId>
-     <artifactId>jackrabbit-parent</artifactId>
--    <version>2.14.4</version>
-+    <version>debian</version>
-     <relativePath>jackrabbit-parent/pom.xml</relativePath>
-   </parent>
- 
diff --git a/debian/patches/series b/debian/patches/series
index 2ab9ba0..8a949c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-jackson-parent.patch
 servlet-api.patch

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