Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2015-10-21 00:24:44 -0400
committerJan Bartel2015-10-21 00:26:26 -0400
commit43a28a5080c501d9cea3c67d7c7e143ce9eb513e (patch)
tree59a379e2d6f464bed3ded522f30a8ddabd762b97
parent323143eea6bb2ad28be8f41fce9589b4ec3fa1fd (diff)
downloadorg.eclipse.jetty.project-43a28a5080c501d9cea3c67d7c7e143ce9eb513e.tar.gz
org.eclipse.jetty.project-43a28a5080c501d9cea3c67d7c7e143ce9eb513e.tar.xz
org.eclipse.jetty.project-43a28a5080c501d9cea3c67d7c7e143ce9eb513e.zip
480272 Update to newer jdt ecj version
-rw-r--r--apache-jsp/pom.xml4
-rw-r--r--jetty-distribution/pom.xml4
-rw-r--r--jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java23
-rw-r--r--jetty-osgi/jetty-osgi-boot-jsp/pom.xml1
-rw-r--r--jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootCore.java2
-rw-r--r--pom.xml12
-rw-r--r--tests/test-webapps/test-jetty-webapp/pom.xml6
7 files changed, 35 insertions, 17 deletions
diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml
index 92f242e2fd..66ecfd4fcf 100644
--- a/apache-jsp/pom.xml
+++ b/apache-jsp/pom.xml
@@ -88,8 +88,8 @@
<!-- Eclipse Java Compiler (for JSP Compilation) -->
<dependency>
- <groupId>org.eclipse.jetty.orbit</groupId>
- <artifactId>org.eclipse.jdt.core</artifactId>
+ <groupId>org.eclipse.jdt.core.compiler</groupId>
+ <artifactId>ecj</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index 8f142acf0a..476e8a6fc9 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -441,8 +441,8 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
- <includeGroupIds>org.eclipse.jetty,org.eclipse.jetty.toolchain,org.mortbay.jasper,org.eclipse.jetty.orbit</includeGroupIds>
- <includeArtifactIds>apache-jsp,apache-el,org.eclipse.jdt.core</includeArtifactIds>
+ <includeGroupIds>org.eclipse.jetty,org.eclipse.jetty.toolchain,org.mortbay.jasper,org.eclipse.jetty.orbit,org.eclipse.jdt.core.compiler</includeGroupIds>
+ <includeArtifactIds>apache-jsp,apache-el,ecj</includeArtifactIds>
<includeTypes>jar</includeTypes>
<prependGroupId>true</prependGroupId>
<outputDirectory>${assembly-directory}/lib/apache-jsp</outputDirectory>
diff --git a/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java b/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java
index d9f3326e6c..bfc8cabea7 100644
--- a/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java
+++ b/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java
@@ -251,6 +251,19 @@ public class JspcMojo extends AbstractMojo
/**
+ * Source version - if not set defaults to jsp default (currently 1.7)
+ * @parameter
+ */
+ private String sourceVersion;
+
+
+ /**
+ * Target version - if not set defaults to jsp default (currently 1.7)
+ * @parameter
+ */
+ private String targetVersion;
+
+ /**
*
* The JspC instance being used to compile the jsps.
*
@@ -280,7 +293,11 @@ public class JspcMojo extends AbstractMojo
getLog().info("webXml="+webXml);
getLog().info("insertionMarker="+ (insertionMarker == null || insertionMarker.equals("") ? END_OF_WEBAPP : insertionMarker));
getLog().info("keepSources=" + keepSources);
- getLog().info("mergeFragment=" + mergeFragment);
+ getLog().info("mergeFragment=" + mergeFragment);
+ if (sourceVersion != null)
+ getLog().info("sourceVersion="+sourceVersion);
+ if (targetVersion != null)
+ getLog().info("targetVersion="+targetVersion);
}
try
{
@@ -343,6 +360,10 @@ public class JspcMojo extends AbstractMojo
jspc.setClassLoader(fakeWebAppClassLoader);
jspc.setScanAllDirectories(scanAllDirectories);
jspc.setCompile(true);
+ if (sourceVersion != null)
+ jspc.setCompilerSourceVM(sourceVersion);
+ if (targetVersion != null)
+ jspc.setCompilerTargetVM(targetVersion);
// JspC#setExtensions() does not exist, so
// always set concrete list of files that will be processed.
diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
index 35c0178571..578c2ad42e 100644
--- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
@@ -80,6 +80,7 @@
<Fragment-Host>org.eclipse.jetty.osgi.boot</Fragment-Host>
<Export-Package>!org.eclipse.jetty.osgi.boot.*</Export-Package>
<Import-Package>org.eclipse.jdt.*;resolution:=optional,
+ org.eclipse.jdt.core.compiler.*;resolution:=optional,
com.sun.el;resolution:=optional,
com.sun.el.lang;resolution:=optional,
com.sun.el.parser;resolution:=optional,
diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootCore.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootCore.java
index 79d418bad2..324efd9907 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootCore.java
+++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootCore.java
@@ -144,7 +144,7 @@ public class TestJettyOSGiBootCore
res.add(mavenBundle().groupId("org.mortbay.jasper").artifactId("apache-jsp").versionAsInProject());
res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("apache-jsp").versionAsInProject());
res.add(mavenBundle().groupId("org.glassfish.web").artifactId("javax.servlet.jsp.jstl").versionAsInProject());
- res.add(mavenBundle().groupId("org.eclipse.jetty.orbit").artifactId("org.eclipse.jdt.core").versionAsInProject());
+ res.add(mavenBundle().groupId("org.eclipse.jdt.core.compiler").artifactId("ecj").versionAsInProject());
res.add(mavenBundle().groupId("org.eclipse.jetty.osgi").artifactId("jetty-osgi-boot-jsp").versionAsInProject().noStart());
return res;
}
diff --git a/pom.xml b/pom.xml
index b0c4e6a32a..2a866d1a49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -594,15 +594,9 @@
</dependency>
<dependency>
- <groupId>org.eclipse.jetty.orbit</groupId>
- <artifactId>org.eclipse.jdt.core</artifactId>
- <version>3.8.2.v20130121</version>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty.orbit</groupId>
- <artifactId>javax.servlet</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.eclipse.jdt.core.compiler</groupId>
+ <artifactId>ecj</artifactId>
+ <version>4.4.2</version>
</dependency>
<!-- JSTL Impl -->
diff --git a/tests/test-webapps/test-jetty-webapp/pom.xml b/tests/test-webapps/test-jetty-webapp/pom.xml
index bb7152d34a..0c3a4a65ec 100644
--- a/tests/test-webapps/test-jetty-webapp/pom.xml
+++ b/tests/test-webapps/test-jetty-webapp/pom.xml
@@ -243,8 +243,10 @@
</goals>
<!-- example configuration
<configuration>
- <includes>**/*.foo</includes>
- <excludes>**/*.fff</excludes>
+ <includes>**/*.foo</includes>
+ <excludes>**/*.fff</excludes>
+ <sourceVersion>1.8</sourceVersion>
+ <targetVersion>1.8</targetVersion>
</configuration>
-->
</execution>

Back to the top