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
commit dd0cc250e4b2f671e9e4aecf7d56a6bce45b77a0
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 | 4 ++--
res/welcome.main.html | 4 ++--
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, 22 insertions(+), 11 deletions(-)
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7024160..ebf045c 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -41,7 +41,7 @@ CONTENTS:
===================
Dependency Changes:
===================
-Tomcat @VERSION_MAJOR_MINOR@ is designed to run on Java SE 6 and later.
+Tomcat @VERSION_MAJOR_MINOR@ is designed to run on Java @MIN_JAVA_VERSION@ and
later.
In addition, Tomcat @VERSION_MAJOR_MINOR@ uses the Eclipse JDT Java compiler
for
compiling JSP pages. This means you no longer need to have the complete
diff --git a/RUNNING.txt b/RUNNING.txt
index b50a0e2..b74ab6a 100644
--- a/RUNNING.txt
+++ b/RUNNING.txt
@@ -172,7 +172,7 @@ create the following script file:
On Windows, %CATALINA_BASE%\bin\setenv.bat:
- set "JRE_HOME=%ProgramFiles%\Java\jre6"
+ 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 0cfed2c..0b2b8d2 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="min.java.version" value="6"/>
<!-- Expose commons-logging defaults so they can be orver-ridden -->
<property name="logging.compile.source" value="1.2" />
@@ -249,6 +250,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 f2c9077..b8d1a5b 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 6.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 214bb06..4e354b5 100644
--- a/res/welcome.bin.html
+++ b/res/welcome.bin.html
@@ -34,9 +34,9 @@ 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><font color="red">Tomcat @VERSION_MAJOR_MINOR@ requires Java SE 6 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.
-</font></p>
+</p>
<h4>Packaging Details (or "What Should I Download?")</h4>
<dl>
diff --git a/res/welcome.main.html b/res/welcome.main.html
index 0ab79da..b4cfecf 100644
--- a/res/welcome.main.html
+++ b/res/welcome.main.html
@@ -34,9 +34,9 @@ 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><font color="red">Tomcat @VERSION_MAJOR_MINOR@ requires Java SE 6 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.
-</font></p>
+</p>
<h4>Packaging Details (or "What Should I Download?")</h4>
<dl>
diff --git a/webapps/docs/appdev/installation.xml
b/webapps/docs/appdev/installation.xml
index 8ac111d..c2fd470 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 7.0 was designed to run on Java SE 6.
+<p>Tomcat <version-major-minor/> was designed to run on Java
<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 a352705..6d6812e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -279,6 +279,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 45192c2..a7653cd 100644
--- a/webapps/docs/cluster-howto.xml
+++ b/webapps/docs/cluster-howto.xml
@@ -611,7 +611,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 5182fb5..f0f52d1 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 6 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 6 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 37865e5..8dfdea7 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -38,6 +38,7 @@
<xsl:param name="version" select="'7.0.x'"/>
<xsl:param name="majorversion" select="'7'"/>
<xsl:param name="majorminorversion" select="'7.0'"/>
+ <xsl:param name="minjavaversion" select="'6'"/>
<xsl:param name="build-date" select="'MMM d yyyy'"/>
<xsl:param name="year" select="'yyyy'"/>
<xsl:param name="void-image" select="'/images/void.gif'"/>
@@ -619,6 +620,9 @@ p.notice {
<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>
<!-- specially process td tags ala site.vsl -->
<xsl:template match="table[@class='detail-table']/tr/td">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
