Author: remy.maucherat(a)jboss.com Date: 2013-11-06 12:07:31 -0500 (Wed, 06 Nov 2013) New Revision: 2303 Modified: branches/7.4.x/.classpath branches/7.4.x/pom.xml branches/7.4.x/src/main/java/org/apache/jasper/compiler/JDTCompiler.java Log: - POM cleanup. - Support newer JDT. Modified: branches/7.4.x/.classpath =================================================================== --- branches/7.4.x/.classpath 2013-11-06 13:05:56 UTC (rev 2302) +++ branches/7.4.x/.classpath 2013-11-06 17:07:31 UTC (rev 2303) @@ -6,7 +6,7 @@ <classpathentry kind="lib" path="/home/remm/.m2/repository/org/jboss/spec/javax/servlet/jboss-servlet-api_3.0_spec/1.0.1.Final/jboss-servlet-api_3.0_spec-1.0.1.Final.jar"/> <classpathentry kind="lib" path="/home/remm/.m2/repository/org/jboss/spec/javax/servlet/jsp/jboss-jsp-api_2.2_spec/1.0.1.Final/jboss-jsp-api_2.2_spec-1.0.1.Final.jar"/> <classpathentry kind="lib" path="/home/remm/.m2/repository/org/jboss/spec/javax/el/jboss-el-api_2.2_spec/1.0.1.Final/jboss-el-api_2.2_spec-1.0.1.Final.jar"/> - <classpathentry kind="lib" path="/home/remm/.m2/repository/org/jboss/web/jasper-jdt/7.0.3.Final/jasper-jdt-7.0.3.Final.jar"/> <classpathentry kind="lib" path="/home/remm/.m2/repository/org/jboss/spec/javax/websocket/jboss-websocket-api_1.0_spec/1.0.0.Beta1/jboss-websocket-api_1.0_spec-1.0.0.Beta1.jar"/> + <classpathentry kind="lib" path="/home/remm/.m2/repository/org/eclipse/jdt/core/compiler/ecj/4.2.2/ecj-4.2.2.jar"/> <classpathentry kind="output" path=".settings/output"/> </classpath> Modified: branches/7.4.x/pom.xml =================================================================== --- branches/7.4.x/pom.xml 2013-11-06 13:05:56 UTC (rev 2302) +++ branches/7.4.x/pom.xml 2013-11-06 17:07:31 UTC (rev 2303) @@ -45,9 +45,7 @@ <version.org.jboss.spec.javax.el>1.0.1.Final</version.org.jboss.spec.javax.el> <version.org.jboss.spec.javax.servlet>1.0.1.Final</version.org.jboss.spec.javax.servlet> <version.org.jboss.spec.javax.servlet.jsp>1.0.1.Final</version.org.jboss.spec.javax.servlet.jsp> - <version.org.jboss.spec.javax.websocket>1.0.0.Beta1</version.org.jboss.spec.javax.websocket> - <version.org.eclipse.jdt.core.compiler.ecj>3.7.2</version.org.eclipse.jdt.core.compiler.ecj> - <version.org.jboss.xnio>3.0.4.GA</version.org.jboss.xnio> + <version.org.eclipse.jdt.core.compiler.ecj>4.2.2</version.org.eclipse.jdt.core.compiler.ecj> <!-- Build configuration --> <maven.compiler.source>1.6</maven.compiler.source> <maven.compiler.target>1.6</maven.compiler.target> @@ -103,19 +101,6 @@ <dependencies> <dependency> - <groupId>org.jboss.xnio</groupId> - <artifactId>xnio-api</artifactId> - <version>${version.org.jboss.xnio}</version> - </dependency> - - <dependency> - <groupId>org.jboss.xnio</groupId> - <artifactId>xnio-nio</artifactId> - <version>${version.org.jboss.xnio}</version> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> <version>${version.org.jboss.logging.jboss-logging}</version> @@ -157,13 +142,6 @@ </dependency> <dependency> - <groupId>org.jboss.spec.javax.websocket</groupId> - <artifactId>jboss-websocket-api_1.0_spec</artifactId> - <version>${version.org.jboss.spec.javax.websocket}</version> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>org.eclipse.jdt.core.compiler</groupId> <artifactId>ecj</artifactId> <version>${version.org.eclipse.jdt.core.compiler.ecj}</version> Modified: branches/7.4.x/src/main/java/org/apache/jasper/compiler/JDTCompiler.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/jasper/compiler/JDTCompiler.java 2013-11-06 13:05:56 UTC (rev 2302) +++ branches/7.4.x/src/main/java/org/apache/jasper/compiler/JDTCompiler.java 2013-11-06 17:07:31 UTC (rev 2303) @@ -155,6 +155,10 @@ } return result; } + + public boolean ignoreOptionalProblems() { + return false; + } } final INameEnvironment env = new INameEnvironment() {