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:09:29 UTC

[tomcat] branch master updated (1cbb2ed -> 7099781)

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

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


    from 1cbb2ed  BZ63765: Try to unwrap first after handshake
     new 5444c16  Fix spacing
     new 6ee85f3  Align Java version references
     new f158418  Add Javadoc link for Servlet 4.0
     new 7cc4af6  Update link to point to Java 8 javadoc
     new 70340d1  Parameterise minimum Java version
     new 280d058  Fix xml source file that wasn't using expected version replacement
     new 7099781  Fix xml source file that wasn't using expected version replacement

The 7 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                            |  18 +++---
 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/index.xml               |   7 +--
 webapps/docs/logging.xml             |   4 +-
 webapps/docs/setup.xml               |   4 +-
 webapps/docs/tomcat-docs.xsl         |   4 ++
 15 files changed, 92 insertions(+), 84 deletions(-)


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


[tomcat] 05/07: 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 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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


[tomcat] 04/07: Update link to point to Java 8 javadoc

Posted by ma...@apache.org.
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 7cc4af6c27153b06f88257564b003af97e71d1c0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Sep 24 16:39:26 2019 +0100

    Update link to point to Java 8 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 1f546bb..b60744e 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 8 Javadoc for the
+          <a href="https://docs.oracle.com/javase/8/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] 03/07: Add Javadoc link for Servlet 4.0

Posted by ma...@apache.org.
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 f15841883b5a0fa93cbefd958f0cfbee03192ae8
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Sep 24 16:35:36 2019 +0100

    Add Javadoc link for Servlet 4.0
---
 webapps/docs/index.xml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/webapps/docs/index.xml b/webapps/docs/index.xml
index 007f607..e72c8e8 100644
--- a/webapps/docs/index.xml
+++ b/webapps/docs/index.xml
@@ -167,12 +167,9 @@ are responsible for installing, configuring, and operating an Apache Tomcat serv
       and others.</li>
 <li>Servlet 4.0
     <a href="https://jcp.org/aboutJava/communityprocess/final/jsr369/index.html">
-    <strong>Specification</strong></a>
-<!-- TODO: Link to Java EE 8 Javadoc when it becomes available. /javaee/8/ returns 404.
- and
-    <a href="http://docs.oracle.com/javaee/7/api/javax/servlet/package-summary.html">
+    <strong>Specification</strong></a> and
+    <a href="https://javaee.github.io/javaee-spec/javadocs/javax/servlet/package-summary.html">
     <strong>Javadoc</strong></a>
--->
     </li>
 <li>JSP 2.3
     <a href="https://jcp.org/aboutJava/communityprocess/mrel/jsr245/index2.html">


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


[tomcat] 07/07: 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 master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 709978183d763b27009b0d02908ae1eda50308dd
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 cd7d30e..b6d1e62 100644
--- a/webapps/docs/default-servlet.xml
+++ b/webapps/docs/default-servlet.xml
@@ -249,23 +249,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>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  version="3.0">
+&lt;xsl:stylesheet xmlns:xsl=&quot;http://www.w3.org/1999/XSL/Transform&quot;
+  version=&quot;3.0&quot;&gt;
 
-  <xsl:output method="html" html-version="5.0"
-    encoding="UTF-8" indent="no"
-    doctype-system="about:legacy-compat"/>
+  &lt;xsl:output method=&quot;html&quot; html-version=&quot;5.0&quot;
+    encoding=&quot;UTF-8&quot; indent=&quot;no&quot;
+    doctype-system=&quot;about:legacy-compat&quot;/&gt;
 
-  <xsl:template match="listing">
-   <html>
-    <head>
-      <title>
+  &lt;xsl:template match=&quot;listing&quot;&gt;
+   &lt;html&gt;
+    &lt;head&gt;
+      &lt;title&gt;
         Sample Directory Listing For
-        <xsl:value-of select="@directory"/>
-      </title>
-      <style>
+        &lt;xsl:value-of select=&quot;@directory&quot;/&gt;
+      &lt;/title&gt;
+      &lt;style&gt;
         h1 {color : white;background-color : #0086b2;}
         h3 {color : white;background-color : #0086b2;}
         body {font-family : sans-serif,Arial,Tahoma;
@@ -273,56 +273,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>
+      &lt;/style&gt;
+    &lt;/head&gt;
+    &lt;body&gt;
+      &lt;h1&gt;Sample Directory Listing For
+            &lt;xsl:value-of select=&quot;@directory&quot;/&gt;
+      &lt;/h1&gt;
+      &lt;hr style=&quot;height: 1px;&quot; /&gt;
+      &lt;table style=&quot;width: 100%;&quot;&gt;
+        &lt;tr&gt;
+          &lt;th style=&quot;text-align: left;&quot;&gt;Filename&lt;/th&gt;
+          &lt;th style=&quot;text-align: center;&quot;&gt;Size&lt;/th&gt;
+          &lt;th style=&quot;text-align: right;&quot;&gt;Last Modified&lt;/th&gt;
+        &lt;/tr&gt;
+        &lt;xsl:apply-templates select=&quot;entries&quot;/&gt;
+        &lt;/table&gt;
+      &lt;xsl:apply-templates select=&quot;readme&quot;/&gt;
+      &lt;hr style=&quot;height: 1px;&quot; /&gt;
+      &lt;h3&gt;Apache Tomcat/<version-major-minor/>&lt;/h3&gt;
+    &lt;/body&gt;
+   &lt;/html&gt;
+  &lt;/xsl:template&gt;
 
 
-  <xsl:template match="entries">
-    <xsl:apply-templates select="entry"/>
-  </xsl:template>
+  &lt;xsl:template match=&quot;entries&quot;&gt;
+    &lt;xsl:apply-templates select=&quot;entry&quot;/&gt;
+  &lt;/xsl:template&gt;
 
-  <xsl:template match="readme">
-    <hr style="height: 1px;" />
-    <pre><xsl:apply-templates/></pre>
-  </xsl:template>
+  &lt;xsl:template match=&quot;readme&quot;&gt;
+    &lt;hr style=&quot;height: 1px;&quot; /&gt;
+    &lt;pre&gt;&lt;xsl:apply-templates/&gt;&lt;/pre&gt;
+  &lt;/xsl:template&gt;
 
-  <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>
+  &lt;xsl:template match=&quot;entry&quot;&gt;
+    &lt;tr&gt;
+      &lt;td style=&quot;text-align: left;&quot;&gt;
+        &lt;xsl:variable name=&quot;urlPath&quot; select=&quot;@urlPath&quot;/&gt;
+        &lt;a href=&quot;{$urlPath}&quot;&gt;
+          &lt;pre&gt;&lt;xsl:apply-templates/&gt;&lt;/pre&gt;
+        &lt;/a&gt;
+      &lt;/td&gt;
+      &lt;td style=&quot;text-align: right;&quot;&gt;
+        &lt;pre&gt;&lt;xsl:value-of select=&quot;@size&quot;/&gt;&lt;/pre&gt;
+      &lt;/td&gt;
+      &lt;td style=&quot;text-align: right;&quot;&gt;
+        &lt;pre&gt;&lt;xsl:value-of select=&quot;@date&quot;/&gt;&lt;/pre&gt;
+      &lt;/td&gt;
+    &lt;/tr&gt;
+  &lt;/xsl:template&gt;
 
-</xsl:stylesheet>]]></source>
+&lt;/xsl:stylesheet&gt;</source>
 
 </section>
 


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


[tomcat] 01/07: Fix spacing

Posted by ma...@apache.org.
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 5444c1681d44cf8f0d28121b56682a82d10e3668
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Sep 24 16:09:29 2019 +0100

    Fix spacing
---
 build.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index 7d37c12..1f61ee4 100644
--- a/build.xml
+++ b/build.xml
@@ -1462,11 +1462,11 @@
       <exclude name="org/apache/tomcat/buildutil/**"/>
     </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/07: 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 master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 6ee85f39532e0eb2294f15c1f443c7589f1bf8aa
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Sep 24 16:14:17 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 1f61ee4..75c250a 100644
--- a/build.xml
+++ b/build.xml
@@ -90,9 +90,9 @@
   <!-- build output directory for jdbc-pool -->
   <property name="tomcat.pool"           value="${tomcat.output}/jdbc-pool"/>
 
-  <!-- Servlet 4.0 spec requires 1.8+ -->
-  <property name="compile.source" value="1.8"/>
-  <property name="compile.target" value="1.8"/>
+  <!-- Servlet 4.0 spec requires Java 8+ -->
+  <property name="compile.source" value="8"/>
+  <property name="compile.target" value="8"/>
   <property name="compile.release" value="8"/>
 
   <!-- 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


[tomcat] 06/07: 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 master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 280d0587926da86bad569a431e6ec3a50317e512
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