[jetty9] 01/01: Removed the Require-Capability and Bundle-RequiredExecutionEnvironment fields 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 jetty9.

commit 315cf0202fc8f93b31943193d2282c5ca9c5f381
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 24 18:19:12 2016 +0200

    Removed the Require-Capability and Bundle-RequiredExecutionEnvironment fields from the OSGi metadata to avoid a build failure with Eclipse 3.8
---
 debian/changelog                                        |  7 +++++++
 ...5-remove-bundle-required-execution-environment.patch | 17 +++++++++++++++++
 debian/patches/series                                   |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 31b9e46..294fc2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jetty9 (9.2.19-2) unstable; urgency=medium
+
+  * Removed the Require-Capability and Bundle-RequiredExecutionEnvironment
+    fields from the OSGi metadata to avoid a build failure with Eclipse 3.8
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 24 Oct 2016 18:18:50 +0200
+
 jetty9 (9.2.19-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/05-remove-bundle-required-execution-environment.patch b/debian/patches/05-remove-bundle-required-execution-environment.patch
new file mode 100644
index 0000000..cfaf3f0
--- /dev/null
+++ b/debian/patches/05-remove-bundle-required-execution-environment.patch
@@ -0,0 +1,17 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -295,13 +295,13 @@
+           <configuration>
+             <instructions>
+               <Bundle-SymbolicName>${bundle-symbolic-name}</Bundle-SymbolicName>
+-              <Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
+               <Bundle-DocURL>${jetty.url}</Bundle-DocURL>
+               <Bundle-Vendor>Eclipse Jetty Project</Bundle-Vendor>
+               <Bundle-Classpath>.</Bundle-Classpath>
+               <Export-Package>${bundle-symbolic-name}.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package>
+               <Bundle-Copyright>Copyright (c) 2008-2016 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 3698a31..b36d7f4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02-import-alpn-api.patch
 03-update-parent-pom-version.patch
 04-weksocket-1.1-compatibility.patch
+05-remove-bundle-required-execution-environment.patch

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