From 1fc4b6b7837cbcb812712370d31659e267242159 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Thu, 23 Jun 2022 09:24:14 +0300 Subject: [PATCH] Fix help webapp compiling JSPs when run on Java 17+ Jasper shipped embeds ancient version of ecj which doesn't support targeting newer Java versions. As Eclipse is the author of ecj it makes sense to include our own version which is the absolute latest one. Removed workaround in tests explicitly adding jdt.core that is no longer needed Fixes https://github.com/eclipse-platform/eclipse.platform.ua/issues/18 --- org.eclipse.help.webapp/META-INF/MANIFEST.MF | 3 ++- org.eclipse.ua.tests/pom.xml | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/org.eclipse.help.webapp/META-INF/MANIFEST.MF b/org.eclipse.help.webapp/META-INF/MANIFEST.MF index a9f43c1ec..a8571f452 100644 --- a/org.eclipse.help.webapp/META-INF/MANIFEST.MF +++ b/org.eclipse.help.webapp/META-INF/MANIFEST.MF @@ -18,6 +18,7 @@ Export-Package: org.eclipse.help.internal.webapp;x-friends:="org.eclipse.ua.test org.eclipse.help.webapp Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: javax.servlet;version="3.1.0", - javax.servlet.http;version="3.1.0" + javax.servlet.http;version="3.1.0", + org.eclipse.jdt.core.compiler Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.help.webapp diff --git a/org.eclipse.ua.tests/pom.xml b/org.eclipse.ua.tests/pom.xml index 9f0647257..2c3c69a76 100644 --- a/org.eclipse.ua.tests/pom.xml +++ b/org.eclipse.ua.tests/pom.xml @@ -40,11 +40,6 @@ org.eclipse.equinox.server.jetty 0.0.0 - - eclipse-plugin - org.eclipse.jdt.core - 0.0.0 - eclipse-plugin org.eclipse.help.ui