Author: kkolinko
Date: Tue Oct 21 23:25:17 2014
New Revision: 1633484
URL: http://svn.apache.org/r1633484
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57079
When Eclipse Compiler JAR is updated, make sure to delete its old version from
Tomcat lib directory.
It is backport of r1606114 from tomcat/trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1606114
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1633484&r1=1633483&r2=1633484&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Tue Oct 21 23:25:17 2014
@@ -1007,12 +1007,22 @@
<filterset refid="version.filters"/>
</copy>
+ <!-- Delete all other versions of Eclipse JDT Compiler and copy the
current one -->
+ <local name="jdt.jar.filename" />
+ <basename property="jdt.jar.filename" file="${jdt.jar}"/>
+ <delete verbose="true">
+ <fileset dir="${tomcat.build}/lib">
+ <include name="ecj-*.jar"/>
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+ <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
+
<!-- Add sources for examples -->
<antcall target="examples-sources" />
<copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
failonerror="false"/>
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
<!-- build the jdbc-pool jar and source jar-->
<echo message="Building Tomcat JDBC pool libraries"/>
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=1633484&r1=1633483&r2=1633484&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Oct 21 23:25:17 2014
@@ -189,6 +189,11 @@
Fix timestamps in Tomcat build and jdbc-pool to use 24-hour format
instead of 12-hour one and use UTC timezone. (markt/kkolinko)
</fix>
+ <update>
+ Improve Tomcat build script to ensure that only one ecj-nn.jar file
+ is present in Tomcat <code>lib</code> directory when Eclipse JDT
+ Compiler is updated to a new version. (kkolinko)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
