[tomcat] branch 7.0.x updated: Restore compile.release where it can be done without breaking the build

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
     new d0f6f2f  Restore compile.release where it can be done without breaking 
the build
d0f6f2f is described below

commit d0f6f2f1960828f6f8ff1d77698aac4bc2eeac0a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Nov 15 20:51:59 2019 +0000

    Restore compile.release where it can be done without breaking the build
---
 build.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/build.xml b/build.xml
index 391ba00..dbad7cb 100644
--- a/build.xml
+++ b/build.xml
@@ -83,6 +83,7 @@
   <!-- Servlet 3.0 spec requires Java 6+ -->
   <property name="compile.source" value="6"/>
   <property name="compile.target" value="6"/>
+  <property name="compile.release" value="6"/>
   <property name="min.java.version" value="6"/>
 
   <!-- Expose commons-logging defaults so they can be orver-ridden -->
@@ -635,6 +636,7 @@
            deprecation="${compile.deprecation}"
            source="${compile.source}"
            target="${compile.target}"
+           release="${compile.release}"
            encoding="ISO-8859-1"
            includeAntRuntime="true" >
       <compilerarg value="-Xlint:unchecked"/>
@@ -1175,6 +1177,7 @@
              debug="${compile.debug}" deprecation="${compile.deprecation}"
              source="${compile.source}"
              target="${compile.target}"
+             release="${compile.release}"
              classpath="${tomcat.classes}"
              encoding="ISO-8859-1"
              includeantruntime="false">
@@ -1186,6 +1189,7 @@
              debug="${compile.debug}" deprecation="${compile.deprecation}"
              source="${compile.source}"
              target="${compile.target}"
+             release="${compile.release}"
              classpath="${tomcat.classes}"
              encoding="ISO-8859-1"
              includeantruntime="false">
@@ -1412,6 +1416,7 @@
            deprecation="${compile.deprecation}"
            source="${compile.source}"
            target="${compile.target}"
+           release="${compile.release}"
            encoding="ISO-8859-1"
            includeantruntime="true">
       <classpath refid="tomcat.test.classpath" />


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org