Author: ebourg
Date: Thu Jun 21 14:13:46 2018
New Revision: 1834020
URL: http://svn.apache.org/viewvc?rev=1834020&view=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/modules/jdbc-pool/build.properties.default
tomcat/trunk/modules/jdbc-pool/build.xml
tomcat/trunk/webapps/docs/building.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1834020&r1=1834019&r2=1834020&view=diff
==============================================================================
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Thu Jun 21 14:13:46 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=1834020&r1=1834019&r2=1834020&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Jun 21 14:13:46 2018
@@ -87,6 +87,7 @@
<!-- Servlet 4.0 spec requires 1.8+ -->
<property name="compile.source" value="1.8"/>
<property name="compile.target" value="1.8"/>
+ <property name="compile.release" value="8"/>
<!-- Locations to create the JAR artifacts -->
<!-- Standard JARs -->
@@ -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">
<classpath refid="tomcat.test.classpath" />
@@ -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">
<classpath refid="tomcat.webservices.classpath" />
Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.properties.default?rev=1834020&r1=1834019&r2=1834020&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/build.properties.default (original)
+++ tomcat/trunk/modules/jdbc-pool/build.properties.default Thu Jun 21 14:13:46
2018
@@ -37,6 +37,7 @@ base.path=${basedir}/includes
compile.source=1.8
compile.target=1.8
+compile.release=.8
compile.debug=true
# Do not pass -deprecation (-Xlint:deprecation) flag to javac
Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=1834020&r1=1834019&r2=1834020&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Thu Jun 21 14:13:46 2018
@@ -150,6 +150,7 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
target="${compile.target}"
+ release="${compile.release}"
encoding="ISO-8859-1"
includeantruntime="false">
<classpath refid="tomcat.jdbc.classpath"/>
@@ -186,6 +187,7 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
target="${compile.target}"
+ release="${compile.release}"
encoding="ISO-8859-1"
includeantruntime="false">
<classpath refid="tomcat.jdbc.classpath"/>
Modified: tomcat/trunk/webapps/docs/building.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/building.xml?rev=1834020&r1=1834019&r2=1834020&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/building.xml (original)
+++ tomcat/trunk/webapps/docs/building.xml Thu Jun 21 14:13:46 2018
@@ -59,10 +59,10 @@ directory into which you installed the J
</section>
-<section name="Install Apache Ant 1.9.5 or later">
+<section name="Install Apache Ant 1.9.8 or later">
<p>
-Download a binary distribution of Ant 1.9.5 or later from
+Download a binary distribution of Ant 1.9.8 or later from
<a href="https://ant.apache.org/bindownload.cgi";>here</a>.
</p>
@@ -227,7 +227,7 @@ Variables</em> to add two new <em>Classp
<table class="defaultTable">
<tr><td>TOMCAT_LIBS_BASE</td><td>The same location as the
<code>base.path</code>
setting in <code>build.properties</code>, where the binary dependencies have
been downloaded</td></tr>
- <tr><td>ANT_HOME</td><td>the base path of Ant 1.9.5 or later</td></tr>
+ <tr><td>ANT_HOME</td><td>the base path of Ant 1.9.8 or later</td></tr>
</table>
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1834020&r1=1834019&r2=1834020&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jun 21 14:13:46 2018
@@ -45,6 +45,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 9.0.11 (markt)" rtext="in development">
+ <subsection name="Other">
+ <changelog>
+ <update>
+ Support building with Java 9+ while preserving the Java 8 compatibility
+ at runtime (requires Ant 1.9.8 or later). (ebourg)
+ </update>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 9.0.10 (markt)" rtext="release in progress">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
