This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.commons.compiler-2.2.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-compiler.git
commit 4b76fd521226b2be3c923d841dc69fd0d3fe3c51 Author: Carsten Ziegeler <[email protected]> AuthorDate: Fri May 2 14:04:00 2014 +0000 SLING-3405 : SLING2094Test and ServerSideScriptsTest fail with java 8: JSP compiler does not find java.util.Arrays or java.lang.CharSequence git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/commons/compiler@1591916 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 25 +++++++++------------- .../org/apache/sling/commons/compiler/Options.java | 1 + .../commons/compiler/impl/EclipseJavaCompiler.java | 7 ++++++ 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 4464548..7638c28 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,10 @@ <url>http://svn.apache.org/viewvc/sling/trunk/contrib/commons/compiler</url> </scm> + <properties> + <sling.java.version>6</sling.java.version> + </properties> + <build> <plugins> <plugin> @@ -56,7 +60,8 @@ <configuration> <instructions> <Import-Package> - !org.eclipse.*,* + !org.eclipse.*, + !org.apache.tools.*,* </Import-Package> <Export-Package> org.apache.sling.commons.compiler;version=2.1.0 @@ -65,7 +70,7 @@ org.apache.sling.commons.compiler.impl </Private-Package> <Embed-Dependency> - core + ecj </Embed-Dependency> </instructions> </configuration> @@ -102,19 +107,9 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.eclipse.jdt</groupId> - <artifactId>core</artifactId> - <version>3.3.0-v_771</version> - <exclusions> - <exclusion> - <groupId>org.eclipse.equinox</groupId> - <artifactId>app</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.equinox</groupId> - <artifactId>common</artifactId> - </exclusion> - </exclusions> + <groupId>org.eclipse.jdt.core.compiler</groupId> + <artifactId>ecj</artifactId> + <version>P20140317-1600</version> </dependency> <dependency> <groupId>org.slf4j</groupId> diff --git a/src/main/java/org/apache/sling/commons/compiler/Options.java b/src/main/java/org/apache/sling/commons/compiler/Options.java index d3985d1..302c8c2 100644 --- a/src/main/java/org/apache/sling/commons/compiler/Options.java +++ b/src/main/java/org/apache/sling/commons/compiler/Options.java @@ -42,6 +42,7 @@ public class Options extends HashMap<String, Object> { public static final String VERSION_1_5 = "1.5"; public static final String VERSION_1_6 = "1.6"; public static final String VERSION_1_7 = "1.7"; + public static final String VERSION_1_8 = "1.8"; /** The key for the class loader writer. * By default the registered class loader writer service is used. */ diff --git a/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java b/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java index 8e7f0f7..9b41d3e 100644 --- a/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java +++ b/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java @@ -467,5 +467,12 @@ public class EclipseJavaCompiler implements JavaCompiler { return (this.packageName.replace('.', '/') + '/' + this.mainTypeName + ".java").toCharArray(); } } + + /** + * @see org.eclipse.jdt.internal.compiler.env.ICompilationUnit#ignoreOptionalProblems() + */ + public boolean ignoreOptionalProblems() { + return false; + } } } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
