Author: kkolinko
Date: Tue Mar 26 13:19:12 2013
New Revision: 1461116
URL: http://svn.apache.org/r1461116
Log:
Merged r1461110 from tomcat/trunk:
Update to Eclipse JDT Compiler 4.2.2
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:r1461110
Modified: tomcat/tc7.0.x/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1461116&r1=1461115&r2=1461116&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.properties.default (original)
+++ tomcat/tc7.0.x/trunk/build.properties.default Tue Mar 26 13:19:12 2013
@@ -123,8 +123,8 @@ wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/
wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j-${wsdl4j-lib.version}.jar
# ----- Eclipse JDT, version 3.2 or later -----#
-jdt.version=4.2.1
-jdt.release=R-4.2.1-201209141800
+jdt.version=4.2.2
+jdt.release=R-4.2.2-201302041200
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=1461116&r1=1461115&r2=1461116&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 Tue Mar 26
13:19:12 2013
@@ -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-4.2.1/ecj-4.2.1.jar"/>
+ <classpathentry kind="var"
path="TOMCAT_LIBS_BASE/ecj-4.2.2/ecj-4.2.2.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=1461116&r1=1461115&r2=1461116&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 Tue Mar 26 13:19:12
2013
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
- <version>4.2.1</version>
+ <version>4.2.2</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=1461116&r1=1461115&r2=1461116&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom (original)
+++ tomcat/tc7.0.x/trunk/res/maven/tomcat-jasper.pom Tue Mar 26 13:19:12 2013
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
- <version>4.2.1</version>
+ <version>4.2.2</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=1461116&r1=1461115&r2=1461116&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Mar 26 13:19:12 2013
@@ -78,6 +78,9 @@
<subsection name="Other">
<changelog>
<update>
+ Update to Eclipse JDT Compiler 4.2.2. (kkolinko)
+ </update>
+ <update>
Convert remaining unit tests to JUnit 4 and enable Checkstyle rule
that forbids use of methods from JUnit 3. (markt/kkolinko)
</update>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
