From 8f9b75af6fd1dc14795c4e61499c39ce59caa208 Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Fri, 7 Mar 2014 18:56:05 -0500 Subject: [PATCH] Update to Glassfish JSP 2.3. --- eclipse.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eclipse.spec b/eclipse.spec index 1c1c8d8..674b717 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -451,6 +451,9 @@ sed -i -e 's@>org.eclipse.jdt<@>org.eclipse.tycho<@' eclipse-platform-parent/pom sed -i '/org\.apache\.batik/ s/1\.7\.0/1\.8\.0/' eclipse.platform.ui/bundles/org.eclipse.e4.ui.css.core/META-INF/MANIFEST.MF sed -i 's/1\.6\.0/1\.7\.0/' eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml +# Allow usage of javax.servlet.jsp 2.3. +sed -i '/javax\.servlet\.jsp/ s/2\.3/2\.4/' rt.equinox.bundles/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF + %pom_remove_plugin org.mortbay.jetty:jetty-jspc-maven-plugin eclipse.platform.ua/org.eclipse.help.webapp %pom_remove_plugin org.eclipse.tycho:tycho-compiler-plugin rt.equinox.p2/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent @@ -809,6 +812,7 @@ fi %{_libdir}/%{pkg_name}/plugins/com.jcraft.jsch_* %{_libdir}/%{pkg_name}/plugins/javax.servlet-api_* %{_libdir}/%{pkg_name}/plugins/javax.servlet_* +%{_libdir}/%{pkg_name}/plugins/javax.servlet.jsp_* %{_libdir}/%{pkg_name}/plugins/javax.xml_* %{_libdir}/%{pkg_name}/plugins/javax.el_* %{_libdir}/%{pkg_name}/plugins/javax.inject_*.jar @@ -1021,6 +1025,7 @@ fi %changelog * Thu Mar 06 2014 Roland Grunberg - 1:4.3.1-24.1 - Update to Lucene 4. +- Update to Glassfish JSP 2.3. - Enable bootstrap build to work around broken UA (Help) bundles. * Thu Mar 6 2014 Alexander Kurtakov 1:4.3.1-24