You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2014/10/18 13:24:58 UTC
svn commit: r1632761 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.xml
extras.xml webapps/docs/changelog.xml
Author: kkolinko
Date: Sat Oct 18 11:24:58 2014
New Revision: 1632761
URL: http://svn.apache.org/r1632761
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56988
Allow to use relative path in <code>base.path</code> setting when building Tomcat.
Tested with Ant 1.8.0.
Motivation: Allow to simplify configuration of automated CI tools that may run in different environments, e.g. Buildbot.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/extras.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1632761&r1=1632760&r2=1632761&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Oct 18 11:24:58 2014
@@ -79,19 +79,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: kkolinko, markt, remm
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56988
- Allow to use relative path in <code>base.path</code> setting when
- building Tomcat.
-
- Tested with Ant 1.8.0.
-
- Motivation: Allow to simplify configuration of automated CI tools that
- may run in different environments, e.g. Buildbot.
-
- https://issues.apache.org/bugzilla/attachment.cgi?id=32041
- +1: kkolinko, markt, remm
- -1:
-
* For https://issues.apache.org/bugzilla/show_bug.cgi?id=56079
Switch to the signed versions of Apache Commons Daemon 1.0.15 binaries.
Modified: tomcat/tc6.0.x/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=1632761&r1=1632760&r2=1632761&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Sat Oct 18 11:24:58 2014
@@ -827,9 +827,7 @@
<param name="destfile" value="${commons-dbcp.home}/build.xml" />
</antcall>
<mkdir dir="${tomcat-dbcp.home}"/>
- <antcall target="build-tomcat-dbcp">
- <param name="basedir" value="${tomcat-dbcp.home}" />
- </antcall>
+ <antcall target="build-tomcat-dbcp" />
<!-- Download JDT (Eclipse compiler) -->
<antcall target="downloadfile-2">
Modified: tomcat/tc6.0.x/trunk/extras.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/extras.xml?rev=1632761&r1=1632760&r2=1632761&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/extras.xml (original)
+++ tomcat/tc6.0.x/trunk/extras.xml Sat Oct 18 11:24:58 2014
@@ -182,7 +182,7 @@
<ant antfile="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build2.xml"
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src"
- target="compile" />
+ inheritAll="false" target="compile" />
<jar jarfile="${tomcat-juli.jar}"
manifest="${tomcat.manifests}/default.manifest" >
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1632761&r1=1632760&r2=1632761&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Oct 18 11:24:58 2014
@@ -52,6 +52,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <update>
+ <bug>56988</bug>: Allow to use relative path in <code>base.path</code>
+ setting when building Tomcat. (kkolinko)
+ </update>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 6.0.42 (jfclere)" rtext="not released">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org