You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2014/01/14 10:20:46 UTC
svn commit: r1557990 - in /tomcat/tc6.0.x/trunk: STATUS.txt
build.properties.default eclipse.classpath
java/org/apache/catalina/startup/TldConfig.java
java/org/apache/jasper/compiler/TldLocationsCache.java res/maven/jasper.pom
webapps/docs/changelog.xml
Author: markt
Date: Tue Jan 14 09:20:46 2014
New Revision: 1557990
URL: http://svn.apache.org/r1557990
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55759
Update the Eclipse compiler to 4.3.1
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/eclipse.classpath
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
tomcat/tc6.0.x/trunk/res/maven/jasper.pom
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1557990&r1=1557989&r2=1557990&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan 14 09:20:46 2014
@@ -32,15 +32,6 @@ PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55759
- Update the Eclipse compiler to 4.3.1
- http://people.apache.org/~markt/patches/2014-01-13-ecj-4.3.1-update-tc6-v1.patch
- +1: markt, remm, mturk
- +0: kkolinko: A Tomcat6-specific patch is needed. It needs update to jar
- exclude lists in TldConfig.java, TldLocationsCache.java, see r1476932.
- markt: Patch updated
- -1:
-
* Back-port some XML processing improvements (part 4)
Add a unit test for the new descriptor
Note I am generating the patches using git so the patch shows whole new files
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1557990&r1=1557989&r2=1557990&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Tue Jan 14 09:20:46 2014
@@ -108,8 +108,8 @@ wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j
# - noTldJars in o.a.j.compiler.TldLocationsCache
# - res/maven/jasper.pom
# - eclipse.classpath
-jdt.version=4.2.2
-jdt.release=R-4.2.2-201302041200
+jdt.version=4.3.1
+jdt.release=R-4.3.1-201309111000
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.
Modified: tomcat/tc6.0.x/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/eclipse.classpath?rev=1557990&r1=1557989&r2=1557990&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/eclipse.classpath (original)
+++ tomcat/tc6.0.x/trunk/eclipse.classpath Tue Jan 14 09:20:46 2014
@@ -20,7 +20,7 @@
<classpathentry kind="src" path="test"/>
<classpathentry kind="src" path="webapps/examples/WEB-INF/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="TOMCAT_LIBS_BASE/ecj-4.2.2/ecj-4.2.2.jar"/>
+ <classpathentry kind="var" path="TOMCAT_LIBS_BASE/ecj-4.3.1/ecj-4.3.1.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
<classpathentry kind="output" path=".settings/output"/>
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java?rev=1557990&r1=1557989&r2=1557990&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java Tue Jan 14 09:20:46 2014
@@ -92,6 +92,7 @@ public final class TldConfig implements
noTldJars.add("ecj-3.7.2.jar");
noTldJars.add("ecj-4.2.1.jar");
noTldJars.add("ecj-4.2.2.jar");
+ noTldJars.add("ecj-4.3.1.jar");
noTldJars.add("jsp-api.jar");
noTldJars.add("servlet-api.jar");
noTldJars.add("tomcat-coyote.jar");
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java?rev=1557990&r1=1557989&r2=1557990&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java Tue Jan 14 09:20:46 2014
@@ -133,6 +133,7 @@ public class TldLocationsCache {
noTldJars.add("ecj-3.7.2.jar");
noTldJars.add("ecj-4.2.1.jar");
noTldJars.add("ecj-4.2.2.jar");
+ noTldJars.add("ecj-4.3.1.jar");
noTldJars.add("jsp-api.jar");
noTldJars.add("servlet-api.jar");
noTldJars.add("tomcat-coyote.jar");
Modified: tomcat/tc6.0.x/trunk/res/maven/jasper.pom
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/jasper.pom?rev=1557990&r1=1557989&r2=1557990&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/maven/jasper.pom (original)
+++ tomcat/tc6.0.x/trunk/res/maven/jasper.pom Tue Jan 14 09:20:46 2014
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
- <version>4.2.2</version>
+ <version>4.3.1</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1557990&r1=1557989&r2=1557990&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jan 14 09:20:46 2014
@@ -200,6 +200,9 @@
Add <code>@since</code> markers to the common annotations classes and
fix a few specification compliance issues. (markt)
</fix>
+ <update>
+ Update to Eclipse JDT Compiler 4.3.1. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org