This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 2b6e19e971a980e38bcd30f05c554d9b798666c0
Author: Mark Thomas
AuthorDate: Thu Jan 13 16:36:32 2022 +
SWitch to building with Java 11 and using --release
Remove unnecessary references to compile.source and compile.target
Since we are now using release, that overrides source and target.
---
BUILDING.txt | 2 +-
build.xml| 82 +++-
2 files changed, 21 insertions(+), 63 deletions(-)
diff --git a/BUILDING.txt b/BUILDING.txt
index fc4af6f..1f3f324 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -36,7 +36,7 @@ source distribution, do the following:
1. If the JDK is already installed, skip to (2).
- 2. Download a version 8 of Java Development Kit (JDK) release (use the
+ 2. Download a version 11 of Java Development Kit (JDK) release (use the
latest update available for your chosen version) from one of:
http://www.oracle.com/technetwork/java/javase/downloads/index.html
diff --git a/build.xml b/build.xml
index 9597d3b..744eaab 100644
--- a/build.xml
+++ b/build.xml
@@ -102,8 +102,6 @@
-
-
@@ -211,33 +209,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -916,8 +887,6 @@
@@ -971,8 +940,6 @@
@@ -1005,8 +972,8 @@
-
-
+
+
@@ -1503,8 +1470,6 @@
@@ -1839,8 +1801,6 @@
@@ -1969,13 +1929,11 @@
-
-
-
-
-
-
-
+
+
+
+
+
@@ -2182,8 +2140,8 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
encoding="UTF-8"
docencoding="UTF-8"
charset="UTF-8"
- additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
- source="${compile.source}"
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
maxmemory="512m"
failonerror="true"
failonwarning="true">
@@ -2204,8 +2162,8 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
encoding="UTF-8"
docencoding="UTF-8"
charset="UTF-8"
- additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
- source="${compile.source}"
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
maxmemory="512m"
failonerror="true"
failonwarning="true">
@@ -2225,8 +2183,8 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
encoding="UTF-8"
docencoding="UTF-8"
charset="UTF-8"
- additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
- source="${compile.source}"
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
maxmemory="512m"
failonerror="true"
failonwarning="true">
@@ -2246,8 +2204,8 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
encoding="UTF-8"
docencoding="UTF-8"
charset="UTF-8"
- additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
- source="${compile.source}"
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
maxmemory="512m"
failonerror="true"
failonwarning="true">
@@ -2267,8 +2225,8 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
encoding="UTF-8"
docencoding="UTF-8"
charset="UTF-8"
- additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
- source="${compile.source}"
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
maxmemory="512m"
failonerror="true"
failonwarning="true">
@@ -2307,8 +2265,8 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
encoding="UTF-8"
docencoding="UTF-8"
charset="UTF-8"
- additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
- source="${compile.source}"
+ additionalparam="-breakiterator -notimestamp -html5"
+ source="${compile.release}"
maxmemory="512m"
failonerror="true"
failonwarning="true">
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org