[maven-bundle-plugin] 01/04: Added a switch to revert the ManifestPlugin class to the behaviour of the version 2.3.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 maven-bundle-plugin.

commit 6d81b06aa1715a1a7af4529a8b586aefc4221b80
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Oct 3 13:46:09 2014 +0200

    Added a switch to revert the ManifestPlugin class to the behaviour of the version 2.3.5
---
 debian/changelog                            |  2 ++
 debian/patches/backward-compatibility.patch | 42 +++++++++++++++++++++++++++++
 debian/patches/series                       |  2 +-
 3 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a97962d..8cd6322 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 maven-bundle-plugin (2.3.7-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Added a switch to revert the ManifestPlugin class to the behaviour
+    of the version 2.3.5 if necessary (see #761548 and #761522).
   * debian/control:
     - Tightened the dependency on bnd (>= 1.50.0)
     - Standards-Version updated to 3.9.6 (no changes)
diff --git a/debian/patches/backward-compatibility.patch b/debian/patches/backward-compatibility.patch
new file mode 100644
index 0000000..d5226e3
--- /dev/null
+++ b/debian/patches/backward-compatibility.patch
@@ -0,0 +1,42 @@
+Description: Fixes a regression in the version 2.3.7 causing two build
+ failures on javamail (#761548) and sisu-guice (#761522).
+ .
+ For javamail, checking out a clean copy of the upstream source,
+ upgrading maven-bundle-plugin to 2.3.7 in the pom and building directly
+ with Maven works fine. So the upgrade to 2.3.7 alone isn't enough to
+ explain the regression, something else specific to the Debian packaging
+ is involved.
+ .
+ The regression was caused by the fix for FELIX-3165:
+   https://issues.apache.org/jira/browse/FELIX-3165
+   https://svn.apache.org/r1184887
+ .
+ This patch reverts to the old behaviour only when the
+ debian.maven-bundle-plugin.compatibility property is set to true.
+
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+Bug-Debian: http://bugs.debian.org/761548
+            http://bugs.debian.org/761522
+--- a/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
++++ b/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
+@@ -66,7 +66,18 @@
+         Manifest manifest;
+         try
+         {
+-            manifest = getManifest( project, instructions, properties, classpath );
++            if ( "true".equals( System.getProperty("debian.maven-bundle-plugin.compatibility") )
++                && supportedProjectTypes.contains( getProject().getArtifact().getType() ) )
++            {
++                getLog().info("maven-bundle-plugin 2.3.5 compatibility enabled");
++                Builder builder = buildOSGiBundle( project, instructions, properties, classpath );
++                manifest = builder.getJar().getManifest();
++                builder.close();
++            }
++            else
++            {
++                manifest = getManifest( project, instructions, properties, classpath );
++            }
+         }
+         catch ( FileNotFoundException e )
+         {
diff --git a/debian/patches/series b/debian/patches/series
index eb15134..decc8e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 remove_bndlib_spring_support.diff
-
 support_plexus_utils_1_5.diff
+backward-compatibility.patch

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