You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/09/24 16:19:43 UTC
[tomcat] branch 8.5.x updated (da37f36 -> 39bcbd0)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from da37f36 https://bz.apache.org/bugzilla/show_bug.cgi?id=63759 Uninstaller & UAC
new 4e984dc Polish. Align spacing, remove svn (and cvs!) references
new c24a6ae Align Java version references
new c8ddc6f Update link to point to Java 7 javadoc
new ce4f6b7 Parameterise minimum Java version
new c9f3362 Fix xml source file that wasn't using expected version replacement
new 39bcbd0 Fix xml source file that wasn't using expected version replacement
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
RELEASE-NOTES | 2 +-
RUNNING.txt | 2 +-
build.xml | 36 +++++------
res/tomcat.nsi | 2 +-
res/welcome.bin.html | 2 +-
res/welcome.main.html | 2 +-
webapps/docs/appdev/installation.xml | 2 +-
webapps/docs/appdev/processes.xml | 4 +-
webapps/docs/changelog.xml | 5 ++
webapps/docs/cluster-howto.xml | 2 +-
webapps/docs/default-servlet.xml | 116 +++++++++++++++++------------------
webapps/docs/logging.xml | 4 +-
webapps/docs/setup.xml | 4 +-
webapps/docs/tomcat-docs.xsl | 4 ++
14 files changed, 97 insertions(+), 90 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 06/06: Fix xml source file that wasn't using expected
version replacement
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 39bcbd0c5474f73ad0110aa0de6246493495c1c1
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Sep 24 17:07:55 2019 +0100
Fix xml source file that wasn't using expected version replacement
Source block is xml so need to xml escape so we can remove the CDATA
allowing the version replacement to work.
---
webapps/docs/default-servlet.xml | 116 +++++++++++++++++++--------------------
1 file changed, 58 insertions(+), 58 deletions(-)
diff --git a/webapps/docs/default-servlet.xml b/webapps/docs/default-servlet.xml
index d849618..ef01b8f 100644
--- a/webapps/docs/default-servlet.xml
+++ b/webapps/docs/default-servlet.xml
@@ -229,23 +229,23 @@ Format:
<p>
The following is a sample xsl file which mimics the default tomcat behavior:
</p>
-<source><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<source><?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="3.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="3.0">
- <xsl:output method="html" html-version="5.0"
- encoding="UTF-8" indent="no"
- doctype-system="about:legacy-compat"/>
+ <xsl:output method="html" html-version="5.0"
+ encoding="UTF-8" indent="no"
+ doctype-system="about:legacy-compat"/>
- <xsl:template match="listing">
- <html>
- <head>
- <title>
+ <xsl:template match="listing">
+ <html>
+ <head>
+ <title>
Sample Directory Listing For
- <xsl:value-of select="@directory"/>
- </title>
- <style>
+ <xsl:value-of select="@directory"/>
+ </title>
+ <style>
h1 {color : white;background-color : #0086b2;}
h3 {color : white;background-color : #0086b2;}
body {font-family : sans-serif,Arial,Tahoma;
@@ -253,56 +253,56 @@ Format:
b {color : white;background-color : #0086b2;}
a {color : black;} HR{color : #0086b2;}
table td { padding: 5px; }
- </style>
- </head>
- <body>
- <h1>Sample Directory Listing For
- <xsl:value-of select="@directory"/>
- </h1>
- <hr style="height: 1px;" />
- <table style="width: 100%;">
- <tr>
- <th style="text-align: left;">Filename</th>
- <th style="text-align: center;">Size</th>
- <th style="text-align: right;">Last Modified</th>
- </tr>
- <xsl:apply-templates select="entries"/>
- </table>
- <xsl:apply-templates select="readme"/>
- <hr style="height: 1px;" />
- <h3>Apache Tomcat/<version-major-minor/></h3>
- </body>
- </html>
- </xsl:template>
+ </style>
+ </head>
+ <body>
+ <h1>Sample Directory Listing For
+ <xsl:value-of select="@directory"/>
+ </h1>
+ <hr style="height: 1px;" />
+ <table style="width: 100%;">
+ <tr>
+ <th style="text-align: left;">Filename</th>
+ <th style="text-align: center;">Size</th>
+ <th style="text-align: right;">Last Modified</th>
+ </tr>
+ <xsl:apply-templates select="entries"/>
+ </table>
+ <xsl:apply-templates select="readme"/>
+ <hr style="height: 1px;" />
+ <h3>Apache Tomcat/<version-major-minor/></h3>
+ </body>
+ </html>
+ </xsl:template>
- <xsl:template match="entries">
- <xsl:apply-templates select="entry"/>
- </xsl:template>
+ <xsl:template match="entries">
+ <xsl:apply-templates select="entry"/>
+ </xsl:template>
- <xsl:template match="readme">
- <hr style="height: 1px;" />
- <pre><xsl:apply-templates/></pre>
- </xsl:template>
+ <xsl:template match="readme">
+ <hr style="height: 1px;" />
+ <pre><xsl:apply-templates/></pre>
+ </xsl:template>
- <xsl:template match="entry">
- <tr>
- <td style="text-align: left;">
- <xsl:variable name="urlPath" select="@urlPath"/>
- <a href="{$urlPath}">
- <pre><xsl:apply-templates/></pre>
- </a>
- </td>
- <td style="text-align: right;">
- <pre><xsl:value-of select="@size"/></pre>
- </td>
- <td style="text-align: right;">
- <pre><xsl:value-of select="@date"/></pre>
- </td>
- </tr>
- </xsl:template>
+ <xsl:template match="entry">
+ <tr>
+ <td style="text-align: left;">
+ <xsl:variable name="urlPath" select="@urlPath"/>
+ <a href="{$urlPath}">
+ <pre><xsl:apply-templates/></pre>
+ </a>
+ </td>
+ <td style="text-align: right;">
+ <pre><xsl:value-of select="@size"/></pre>
+ </td>
+ <td style="text-align: right;">
+ <pre><xsl:value-of select="@date"/></pre>
+ </td>
+ </tr>
+ </xsl:template>
-</xsl:stylesheet>]]></source>
+</xsl:stylesheet></source>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/06: Update link to point to Java 7 javadoc
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c8ddc6fb484d572cf879adf5ca540901e0b8fb50
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Sep 24 17:11:19 2019 +0100
Update link to point to Java 7 javadoc
---
webapps/docs/logging.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/webapps/docs/logging.xml b/webapps/docs/logging.xml
index 95ab76d..33ea117 100644
--- a/webapps/docs/logging.xml
+++ b/webapps/docs/logging.xml
@@ -398,8 +398,8 @@ java.util.logging.ConsoleHandler.formatter = java.util.logging.OneLineFormatter]
<a href="api/org/apache/juli/package-summary.html"><code>org.apache.juli</code></a>
package.
</li>
- <li>Oracle Java 6 Javadoc for the
- <a href="http://docs.oracle.com/javase/6/docs/api/java/util/logging/package-summary.html"><code>java.util.logging</code></a>
+ <li>Oracle Java 7 Javadoc for the
+ <a href="https://docs.oracle.com/javase/7/docs/api/java/util/logging/package-summary.html"><code>java.util.logging</code></a>
package.
</li>
</ul>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 04/06: Parameterise minimum Java version
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit ce4f6b7ff017bb841b782522147a9cbb05b81fd3
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 d9cc4af..0a36824 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 7 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 c7f59b9..b34e1c7 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\jre7"
+ 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 74e807f..c274aab 100644
--- a/build.xml
+++ b/build.xml
@@ -88,6 +88,7 @@
<property name="compile.source" value="7"/>
<property name="compile.target" value="7"/>
<property name="compile.release" value="7"/>
+ <property name="min.java.version" value="7"/>
<!-- Locations to create the JAR artifacts -->
<!-- Standard JARs -->
@@ -247,6 +248,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 d6255b4..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 7.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 19c7f09..64df248 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 7 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 9ce29f2..c4c2a34 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 7 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 c1925e8..01d032a 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 7 or later.
+<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 b0a824d..2b5f84a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -83,6 +83,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 cd4e88b..cce6726 100644
--- a/webapps/docs/cluster-howto.xml
+++ b/webapps/docs/cluster-howto.xml
@@ -614,7 +614,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 f4b94fc..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 7 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 7 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 6bba1c0..55f27c4 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -40,6 +40,7 @@
<xsl:param name="version" select="'8.5.x'"/>
<xsl:param name="majorversion" select="'8'"/>
<xsl:param name="majorminorversion" select="'8.5'"/>
+ <xsl:param name="minjavaversion" select="'7'"/>
<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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 05/06: Fix xml source file that wasn't using expected
version replacement
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c9f33626a59d4d6bdd9ae0578904c3988b4c787f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Sep 24 17:07:18 2019 +0100
Fix xml source file that wasn't using expected version replacement
No special characters used in the source block so just remove the CDATA
---
webapps/docs/appdev/processes.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/webapps/docs/appdev/processes.xml b/webapps/docs/appdev/processes.xml
index 6138b42..276e868 100644
--- a/webapps/docs/appdev/processes.xml
+++ b/webapps/docs/appdev/processes.xml
@@ -126,7 +126,7 @@ the sample <code>build.xml</code> script. At a minimum, you will generally
need to define the <code>catalina.home</code> property defining where
Tomcat is installed, and the manager application username and password.
You might end up with something like this:</p>
-<source><![CDATA[# Context path to install this application on
+<source># Context path to install this application on
app.path=/hello
# Tomcat installation directory
@@ -134,7 +134,7 @@ catalina.home=/usr/local/apache-tomcat-<version-major-minor/>
# Manager webapp username and password
manager.username=myusername
-manager.password=mypassword]]></source>
+manager.password=mypassword</source>
<p>In general, you will <strong>not</strong> want to check the
<code>build.properties</code> file in to the CVS repository, because it
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/06: Polish. Align spacing,
remove svn (and cvs!) references
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 4e984dc3ab1d4667707bedd667eaa30927e69eda
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Sep 24 16:10:25 2019 +0100
Polish. Align spacing, remove svn (and cvs!) references
---
build.xml | 28 ++++++++++++----------------
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/build.xml b/build.xml
index 63d7989..cfc2586 100644
--- a/build.xml
+++ b/build.xml
@@ -42,17 +42,17 @@
<property name="version.major.minor" value="${version.major}.${version.minor}" />
<!-- constant to declare a file binary for md5sum -->
- <property name="md5sum.binary-prefix" value=" *" />
+ <property name="md5sum.binary-prefix" value=" *" />
<!-- Exact spec versions (for the manifests) -->
- <property name="servlet.revision" value="FR" />
- <property name="jsp.revision" value="FR" />
- <property name="el.revision" value="FR" />
- <property name="websocket.revision" value="FR" />
+ <property name="servlet.revision" value="FR" />
+ <property name="jsp.revision" value="FR" />
+ <property name="el.revision" value="FR" />
+ <property name="websocket.revision" value="FR" />
<!-- MR B but this was first 1.1 release so use FR -->
- <property name="jaspic.revision" value="FR" />
+ <property name="jaspic.revision" value="FR" />
<!-- MR 2 but this was first 1.2 release so use FR -->
- <property name="annotation.revision" value="FR" />
+ <property name="annotation.revision" value="FR" />
<!-- Release artifact base names -->
<property name="final.name" value="${project}-${version}" />
@@ -624,7 +624,6 @@
source="${compile.source}"
target="${compile.target}"
release="${compile.release}"
- excludes="**/.svn/**"
encoding="ISO-8859-1"
includeAntRuntime="true" >
<!-- Uncomment this to show unchecked warnings:
@@ -680,7 +679,6 @@
source="${compile.source}"
target="${compile.target}"
release="${compile.release}"
- excludes="**/.svn/**"
encoding="ISO-8859-1"
includeAntRuntime="true" >
<!-- Uncomment this to show unchecked warnings:
@@ -1151,7 +1149,6 @@
target="${compile.target}"
release="${compile.release}"
classpath="${tomcat.classes}"
- excludes="**/CVS/**,**/.svn/**"
encoding="ISO-8859-1"
includeantruntime="false">
</javac>
@@ -1164,7 +1161,6 @@
target="${compile.target}"
release="${compile.release}"
classpath="${tomcat.classes}"
- excludes="**/CVS/**,**/.svn/**"
encoding="ISO-8859-1"
includeantruntime="false">
</javac>
@@ -1405,11 +1401,11 @@
<include name="util/**" />
</javac>
<copy todir="${test.classes}">
- <fileset dir="test">
- <include name="META-INF/**"/>
- <include name="**/service-config.txt"/>
- <include name="**/logging-non-rotatable.properties"/>
- </fileset>
+ <fileset dir="test">
+ <include name="META-INF/**"/>
+ <include name="**/service-config.txt"/>
+ <include name="**/logging-non-rotatable.properties"/>
+ </fileset>
</copy>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/06: Align Java version references
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c24a6aeb1e35f02cc486ff16beff68aa2d3de7ba
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Sep 24 16:14:25 2019 +0100
Align Java version references
---
build.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/build.xml b/build.xml
index cfc2586..74e807f 100644
--- a/build.xml
+++ b/build.xml
@@ -84,9 +84,9 @@
<!-- build output directory for jdbc-pool -->
<property name="tomcat.pool" value="${tomcat.output}/jdbc-pool"/>
- <!-- Servlet 3.1 spec requires 1.7+ -->
- <property name="compile.source" value="1.7"/>
- <property name="compile.target" value="1.7"/>
+ <!-- Servlet 3.1 spec requires Java 7+ -->
+ <property name="compile.source" value="7"/>
+ <property name="compile.target" value="7"/>
<property name="compile.release" value="7"/>
<!-- Locations to create the JAR artifacts -->
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org