[jetty8] 01/01: Removed the Require-Capability field from the OSGi metadata to avoid a build failure with Eclipse 3.8

[Emmanuel Bourg]

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

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

commit a32fc69299ef2338387ec532d0296c1982ea6872
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Oct 19 17:47:39 2016 +0200

    Removed the Require-Capability field from the OSGi metadata to avoid a build failure with Eclipse 3.8
---
 debian/changelog                                |  8 ++++++++
 debian/patches/osgi-execution-environment.patch | 14 ++++++++++++++
 debian/patches/series                           |  1 +
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3293526..7c9ad0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jetty8 (8.2.0-2) unstable; urgency=medium
+
+  * Team upload.
+  * Removed the Require-Capability field from the OSGi metadata to avoid
+    a build failure with Eclipse 3.8
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 19 Oct 2016 17:47:23 +0200
+
 jetty8 (8.2.0-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/osgi-execution-environment.patch b/debian/patches/osgi-execution-environment.patch
new file mode 100644
index 0000000..4d34561
--- /dev/null
+++ b/debian/patches/osgi-execution-environment.patch
@@ -0,0 +1,14 @@
+Description: Removes the Require-Capability field from the OSGi metadata to avoid
+ a build failure with Eclipse 3.8 (the field was added automatically by bnd 2.3)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -293,6 +293,7 @@
+               <Export-Package>${bundle-symbolic-name}.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package>
+               <Bundle-Copyright>Copyright (c) 2008-2014 Mort Bay Consulting Pty. Ltd.</Bundle-Copyright>
+               <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
++              <_noee>true</_noee>
+             </instructions>
+           </configuration>
+         </plugin>
diff --git a/debian/patches/series b/debian/patches/series
index b333359..95287d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ fix-servletcontext-security-check.patch
 initialize-tomcat-jasper.patch
 asm-upgrade.patch
 drop-jetty6-continuations-support.patch
+osgi-execution-environment.patch

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