[eclipse] Remove the reference to org.apache.jasper (replaced by glassfish)
Krzysztof Daniel
kdaniel at fedoraproject.org
Wed Oct 31 16:56:16 UTC 2012
commit ab4a085e7cd948d04e7db3ab1fb90af74d33f3d0
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Wed Oct 31 17:55:22 2012 +0100
Remove the reference to org.apache.jasper (replaced by glassfish)
eclipse-no-source-for-dependencies.patch | 2 +-
...-osgi-serverside-patch-additional-imports.patch | 2 +-
eclipse.spec | 7 +++++--
3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch
index 970166e..e5f73e5 100644
--- a/eclipse-no-source-for-dependencies.patch
+++ b/eclipse-no-source-for-dependencies.patch
@@ -488,7 +488,7 @@
+ <plugin id="org.apache.tomcat" /><plugin id="org.eclipse.jetty.continuation" /><plugin id="org.eclipse.jetty.http" />
+ <plugin id="org.apache.juli" /><plugin id="org.eclipse.jetty.io" /><plugin id="org.eclipse.jetty.security" />
+ <plugin id="org.eclipse.jetty.util" /><plugin id="org.eclipse.jetty.server" />
-+ <plugin id="org.apache.jasper" /><plugin id="org.eclipse.jetty.servlet" />
++ <plugin id="org.glassfish.web.javax.servlet.jsp" /><plugin id="org.eclipse.jetty.servlet" />
+ <plugin id="org.apache.commons.el" /><plugin id="org.glassfish.web.javax.servlet.jsp" />
+ </excludes>
+ </configuration>
diff --git a/eclipse-osgi-serverside-patch-additional-imports.patch b/eclipse-osgi-serverside-patch-additional-imports.patch
index 20dfe6a..9058df8 100644
--- a/eclipse-osgi-serverside-patch-additional-imports.patch
+++ b/eclipse-osgi-serverside-patch-additional-imports.patch
@@ -6,7 +6,7 @@
unpack="false"/>
+
+ <plugin
-+ id="org.apache.jasper"
++ id="org.glassfish.web.javax.servlet.jsp"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
diff --git a/eclipse.spec b/eclipse.spec
index a73529f..b8bdf64 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -69,7 +69,7 @@ fi;
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_version}
-Release: 11%{?dist}
+Release: 12%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@@ -100,7 +100,7 @@ Patch3: %{name}-fix-icu-import.patch
# by those dependencies packages).
Patch4: %{name}-no-source-for-dependencies.patch
-# +org.apache.jasper
+# +org.glassfish.web.javax.servlet.jsp
# +org.apache.commons.el
Patch5: %{name}-osgi-serverside-patch-additional-imports.patch
@@ -1375,6 +1375,9 @@ rm -rf %{_bindir}/efj/
%{_mavendepmapfragdir}/%{name}-equinox-osgi
%changelog
+* Wed Oct 31 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.1-12
+- Remove the reference to org.apache.jasper (replaced by glassfish)
+
* Wed Oct 31 2012 Alexander Kurtakov <akurtako at redhat.com> 1:4.2.1-11
- Small cleanups.
- Bump release to be bigger than F-18.
More information about the scm-commits
mailing list