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)

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc8.0.x/trunk@1834116 13f79535-47bb-0310-9956-ffa450edef68

BUILDING.txt

@@ -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:

build.xml

@@ -84,6 +84,7 @@
   <!-- Servlet 3.1 spec requires 1.7+ -->
   <property name="compile.source" value="1.7"/>
   <property name="compile.target" value="1.7"/>
+  <property name="compile.release" value="7"/>
 
   <!-- Locations to create the JAR artifacts -->
   <!-- Standard JARs -->
@@ -617,6 +618,7 @@
            deprecation="${compile.deprecation}"
            source="${compile.source}"
            target="${compile.target}"
+           release="${compile.release}"
            excludes="**/.svn/**"
            encoding="ISO-8859-1"
            includeAntRuntime="true" >
@@ -668,6 +670,7 @@
            deprecation="${compile.deprecation}"
            source="${compile.source}"
            target="${compile.target}"
+           release="${compile.release}"
            excludes="**/.svn/**"
            encoding="ISO-8859-1"
            includeAntRuntime="true" >
@@ -1083,6 +1086,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"
@@ -1095,6 +1099,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"
@@ -1328,6 +1333,7 @@
            deprecation="${compile.deprecation}"
            source="${compile.source}"
            target="${compile.target}"
+           release="${compile.release}"
            encoding="ISO-8859-1"
            includeantruntime="true">
       <classpath refid="tomcat.test.classpath" />
@@ -1782,6 +1788,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" />

modules/jdbc-pool/build.properties.default

@@ -37,6 +37,7 @@ base.path=${basedir}/includes
 
 compile.source=1.7
 compile.target=1.7
+compile.release=7
 compile.debug=true
 
 # Do not pass -deprecation (-Xlint:deprecation) flag to javac

modules/jdbc-pool/build.xml

@@ -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"/>

webapps/docs/building.xml

@@ -59,10 +59,10 @@ directory into which you installed the JDK release.
 
 </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>Classpath Variables</em>:
 <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>
 
 

webapps/docs/changelog.xml

@@ -260,6 +260,10 @@
       <update>
         Update the internal fork of Commons DBCP 2 to 2.4.0. (markt)
       </update>
+      <update>
+        Support building with Java 9+ while preserving the Java 7 compatibility
+        at runtime (requires Ant 1.9.8 or later). (ebourg)
+      </update>
     </changelog>
   </subsection>
 </section>