Author: markt
Date: Mon Nov 2 10:42:06 2015
New Revision: 1711935
URL: http://svn.apache.org/viewvc?rev=1711935&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58404
Don't duplicate properties from build.properties.default in build.xml
Modified:
tomcat/native/trunk/build.properties.default
tomcat/native/trunk/build.xml
Modified: tomcat/native/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/build.properties.default?rev=1711935&r1=1711934&r2=1711935&view=diff
==============================================================================
--- tomcat/native/trunk/build.properties.default (original)
+++ tomcat/native/trunk/build.properties.default Mon Nov 2 10:42:06 2015
@@ -45,7 +45,6 @@ junit.version=3.8.2
# The directory containing your binary distribution of JUnit
# It will be automatically downloaded if it doesn't exist
junit.home=${base.path}/junit${junit.version}
-#junit.home = /usr/local/java/junit3.8.1
# The pathname of the "junit.jar" JAR file
junit.jar=${junit.home}/junit.jar
# The URL used to download JUnit if needed
Modified: tomcat/native/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/build.xml?rev=1711935&r1=1711934&r2=1711935&view=diff
==============================================================================
--- tomcat/native/trunk/build.xml (original)
+++ tomcat/native/trunk/build.xml Mon Nov 2 10:42:06 2015
@@ -31,14 +31,7 @@
<property name="name" value="Tomcat Native" />
<property name="title" value="Tomcat Native Library"/>
<property name="year" value="2015" />
- <property name="version.major" value="1" />
- <property name="version.minor" value="2" />
- <property name="version.build" value="1" />
- <property name="version.patch" value="0" />
- <property name="version.suffix" value="-dev" />
- <property name="junit.home" value="/usr/local/junit3.8"/>
- <property name="junit.jar" value="${junit.home}/junit.jar"/>
<property name="test.runner" value="junit.textui.TestRunner"/>
<property name="version"
value="${version.major}.${version.minor}.${version.build}${version.suffix}" />
@@ -54,12 +47,6 @@
<property name="dist.root" value="./dist"/>
<property name="ant.home" value="."/>
- <property name="compile.source" value="1.8"/>
- <property name="compile.target" value="1.8"/>
- <property name="compile.debug" value="off"/>
- <property name="compile.optimize" value="on"/>
- <property name="compile.deprecation" value="on"/>
-
<property name="docs.src" value="./xdocs"/>
<property name="docs.dest" value="${dist.root}/doc"/>
<property name="docs.dest.print" value="${dist.root}/doc/printable"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
