Author: markt
Date: Tue Nov 20 08:48:46 2012
New Revision: 1411587
URL: http://svn.apache.org/viewvc?rev=1411587&view=rev
Log:
Update JDT complier to 4.2.1
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1410764,1411585
Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1411587&r1=1411586&r2=1411587&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Tue Nov 20 08:48:46 2012
@@ -122,14 +122,14 @@ wsdl4j-lib.home=${base.path}/wsdl4j-${ws
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${wsdl4j-lib.version}.jar
wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j-${wsdl4j-lib.version}.jar
-# ----- Eclipse JDT, version 3.2 or later -----
-jdt.version=3.7.2
-jdt.release=R-3.7.2-201202080800
+# ----- Eclipse JDT, version 3.2 or later -----#
+jdt.version=4.2.1
+jdt.release=R-4.2.1-201209141800
jdt.home=${base.path}/ecj-${jdt.version}
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
# The download will be moved to the archive area eventually. We are taking
care of that in advance.
-jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj-${jdt.version}.jar
-jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops/${jdt.release}/ecj-${jdt.version}.jar
+jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
+jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# ----- Tomcat native library -----
tomcat-native.version=1.1.24
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java?rev=1411587&r1=1411586&r2=1411587&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JDTCompiler.java Tue
Nov 20 08:48:46 2012
@@ -166,8 +166,7 @@ public class JDTCompiler extends org.apa
return result;
}
- @SuppressWarnings("unused") // New method added to interface in
- // later JDT versions
+ @Override
public boolean ignoreOptionalProblems() {
return false;
}
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom?rev=1411587&r1=1411586&r2=1411587&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom Tue Nov 20 08:48:46 2012
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
- <version>3.7.2</version>
+ <version>4.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1411587&r1=1411586&r2=1411587&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Nov 20 08:48:46 2012
@@ -61,8 +61,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <update>
+ Update to Eclipse JDT Compiler 4.2.1. (markt)
+ </update>
+ </changelog>
+ </subsection>
</section>
-<section name="Tomcat 7.0.33 (markt)">
+<section name="Tomcat 7.0.33 (markt)" rtext="2012-11-TBD">
<subsection name="Catalina">
<changelog>
<add>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
