Remove references to org.apache.jasper.glassfish

Replace some with org.mortbay.jasper.apache-jsp. eclipse-platform#1251
merks · Sep 14, 2023 · 95bcb3d · 95bcb3d
1 parent 1a1c2d7
commit 95bcb3d
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 15 deletions.
diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt
@@ -143,7 +143,7 @@
 ;${dependency.dir}/org.apache.ant_*/lib/ant.jar
 ;${dependency.dir}/org.apache.batik.css_*.jar
 ;${dependency.dir}/org.apache.commons.jxpath_*.jar
-;${dependency.dir}/org.apache.jasper.glassfish_*.jar
+;${dependency.dir}/org.mortbay.jasper.apache-jsp_*.jar
 ;${dependency.dir}/org.apache.lucene.analysis-common_*.jar
 ;${dependency.dir}/org.apache.lucene.core_*.jar
 ;${dependency.dir}/org.apache.lucene.analysis-smartcn_*.jar

diff --git a/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
@@ -50,12 +50,8 @@
            This is the repo that is expected to be updated on milestones and releases based on Orbit deliveries. -->
       <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/>
     </location>
-    <location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
-
-      <!-- In process of being replaced by org.glassfish.web.javax.servlet.jsp from Central -->
-      <unit id="org.apache.jasper.glassfish" version="2.2.2.v201501141630"/>
-      <unit id="org.apache.jasper.glassfish.source" version="2.2.2.v201501141630"/>
 
+    <location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
       <!-- RedDeer deps-->
       <unit id="org.json" version="1.0.0.v201011060100"/>
 

diff --git a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/ignoreFiles.txt b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/ignoreFiles.txt
@@ -95,8 +95,6 @@ about_cairo.html
 */features/org.eclipse.equinox.executable_*/motif_root/about_files/
 */plugins/org.apache.ant_*
 */plugins/org.apache.ant.source_*
-*/plugins/org.apache.jasper.glassfish_*
-*/plugins/org.apache.jasper.glassfish.source_*
 */p2/org.eclipse.equinox.p2.director\rollback\*.xml
 */plugins/javax.servlet_*
 */plugins/javax.servlet.source_*

diff --git a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
@@ -49,13 +49,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.apache.jasper.glassfish"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.equinox.http.jetty"
          download-size="0"