Author: violetagg
Date: Wed Jun 25 18:02:49 2014
New Revision: 1605528
URL: http://svn.apache.org/r1605528
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56543
Update to the Eclipse JDT Compiler 4.4
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=1605528&r1=1605527&r2=1605528&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Wed Jun 25 18:02:49 2014
@@ -128,15 +128,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 4.4RC4 or later -----#
-jdt.version=4.4RC4
-jdt.release=S-4.4RC4-201406061215
+# ----- 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.
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
-
# ---- NPN support
npn.version=8.1.2.v20120308
npn.home=${base.path}/npn-${npn.version}
Modified: tomcat/trunk/res/ide-support/eclipse/eclipse.classpath
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/eclipse/eclipse.classpath?rev=1605528&r1=1605527&r2=1605528&view=diff
==============================================================================
--- tomcat/trunk/res/ide-support/eclipse/eclipse.classpath (original)
+++ tomcat/trunk/res/ide-support/eclipse/eclipse.classpath Wed Jun 25 18:02:49
2014
@@ -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.4RC4/ecj-4.4RC4.jar"/>
+ <classpathentry kind="var" path="TOMCAT_LIBS_BASE/ecj-4.4/ecj-4.4.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/easymock-3.2/easymock-3.2.jar"/>
<classpathentry kind="output" path=".settings/output"/>
</classpath>
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=1605528&r1=1605527&r2=1605528&view=diff
==============================================================================
--- tomcat/trunk/res/ide-support/netbeans/nb-tomcat-build.properties (original)
+++ tomcat/trunk/res/ide-support/netbeans/nb-tomcat-build.properties Wed Jun 25
18:02:49 2014
@@ -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.4RC4/ecj-4.4RC4.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.4/ecj-4.4.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=1605528&r1=1605527&r2=1605528&view=diff
==============================================================================
--- tomcat/trunk/res/ide-support/netbeans/project.xml (original)
+++ tomcat/trunk/res/ide-support/netbeans/project.xml Wed Jun 25 18:02:49 2014
@@ -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.4RC4/ecj-4.4RC4.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.4/ecj-4.4.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=1605528&r1=1605527&r2=1605528&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-embed-jasper.pom (original)
+++ tomcat/trunk/res/maven/tomcat-embed-jasper.pom Wed Jun 25 18:02:49 2014
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
- <version>4.4RC4</version>
+ <version>4.4</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=1605528&r1=1605527&r2=1605528&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-jasper.pom (original)
+++ tomcat/trunk/res/maven/tomcat-jasper.pom Wed Jun 25 18:02:49 2014
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
- <version>4.4RC4</version>
+ <version>4.4</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=1605528&r1=1605527&r2=1605528&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jun 25 18:02:49 2014
@@ -86,6 +86,13 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>56543</bug>: Update to the Eclipse JDT Compiler 4.4. (violetagg)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="WebSocket">
<changelog>
<add>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
