This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 70340d1241e0d97b821de243a83d9fbfb443deb8
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Sep 24 17:00:31 2019 +0100
Parameterise minimum Java version
---
RELEASE-NOTES | 2 +-
RUNNING.txt | 2 +-
build.xml | 2 ++
res/tomcat.nsi | 2 +-
res/welcome.bin.html | 2 +-
res/welcome.main.html | 2 +-
webapps/docs/appdev/installation.xml | 2 +-
webapps/docs/changelog.xml | 5 +++++
webapps/docs/cluster-howto.xml | 2 +-
webapps/docs/setup.xml | 4 ++--
webapps/docs/tomcat-docs.xsl | 4 ++++
11 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2377d4f..825889a 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -38,7 +38,7 @@ CONTENTS:
===================
Dependency Changes:
===================
-Tomcat @VERSION_MAJOR_MINOR@ is designed to run on Java SE 8 and later.
+Tomcat @VERSION_MAJOR_MINOR@ is designed to run on Java @MIN_JAVA_VERSION@ and
later.
==============
diff --git a/RUNNING.txt b/RUNNING.txt
index 0c6bb98..c71620b 100644
--- a/RUNNING.txt
+++ b/RUNNING.txt
@@ -157,7 +157,7 @@ create the following script file:
On Windows, %CATALINA_BASE%\bin\setenv.bat:
- set "JRE_HOME=%ProgramFiles%\Java\jre8"
+ set "JRE_HOME=%ProgramFiles%\Java\jre@MIN_JAVA_VERSION@"
exit /b 0
On *nix, $CATALINA_BASE/bin/setenv.sh:
diff --git a/build.xml b/build.xml
index 75c250a..020531c 100644
--- a/build.xml
+++ b/build.xml
@@ -94,6 +94,7 @@
<property name="compile.source" value="8"/>
<property name="compile.target" value="8"/>
<property name="compile.release" value="8"/>
+ <property name="min.java.version" value="8"/>
<!-- Locations to create the JAR artifacts -->
<!-- Standard JARs -->
@@ -240,6 +241,7 @@
<filter token="VERSION_BUILT" value="${today} ${tstamp} UTC"/>
<filter token="JDT_VERSION" value="${jdt.version}"/>
<filter token="GIT_BRANCH" value="${git.branch}"/>
+ <filter token="MIN_JAVA_VERSION" value="${min.java.version}"/>
</filterset>
<!-- Files to change line endings for depending on target platform -->
diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index 28ebd4b..5ab5f60 100644
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -132,7 +132,7 @@ Var ServiceInstallLog
LangString TEXT_CONF_SUBTITLE ${LANG_ENGLISH} "Tomcat basic configuration."
LangString TEXT_CONF_PAGETITLE ${LANG_ENGLISH} ": Configuration Options"
- LangString TEXT_JVM_LABEL1 ${LANG_ENGLISH} "Please select the path of a Java
SE 8.0 or later JRE installed on your system."
+ LangString TEXT_JVM_LABEL1 ${LANG_ENGLISH} "Please select the path of a Java
@MIN_JAVA_VERSION@ or later JRE installed on your system."
LangString TEXT_CONF_LABEL_PORT_SHUTDOWN ${LANG_ENGLISH} "Server Shutdown
Port"
LangString TEXT_CONF_LABEL_PORT_HTTP ${LANG_ENGLISH} "HTTP/1.1 Connector
Port"
LangString TEXT_CONF_LABEL_PORT_AJP ${LANG_ENGLISH} "AJP/1.3 Connector Port"
diff --git a/res/welcome.bin.html b/res/welcome.bin.html
index 7bc33dd..095c800 100644
--- a/res/welcome.bin.html
+++ b/res/welcome.bin.html
@@ -39,7 +39,7 @@ and must be untarred with a GNU compatible version of tar.
The version
of <code>tar</code> on Solaris and Mac OS X will not work with
these files.</b></p>
-<p style="color: red;">Tomcat @VERSION_MAJOR_MINOR@ requires Java SE 8 or
later. Read the
+<p style="color: red;">Tomcat @VERSION_MAJOR_MINOR@ requires Java
@MIN_JAVA_VERSION@ or later. Read the
RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
</p>
diff --git a/res/welcome.main.html b/res/welcome.main.html
index 4598b2a..ff22030 100644
--- a/res/welcome.main.html
+++ b/res/welcome.main.html
@@ -39,7 +39,7 @@ and must be untarred with a GNU compatible version of tar.
The version
of <code>tar</code> on Solaris and Mac OS X will not work with
these files.</b></p>
-<p style="color: red;">Tomcat @VERSION_MAJOR_MINOR@ requires Java SE 8 or
later. Read the
+<p style="color: red;">Tomcat @VERSION_MAJOR_MINOR@ requires Java
@MIN_JAVA_VERSION@ or later. Read the
RELEASE-NOTES and the RUNNING.txt file in the distribution for more details.
</p>
diff --git a/webapps/docs/appdev/installation.xml
b/webapps/docs/appdev/installation.xml
index 42aaee3..dd40ff5 100644
--- a/webapps/docs/appdev/installation.xml
+++ b/webapps/docs/appdev/installation.xml
@@ -39,7 +39,7 @@ in the following subsections.</p>
<subsection name="JDK">
-<p>Tomcat <version-major-minor/> was designed to run on Java SE 8 or later.
+<p>Tomcat <version-major-minor/> was designed to run on Java SE
<min-java-version/> or later.
</p>
<p>Compatible JDKs for many platforms (or links to where they can be found)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index aea333c..bd501d2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -90,6 +90,11 @@
grant sufficient privileges to enable the uninstaller to execute when
user account control is active. (markt)
</fix>
+ <add>
+ Use a build property to define the minimum supported Java version and
+ use that build property to reduce the number of edits required to
update
+ the minimum supported Java version. (markt)
+ </add>
</changelog>
</subsection>
</section>
diff --git a/webapps/docs/cluster-howto.xml b/webapps/docs/cluster-howto.xml
index a385e40..cfbfc2f 100644
--- a/webapps/docs/cluster-howto.xml
+++ b/webapps/docs/cluster-howto.xml
@@ -626,7 +626,7 @@ should be completed:</p>
<section name="Monitoring your Cluster with JMX">
<p>Monitoring is a very important question when you use a cluster. Some of the
cluster objects are JMX MBeans </p>
-<p>Add the following parameter to your startup script with Java 5:</p>
+<p>Add the following parameter to your startup script:</p>
<source>set CATALINA_OPTS=\
-Dcom.sun.management.jmxremote \
-Dcom.sun.management.jmxremote.port=%my.jmx.port% \
diff --git a/webapps/docs/setup.xml b/webapps/docs/setup.xml
index b4c4b99..6047dcc 100644
--- a/webapps/docs/setup.xml
+++ b/webapps/docs/setup.xml
@@ -61,12 +61,12 @@
administration tool and its documentation).</li>
<li><strong>Java location</strong>: The installer will provide a
default
JRE to use to run the service. The installer uses the registry to
- determine the base path of a Java 8 or later JRE, including the JRE
+ determine the base path of a Java <min-java-version/> or later
JRE, including the JRE
installed as part of the full JDK. When running on a 64-bit
operating system, the installer will first look for a 64-bit JRE
and
only look for a 32-bit JRE if a 64-bit JRE is not found. It is not
mandatory to use the default JRE detected by the installer. Any
- installed Java 8 or later JRE (32-bit or 64-bit) may be used.</li>
+ installed Java <min-java-version/> or later JRE (32-bit or 64-bit)
may be used.</li>
<li><strong>Tray icon</strong>: When Tomcat is run as a service, there
will not be any tray icon present when Tomcat is running. Note that
when choosing to run Tomcat at the end of installation, the tray
diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
index 193646d..e507780 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -40,6 +40,7 @@
<xsl:param name="version" select="'9.0.x'"/>
<xsl:param name="majorversion" select="'9'"/>
<xsl:param name="majorminorversion" select="'9.0'"/>
+ <xsl:param name="minjavaversion" select="'8'"/>
<xsl:param name="build-date" select="'MMM d yyyy'"/>
<xsl:param name="build-date-iso-8601" select="'yyyy-MM-dd'"/>
<xsl:param name="year" select="'yyyy'"/>
@@ -503,6 +504,9 @@
<xsl:template match="version-major">
<xsl:value-of select="$majorversion"/>
</xsl:template>
+ <xsl:template match="min-java-version">
+ <xsl:value-of select="$minjavaversion"/>
+ </xsl:template>
<!-- Process everything else by just passing it through -->
<xsl:template match="*|@*">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
