[libjettison-java] 33/34: Fixed the compatibility with the bundle plugin in Debian

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libjettison-java.

commit abba5b41ab3c519f921f9552cdd4464a7ab6eade
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Apr 20 16:28:11 2018 +0200

    Fixed the compatibility with the bundle plugin in Debian
---
 debian/changelog                                          |  1 +
 debian/maven.rules                                        |  2 --
 debian/patches/01-maven-bundle-plugin-compatibility.patch | 13 +++++++++++++
 debian/patches/series                                     |  1 +
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0be682d..4457c95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libjettison-java (1.4.0-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Build with Maven instead of Ant
+    - Fixed the compatibility with the bundle plugin in Debian
   * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 4.1.4
diff --git a/debian/maven.rules b/debian/maven.rules
index 1203bba..f79aa3c 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,4 +1,2 @@
-# Force installed POM to use "jar" packaging
-org.codehaus.jettison jettison s/bundle/jar/ s/.*/debian/ * *
 junit junit * s/.*/4.x/ * *
 s/com.fasterxml.woodstox/org.codehaus.woodstox/ s/woodstox-core/woodstox-core-lgpl/ * s/.*/debian/ * *
diff --git a/debian/patches/01-maven-bundle-plugin-compatibility.patch b/debian/patches/01-maven-bundle-plugin-compatibility.patch
new file mode 100644
index 0000000..3bc6dd1
--- /dev/null
+++ b/debian/patches/01-maven-bundle-plugin-compatibility.patch
@@ -0,0 +1,13 @@
+Description: Adjusts the bundle plugin configuration to avoid generating an empty jar
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/pom.xml
++++ b/pom.xml
+@@ -70,7 +70,6 @@
+            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Export-Package>org.codehaus.jettison*;version=${project.version}</Export-Package>
+            <Import-Package>*</Import-Package>
+-           <Private-Package>!*</Private-Package>
+            <Implementation-Title>${project.name}</Implementation-Title>
+            <Implementation-Version>${project.version}</Implementation-Version>
+          </instructions>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2735af7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-maven-bundle-plugin-compatibility.patch

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