Author: ebourg
Date: Thu Jun 21 10:56:16 2018
New Revision: 1833994
URL: http://svn.apache.org/viewvc?rev=1833994=rev
Log:
Added the new javac release attribute to be able to build Tomcat with recent
JDKs without compromising the compatibility with older versions (requires Ant
1.9.8 or later)
Modified:
tomcat/trunk/BUILDING.txt
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/building.xml
Modified: tomcat/trunk/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1833994=1833993=1833994=diff
==
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Thu Jun 21 10:56:16 2018
@@ -64,9 +64,9 @@ source distribution, do the following:
into which you installed the JDK release.
-(2) Install Apache Ant version 1.9.5 or later on your computer.
+(2) Install Apache Ant version 1.9.8 or later on your computer.
- 1. If Apache Ant version 1.9.5 or later is already installed on your
+ 1. If Apache Ant version 1.9.8 or later is already installed on your
computer, skip to (3).
2. Download a binary distribution of Ant from:
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1833994=1833993=1833994=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Jun 21 10:56:16 2018
@@ -87,6 +87,7 @@
+
@@ -628,6 +629,7 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
target="${compile.target}"
+ release="${compile.release}"
excludes="**/.svn/**"
encoding="ISO-8859-1"
includeAntRuntime="true" >
@@ -683,6 +685,7 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
target="${compile.target}"
+ release="${compile.release}"
excludes="**/.svn/**"
encoding="ISO-8859-1"
includeAntRuntime="true" >
@@ -1137,6 +1140,7 @@
debug="${compile.debug}" deprecation="${compile.deprecation}"
source="${compile.source}"
target="${compile.target}"
+ release="${compile.release}"
classpath="${tomcat.classes}"
excludes="**/CVS/**,**/.svn/**"
encoding="ISO-8859-1"
@@ -1149,6 +1153,7 @@
debug="${compile.debug}" deprecation="${compile.deprecation}"
source="${compile.source}"
target="${compile.target}"
+ release="${compile.release}"
classpath="$tomcat.lcasses}"
excludes="**/CVS/**,**/.svn/**"
encoding="ISO-8859-1"
@@ -1380,6 +1385,7 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
target="${compile.target}"
+ release="${compile.release}"
encoding="ISO-8859-1"
includeantruntime="true">
@@ -1691,6 +1697,8 @@
debug="${compile.debug}"
deprecation="${compile.deprecation}"
source="${compile.source}"
+ target="${compile.target}"
+ release="${compile.release}"
encoding="ISO-8859-1"
includeantruntime="false">
Modified: tomcat/trunk/webapps/docs/building.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/building.xml?rev=1833994=1833993=1833994=diff
==
--- tomcat/trunk/webapps/docs/building.xml (original)
+++ tomcat/trunk/webapps/docs/building.xml Thu Jun 21 10:56:16 2018
@@ -59,10 +59,10 @@ directory into which you installed the J
-
+
-Download a binary distribution of Ant 1.9.5 or later from
+Download a binary distribution of Ant 1.9.8 or later from
https://ant.apache.org/bindownload.cgi;>here.
@@ -227,7 +227,7 @@ Variables to add two new Classp
TOMCAT_LIBS_BASEThe same location as the
base.path
setting in build.properties, where the binary dependencies have
been downloaded
- ANT_HOMEthe base path of Ant 1.9.5 or later
+ ANT_HOMEthe base path of Ant 1.9.8 or later
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org