You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by vi...@apache.org on 2015/03/05 12:54:48 UTC
svn commit: r1664318 - in /tomcat/tc8.0.x/trunk: ./ res/ide-support/eclipse/
res/ide-support/netbeans/ res/maven/ webapps/docs/
Author: violetagg
Date: Thu Mar 5 11:54:47 2015
New Revision: 1664318
URL: http://svn.apache.org/r1664318
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57662
Merged revision 1664317 from tomcat/trunk:
Update to Eclipse ECJ 4.4.2
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/build.properties.default
tomcat/tc8.0.x/trunk/res/ide-support/eclipse/eclipse.classpath
tomcat/tc8.0.x/trunk/res/ide-support/netbeans/nb-tomcat-build.properties
tomcat/tc8.0.x/trunk/res/ide-support/netbeans/project.xml
tomcat/tc8.0.x/trunk/res/maven/tomcat-embed-jasper.pom
tomcat/tc8.0.x/trunk/res/maven/tomcat-jasper.pom
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 5 11:54:47 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663324,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663324,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664317
Modified: tomcat/tc8.0.x/trunk/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/build.properties.default?rev=1664318&r1=1664317&r2=1664318&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/build.properties.default (original)
+++ tomcat/tc8.0.x/trunk/build.properties.default Thu Mar 5 11:54:47 2015
@@ -137,8 +137,8 @@ wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j
# ----- Eclipse JDT, version 4.4 or later -----#
# See https://wiki.apache.org/tomcat/JDTCoreBatchCompiler before updating
-jdt.version=4.4.1
-jdt.release=R-4.4.1-201409250400
+jdt.version=4.4.2
+jdt.release=R-4.4.2-201502041700
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/tc8.0.x/trunk/res/ide-support/eclipse/eclipse.classpath
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/res/ide-support/eclipse/eclipse.classpath?rev=1664318&r1=1664317&r2=1664318&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/res/ide-support/eclipse/eclipse.classpath (original)
+++ tomcat/tc8.0.x/trunk/res/ide-support/eclipse/eclipse.classpath Thu Mar 5 11:54:47 2015
@@ -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.4.1/ecj-4.4.1.jar"/>
+ <classpathentry kind="var" path="TOMCAT_LIBS_BASE/ecj-4.4.2/ecj-4.4.2.jar"/>
<classpathentry kind="var" path="TOMCAT_LIBS_BASE/easymock-3.2/easymock-3.2.jar"/>
<classpathentry kind="output" path=".settings/output"/>
</classpath>
Modified: tomcat/tc8.0.x/trunk/res/ide-support/netbeans/nb-tomcat-build.properties
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/res/ide-support/netbeans/nb-tomcat-build.properties?rev=1664318&r1=1664317&r2=1664318&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/res/ide-support/netbeans/nb-tomcat-build.properties (original)
+++ tomcat/tc8.0.x/trunk/res/ide-support/netbeans/nb-tomcat-build.properties Thu Mar 5 11:54:47 2015
@@ -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.4.1/ecj-4.4.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.4.2/ecj-4.4.2.jar:${tomcat.classes}
# Extra properties used by the Tomcat project additional NetBeans targets.
Modified: tomcat/tc8.0.x/trunk/res/ide-support/netbeans/project.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/res/ide-support/netbeans/project.xml?rev=1664318&r1=1664317&r2=1664318&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/res/ide-support/netbeans/project.xml (original)
+++ tomcat/tc8.0.x/trunk/res/ide-support/netbeans/project.xml Thu Mar 5 11:54:47 2015
@@ -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.4.1/ecj-4.4.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.4.2/ecj-4.4.2.jar:${ant.includes}/</classpath>
<source-level>1.7</source-level>
</compilation-unit>
<compilation-unit>
Modified: tomcat/tc8.0.x/trunk/res/maven/tomcat-embed-jasper.pom
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/res/maven/tomcat-embed-jasper.pom?rev=1664318&r1=1664317&r2=1664318&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/res/maven/tomcat-embed-jasper.pom (original)
+++ tomcat/tc8.0.x/trunk/res/maven/tomcat-embed-jasper.pom Thu Mar 5 11:54:47 2015
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
- <version>4.4.1</version>
+ <version>4.4.2</version>
</dependency>
</dependencies>
</project>
Modified: tomcat/tc8.0.x/trunk/res/maven/tomcat-jasper.pom
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/res/maven/tomcat-jasper.pom?rev=1664318&r1=1664317&r2=1664318&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/res/maven/tomcat-jasper.pom (original)
+++ tomcat/tc8.0.x/trunk/res/maven/tomcat-jasper.pom Thu Mar 5 11:54:47 2015
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
- <version>4.4.1</version>
+ <version>4.4.2</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1664318&r1=1664317&r2=1664318&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Mar 5 11:54:47 2015
@@ -139,6 +139,10 @@
TLDs if the scan does not find a TLD in any jar. Previously a message
would only be logged if a TLD was not found in all scanned jars. (jboynes)
</fix>
+ <update>
+ <bug>57662</bug>: Update all references to the ECJ compiler to version
+ 4.4.2. (violetagg)
+ </update>
</changelog>
</subsection>
<subsection name="WebSocket">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org