[eclipse] 08/10: Transition to libservlet3.1-java and libtomcat8-java (Closes: #759641)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Oct 19 17:35:21 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository eclipse.
commit d565c0eb2834799c49955225d0c6be5cb72843a9
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Oct 19 01:07:55 2016 +0200
Transition to libservlet3.1-java and libtomcat8-java (Closes: #759641)
---
debian/changelog | 1 +
debian/control | 10 +++---
.../eclipse-equinox-jsp-jasper-7.0.26.patch | 19 +++++++---
debian/patches/find-tomcat-libs.patch | 40 +++++++++++-----------
debian/patches/remove-org-apache-commons-el.patch | 4 +--
debian/patches/series | 1 +
debian/patches/servlet3.1-compatibility.patch | 37 ++++++++++++++++++++
debian/patches/use-icu4j-49.patch | 2 +-
8 files changed, 81 insertions(+), 33 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 75458b9..41e4ce0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ eclipse (3.8.1-9) UNRELEASED; urgency=medium
* Team upload.
* Fixed the build failure with Java 8 (Closes: #757536)
* Fixed the build failure with dpkg-buildpackage -A (Closes: #806613)
+ * Transition to libservlet3.1-java and libtomcat8-java (Closes: #759641)
* eclipse-jdt no longer recommends sun-java6-jdk
* Standards-Version updated to 3.9.8
* Use a secure Vcs-Git URL
diff --git a/debian/control b/debian/control
index 8448d71..3409d81 100644
--- a/debian/control
+++ b/debian/control
@@ -27,9 +27,9 @@ Build-Depends: ant (>= 1.8.2),
libjsch-java (>= 0.1.37-3),
liblucene2-java (>= 2.9.4+ds1-3~),
liblucene2-java (<< 2.9.5),
- libservlet3.0-java,
+ libservlet3.1-java,
libswt-gtk-3-java (>= 3.8.0~m6),
- libtomcat7-java,
+ libtomcat8-java,
lsb-release,
maven-ant-helper,
maven-repo-helper,
@@ -116,7 +116,7 @@ Depends: ant (>= 1.8.2),
libjsch-java (>= 0.1.37-3),
liblucene2-java (>= 2.9.4+ds1-3~),
liblucene2-java (<< 2.9.5),
- libservlet3.0-java,
+ libservlet3.1-java,
sat4j (>= 2.3.0),
sat4j (<< 2.4.0),
${misc:Depends},
@@ -147,7 +147,7 @@ Description: Eclipse platform without development plug-ins
Package: eclipse-platform-data
Architecture: all
-Depends: libtomcat7-java,
+Depends: libtomcat8-java,
${misc:Depends}
Replaces: eclipse (<< 3.5.2),
eclipse-platform (<< 3.8.0~),
@@ -209,7 +209,7 @@ Package: libequinox-osgi-java
Architecture: all
Section: java
Depends: ${misc:Depends}
-Recommends: libservlet3.0-java
+Recommends: libservlet3.1-java
Breaks: eclipse-rcp (<< 3.5.1-0ubuntu3)
Replaces: eclipse-platform-gcj, eclipse-rcp-gcj
Description: Equinox OSGi framework
diff --git a/debian/patches/eclipse-equinox-jsp-jasper-7.0.26.patch b/debian/patches/eclipse-equinox-jsp-jasper-7.0.26.patch
index 918619a..a76d3b0 100644
--- a/debian/patches/eclipse-equinox-jsp-jasper-7.0.26.patch
+++ b/debian/patches/eclipse-equinox-jsp-jasper-7.0.26.patch
@@ -6,16 +6,25 @@ Subject: eclipse-equinox-jsp-jasper-7.0.26
patches/eclipse-equinox-jsp-jasper.patch | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/patches/eclipse-equinox-jsp-jasper.patch b/patches/eclipse-equinox-jsp-jasper.patch
-index a9db712..45c9576 100644
--- a/patches/eclipse-equinox-jsp-jasper.patch
+++ b/patches/eclipse-equinox-jsp-jasper.patch
-@@ -227,8 +227,8 @@
+@@ -219,16 +219,16 @@
+ Bundle-Version: 1.0.300.qualifier
+ Bundle-Activator: org.eclipse.equinox.internal.jsp.jasper.Activator
+ -Import-Package: javax.servlet;version="[2.4, 3.1)",
+-+Import-Package: javax.servlet;version="[2.4.0,3.1)",
+++Import-Package: javax.servlet;version="[2.4.0,4.0)",
+ javax.servlet.annotation;version="2.6";resolution:=optional,
+ javax.servlet.descriptor;version="2.6";resolution:=optional,
+ - javax.servlet.http;version="[2.4, 3.1)",
+ - javax.servlet.jsp;version="[2.0, 2.3)",
- org.apache.jasper.servlet;version="[0, 6)",
- + javax.servlet.http;version="[2.4.0,3.0.0]",
- + javax.servlet.jsp;version="[2.0.0,2.3)",
+-+ javax.servlet.http;version="[2.4.0,3.0.0]",
+-+ javax.servlet.jsp;version="[2.0.0,2.3)",
-+ org.apache.jasper.servlet;version="7.0.21",
-+ org.apache.tomcat.api;version="7.0.21",
+++ javax.servlet.http;version="[2.4.0,4.0.0]",
+++ javax.servlet.jsp;version="[2.0.0,2.3]",
++ org.apache.jasper.servlet;version="7.0.26",
++ org.apache.tomcat;version="7.0.26",
org.osgi.framework;version="1.3.0",
diff --git a/debian/patches/find-tomcat-libs.patch b/debian/patches/find-tomcat-libs.patch
index fceb053..c104e6b 100644
--- a/debian/patches/find-tomcat-libs.patch
+++ b/debian/patches/find-tomcat-libs.patch
@@ -25,13 +25,13 @@ index 96a827f..b7f5ce0 100644
-org.apache.tomcat_7.0.21.jar=/usr/share/java/tomcat/tomcat-api.jar
-org.apache.juli_7.0.21.jar=/usr/share/java/tomcat/tomcat-juli.jar
-org.apache.el_7.0.21.jar=/usr/share/java/tomcat/jasper-el.jar
-+javax.servlet_3.0.0.v201112011016.jar=/usr/share/java/tomcat-servlet-api-3.0.jar
-+javax.servlet.jsp_2.2.0.v201112011158.jar=/usr/share/java/tomcat-jsp-api-2.2.jar
-+javax.el_2.2.0.v201108011116.jar=/usr/share/java/tomcat-el-api-2.2.jar
-+org.apache.tomcat.api_7.0.21.jar=/usr/share/java/tomcat-api.jar
-+org.apache.tomcat.util_7.0.26.jar=/usr/share/java/tomcat-util.jar
-+org.apache.juli_7.0.21.jar=/usr/share/java/tomcat-juli.jar
-+org.apache.el_7.0.21.jar=/usr/share/java/tomcat-jasper-el.jar
++javax.servlet_3.0.0.v201112011016.jar=/usr/share/java/servlet-api-3.1.jar
++javax.servlet.jsp_2.2.0.v201112011158.jar=/usr/share/java/jsp-api-2.3.jar
++javax.el_2.2.0.v201108011116.jar=/usr/share/java/el-api-3.0.jar
++org.apache.tomcat.api_7.0.21.jar=/usr/share/java/tomcat8-api.jar
++org.apache.tomcat.util_7.0.26.jar=/usr/share/java/tomcat8-util.jar
++org.apache.juli_7.0.21.jar=/usr/share/java/tomcat8-juli.jar
++org.apache.el_7.0.21.jar=/usr/share/java/tomcat8-jasper-el.jar
org.apache.commons.codec_1.3.0.v201101211617.jar=/usr/share/java/commons-codec.jar
org.apache.commons.el_1.0.0.v200806031608.jar=/usr/share/java/commons-el.jar
org.apache.commons.httpclient_3.1.0.v201012070820.jar=/usr/share/java/commons-httpclient.jar
@@ -40,7 +40,7 @@ index 96a827f..b7f5ce0 100644
org.apache.felix.gogo.runtime_0.8.0.v201108120515.jar=/usr/share/java/org.apache.felix.gogo.runtime.jar
org.apache.felix.gogo.shell_0.8.0.v201110170705.jar=/usr/share/java/org.apache.felix.gogo.shell.jar
-org.apache.jasper_7.0.21.jar=/usr/share/java/tomcat/jasper.jar
-+org.apache.jasper_7.0.21.jar=/usr/share/java/tomcat-jasper.jar
++org.apache.jasper_7.0.21.jar=/usr/share/java/tomcat8-jasper.jar
org.apache.lucene.core_2.9.1.v201101211721.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar
org.apache.lucene.analysis_2.9.1.v201101211721.jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar:/usr/share/java/lucene-analyzers.jar
org.eclipse.swt_3.7.1.jar=/usr/share/java/swt.jar
@@ -50,18 +50,18 @@ index 0000000..1ab56e1
--- /dev/null
+++ b/dependencyManifests/org.apache.tomcat.api_7.0.21.jar/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
-+Manifest-Version: 1.0
-+Export-Package: org.apache.tomcat;version="7.0.21"
-+Bundle-Vendor: %bundleProvider
-+Bundle-ClassPath: .
-+Bundle-Version: 7.0.21
-+Bundle-Name: %bundleName
-+Bundle-Localization: plugin
-+Bundle-ManifestVersion: 2
-+Bundle-SymbolicName: org.apache.tomcat.api
-+Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J
-+ 2SE-1.3
-+
++Manifest-Version: 1.0
++Export-Package: org.apache.tomcat;version="7.0.21"
++Bundle-Vendor: %bundleProvider
++Bundle-ClassPath: .
++Bundle-Version: 7.0.21
++Bundle-Name: %bundleName
++Bundle-Localization: plugin
++Bundle-ManifestVersion: 2
++Bundle-SymbolicName: org.apache.tomcat.api
++Bundle-RequiredExecutionEnvironment: J2SE-1.4,CDC-1.0/Foundation-1.0,J
++ 2SE-1.3
++
diff --git a/dependencyManifests/org.apache.tomcat.util_7.0.26.jar/META-INF/MANIFEST.MF b/dependencyManifests/org.apache.tomcat.util_7.0.26.jar/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..3adac60
diff --git a/debian/patches/remove-org-apache-commons-el.patch b/debian/patches/remove-org-apache-commons-el.patch
index d025f70..b7aab34 100644
--- a/debian/patches/remove-org-apache-commons-el.patch
+++ b/debian/patches/remove-org-apache-commons-el.patch
@@ -13,8 +13,8 @@ index b7f5ce0..430cc53 100644
--- a/dependencies/dependencies.properties
+++ b/dependencies/dependencies.properties
@@ -14,7 +14,6 @@ org.apache.tomcat.util_7.0.26.jar=/usr/share/java/tomcat-util.jar
- org.apache.juli_7.0.21.jar=/usr/share/java/tomcat-juli.jar
- org.apache.el_7.0.21.jar=/usr/share/java/tomcat-jasper-el.jar
+ org.apache.juli_7.0.21.jar=/usr/share/java/tomcat8-juli.jar
+ org.apache.el_7.0.21.jar=/usr/share/java/tomcat8-jasper-el.jar
org.apache.commons.codec_1.3.0.v201101211617.jar=/usr/share/java/commons-codec.jar
-org.apache.commons.el_1.0.0.v200806031608.jar=/usr/share/java/commons-el.jar
org.apache.commons.httpclient_3.1.0.v201012070820.jar=/usr/share/java/commons-httpclient.jar
diff --git a/debian/patches/series b/debian/patches/series
index 96c16e6..eefa0a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -46,3 +46,4 @@ fix-s390-s390x-build.patch
target-java-1.5.patch
use-icu4j-49.patch
java8-compatibility.patch
+servlet3.1-compatibility.patch
diff --git a/debian/patches/servlet3.1-compatibility.patch b/debian/patches/servlet3.1-compatibility.patch
new file mode 100644
index 0000000..4597145
--- /dev/null
+++ b/debian/patches/servlet3.1-compatibility.patch
@@ -0,0 +1,37 @@
+Description: Fixes the compatibility with the Servlet API 3.1
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/eclipse/plugins/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
++++ b/eclipse/plugins/org.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
+@@ -9,10 +9,10 @@
+ Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
+ J2SE-1.3
+ Export-Package: org.eclipse.equinox.http.servlet;version="1.1.0"
+-Import-Package: javax.servlet;version="[2.3.0,3.1)",
++Import-Package: javax.servlet;version="[2.3.0,4.0)",
+ javax.servlet.annotation;version="2.6.0";resolution:=optional,
+ javax.servlet.descriptor;version="2.6.0";resolution:=optional,
+- javax.servlet.http;version="[2.3,3.1)",
++ javax.servlet.http;version="[2.3,4.0)",
+ org.osgi.framework;version="1.3.0",
+ org.osgi.service.http;version="[1.2,1.3)"
+ Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2
+--- a/eclipse/plugins/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
++++ b/eclipse/plugins/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF
+@@ -6,12 +6,12 @@
+ Bundle-SymbolicName: org.eclipse.equinox.jsp.jasper
+ Bundle-Version: 1.0.400.qualifier
+ Bundle-Activator: org.eclipse.equinox.internal.jsp.jasper.Activator
+-Import-Package: javax.servlet;version="[2.4, 3.1)",
++Import-Package: javax.servlet;version="[2.4, 4.0)",
+ javax.servlet.annotation;version="2.6";resolution:=optional,
+ javax.servlet.descriptor;version="2.6";resolution:=optional,
+- javax.servlet.http;version="[2.4, 3.1)",
+- javax.servlet.jsp;version="[2.0, 2.3)",
+- org.apache.jasper.servlet;version="[0, 6)",
++ javax.servlet.http;version="[2.4, 4.0)",
++ javax.servlet.jsp;version="[2.0, 2.3]",
++ org.apache.jasper.servlet;version="[0, 9)";resolution:=optional,
+ org.osgi.framework;version="1.3.0",
+ org.osgi.service.http;version="1.2.0",
+ org.osgi.service.packageadmin;version="1.2.0",
diff --git a/debian/patches/use-icu4j-49.patch b/debian/patches/use-icu4j-49.patch
index c73d43d..aece682 100644
--- a/debian/patches/use-icu4j-49.patch
+++ b/debian/patches/use-icu4j-49.patch
@@ -27,7 +27,7 @@ index 430cc53..41d0f02 100644
+com.ibm.icu_4.4.2.v20110823.jar=/usr/share/java/icu4j-49.1.jar
com.jcraft.jsch_0.1.44.v201101211721.jar=/usr/share/java/jsch.jar
- javax.servlet_3.0.0.v201112011016.jar=/usr/share/java/tomcat-servlet-api-3.0.jar
+ javax.servlet_3.0.0.v201112011016.jar=/usr/share/java/servlet-api-3.1.jar
diff --git a/dependencyManifests/com.ibm.icu_4.4.2.v20110823.jar/META-INF/MANIFEST.MF b/dependencyManifests/com.ibm.icu_4.4.2.v20110823.jar/META-INF/MANIFEST.MF
index f802d51..a9565ff 100644
--- a/dependencyManifests/com.ibm.icu_4.4.2.v20110823.jar/META-INF/MANIFEST.MF
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse.git
More information about the pkg-java-commits
mailing list