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 index a37ef5af3fd..4da38553a0a 100644 --- 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 index fa51c603845..050d223465c 100644 --- 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. --> - - - - - + diff --git a/eclipse.platform.releng/bundles/org.eclipse.releng.tests/ignoreFiles.txt b/eclipse.platform.releng/bundles/org.eclipse.releng.tests/ignoreFiles.txt index e1d5da24f82..f6768c67912 100644 --- 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 index f115c301f1f..acf855a2196 100644 --- 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"/> - -