incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1591916 - in /sling/trunk/contrib/commons/compiler: pom.xml src/main/java/org/apache/sling/commons/compiler/Options.java src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
Date Fri, 02 May 2014 14:04:00 GMT
Author: cziegeler
Date: Fri May  2 14:04:00 2014
New Revision: 1591916

URL: http://svn.apache.org/r1591916
Log:
SLING-3405 : SLING2094Test and ServerSideScriptsTest fail with java 8: JSP compiler does not
find java.util.Arrays or java.lang.CharSequence

Modified:
    sling/trunk/contrib/commons/compiler/pom.xml
    sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/Options.java
    sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java

Modified: sling/trunk/contrib/commons/compiler/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/compiler/pom.xml?rev=1591916&r1=1591915&r2=1591916&view=diff
==============================================================================
--- sling/trunk/contrib/commons/compiler/pom.xml (original)
+++ sling/trunk/contrib/commons/compiler/pom.xml Fri May  2 14:04:00 2014
@@ -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>

Modified: sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/Options.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/Options.java?rev=1591916&r1=1591915&r2=1591916&view=diff
==============================================================================
--- sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/Options.java
(original)
+++ sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/Options.java
Fri May  2 14:04:00 2014
@@ -42,6 +42,7 @@ public class Options extends HashMap<Str
     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. */

Modified: sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java?rev=1591916&r1=1591915&r2=1591916&view=diff
==============================================================================
--- sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
(original)
+++ sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
Fri May  2 14:04:00 2014
@@ -467,5 +467,12 @@ public class EclipseJavaCompiler impleme
                 return (this.packageName.replace('.', '/') + '/' + this.mainTypeName + ".java").toCharArray();
             }
         }
+
+        /**
+         * @see org.eclipse.jdt.internal.compiler.env.ICompilationUnit#ignoreOptionalProblems()
+         */
+        public boolean ignoreOptionalProblems() {
+            return false;
+        }
     }
 }



Mime
View raw message