Author: violetagg
Date: Wed Jun 25 18:14:35 2014
New Revision: 1605534
URL: http://svn.apache.org/r1605534
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56543
Merged revision 1605528 from tomcat/trunk:
Update to the Eclipse JDT Compiler 4.4
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.properties.default
tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath
tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom
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:r1605528
Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1605534&r1=1605533&r2=1605534&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Wed Jun 25 18:14:35 2014
@@ -127,9 +127,9 @@ 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=P20140317-1600
-jdt.release=P20140317-1600
+# ----- Eclipse JDT, version 4.4 or later -----#
+jdt.version=4.4
+jdt.release=R-4.4-201406061215
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/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath?rev=1605534&r1=1605533&r2=1605534&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath (original)
+++ tomcat/tc7.0.x/trunk/res/ide-support/eclipse/eclipse.classpath Wed Jun 25
18:14:35 2014
@@ -25,6 +25,6 @@
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/tomcat7-deps/dbcp/tomcat-dbcp.jar"
sourcepath="/TOMCAT_LIBS_BASE/tomcat7-deps/dbcp/src/java"/>
<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-P20140317-1600/ecj-P20140317-1600.jar"/>
+ <classpathentry kind="var" path="TOMCAT_LIBS_BASE/ecj-4.4/ecj-4.4.jar"/>
<classpathentry kind="output" path=".settings/output"/>
</classpath>
Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom?rev=1605534&r1=1605533&r2=1605534&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-embed-jasper.pom Wed Jun 25 18:14:35
2014
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
- <version>P20140317-1600</version>
+ <version>4.4</version>
</dependency>
</dependencies>
</project>
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=1605534&r1=1605533&r2=1605534&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom Wed Jun 25 18:14:35 2014
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
- <version>P20140317-1600</version>
+ <version>4.4</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=1605534&r1=1605533&r2=1605534&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jun 25 18:14:35 2014
@@ -179,6 +179,9 @@
follows a whitespace. (kkolinko/markt)
</fix>
<fix>
+ <bug>56543</bug>: Update to the Eclipse JDT Compiler 4.4. (violetagg)
+ </fix>
+ <fix>
<bug>56561</bug>: Avoid <code>NoSuchElementException</code> while
handling
attributes with empty string value. (violetagg)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
