Author: violetagg
Date: Thu May 4 08:07:10 2017
New Revision: 1793746
URL: http://svn.apache.org/viewvc?rev=1793746&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61057
Update to Eclipse JDT Compiler 4.6.3.
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/res/ide-support/eclipse/eclipse.classpath
tomcat/trunk/res/ide-support/netbeans/nb-tomcat-build.properties
tomcat/trunk/res/ide-support/netbeans/project.xml
tomcat/trunk/res/maven/tomcat-embed-jasper.pom
tomcat/trunk/res/maven/tomcat-jasper.pom
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1793746&r1=1793745&r2=1793746&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu May 4 08:07:10 2017
@@ -117,8 +117,8 @@ wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j
# ----- Eclipse JDT, version 4.5.1 or later -----#
# See https://wiki.apache.org/tomcat/JDTCoreBatchCompiler before updating
-jdt.version=4.6.1
-jdt.release=R-4.6.1-201609071200
+jdt.version=4.6.3
+jdt.release=R-4.6.3-201703010400
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/trunk/res/ide-support/eclipse/eclipse.classpath
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/eclipse/eclipse.classpath?rev=1793746&r1=1793745&r2=1793746&view=diff
==============================================================================
--- tomcat/trunk/res/ide-support/eclipse/eclipse.classpath (original)
+++ tomcat/trunk/res/ide-support/eclipse/eclipse.classpath Thu May 4 08:07:10
2017
@@ -24,7 +24,7 @@
<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/wsdl4j-1.6.2/wsdl4j-1.6.2.jar"/>
- <classpathentry kind="var"
path="TOMCAT_LIBS_BASE/ecj-4.6.1/ecj-4.6.1.jar"/>
+ <classpathentry kind="var"
path="TOMCAT_LIBS_BASE/ecj-4.6.3/ecj-4.6.3.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/easymock-3.2/easymock-3.2.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/hamcrest-1.3/hamcrest-core-1.3.jar"/>
<classpathentry kind="output" path=".settings/output"/>
Modified: tomcat/trunk/res/ide-support/netbeans/nb-tomcat-build.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/netbeans/nb-tomcat-build.properties?rev=1793746&r1=1793745&r2=1793746&view=diff
==============================================================================
--- tomcat/trunk/res/ide-support/netbeans/nb-tomcat-build.properties (original)
+++ tomcat/trunk/res/ide-support/netbeans/nb-tomcat-build.properties Thu May 4
08:07:10 2017
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http
# it is not possible to retrieve the classpaths from the build to
# use in the NetBeans targets, so they must be explicitly declared
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.11/junit-4.11.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.6.1/ecj-4.6.1.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.11/junit-4.11.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.6.3/ecj-4.6.3.jar:${tomcat.classes}
# Extra properties used by the Tomcat project additional NetBeans targets.
Modified: tomcat/trunk/res/ide-support/netbeans/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/netbeans/project.xml?rev=1793746&r1=1793745&r2=1793746&view=diff
==============================================================================
--- tomcat/trunk/res/ide-support/netbeans/project.xml (original)
+++ tomcat/trunk/res/ide-support/netbeans/project.xml Thu May 4 08:07:10 2017
@@ -178,7 +178,7 @@
-->
<compilation-unit>
<package-root>java</package-root>
- <classpath
mode="compile">${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.2/wsdl4j-1.6.2.jar:${base.path}/ecj-4.6.1/ecj-4.6.1.jar:${ant.includes}/</classpath>
+ <classpath
mode="compile">${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.2/wsdl4j-1.6.2.jar:${base.path}/ecj-4.6.3/ecj-4.6.3.jar:${ant.includes}/</classpath>
<source-level>1.7</source-level>
</compilation-unit>
<compilation-unit>
Modified: tomcat/trunk/res/maven/tomcat-embed-jasper.pom
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-embed-jasper.pom?rev=1793746&r1=1793745&r2=1793746&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-embed-jasper.pom (original)
+++ tomcat/trunk/res/maven/tomcat-embed-jasper.pom Thu May 4 08:07:10 2017
@@ -43,9 +43,9 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jdt.core.compiler</groupId>
+ <groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId>
- <version>4.6.1</version>
+ <version>3.12.3</version>
</dependency>
</dependencies>
</project>
Modified: tomcat/trunk/res/maven/tomcat-jasper.pom
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jasper.pom?rev=1793746&r1=1793745&r2=1793746&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-jasper.pom (original)
+++ tomcat/trunk/res/maven/tomcat-jasper.pom Thu May 4 08:07:10 2017
@@ -55,9 +55,9 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jdt.core.compiler</groupId>
+ <groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId>
- <version>4.6.1</version>
+ <version>3.12.3</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1793746&r1=1793745&r2=1793746&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu May 4 08:07:10 2017
@@ -144,6 +144,9 @@
bytes used to detect the encoding since they are not part of a BOM.
(markt)
</fix>
+ <update>
+ <bug>61057</bug>: Update to Eclipse JDT Compiler 4.6.3. (violetagg)
+ </update>
<fix>
<bug>61065</bug>: Ensure that once the class is resolved by
<code>javax.el.ImportHandler#resolveClass</code> it will be cached with
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
