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 2020/01/15 16:37:58 UTC

[tomcat] branch master updated (973b0a3 -> cd5a2ed)

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 973b0a3  Remove support for deprecated TLS configuration style
     new fcfa634  Version updates spotted reviewing master/9.0.x/8.5.x diff
     new cd5a2ed  Align master, 9.0.x and 8.5.x

The 2 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:
 java/org/apache/catalina/ant/ServerinfoTask.java | 3 ---
 java/org/apache/catalina/ant/jmx/package.html    | 4 ++--
 java/org/apache/catalina/ant/package.html        | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)


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


[tomcat] 01/02: Version updates spotted reviewing master/9.0.x/8.5.x diff

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 fcfa634484dc212db000669d107942fa915ad34f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 15 16:36:58 2020 +0000

    Version updates spotted reviewing master/9.0.x/8.5.x diff
---
 java/org/apache/catalina/ant/jmx/package.html | 4 ++--
 java/org/apache/catalina/ant/package.html     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/ant/jmx/package.html b/java/org/apache/catalina/ant/jmx/package.html
index 6a49fc4..2bfaa85 100644
--- a/java/org/apache/catalina/ant/jmx/package.html
+++ b/java/org/apache/catalina/ant/jmx/package.html
@@ -20,8 +20,8 @@
 <em>Ant (version 1.6 or later)</em> that can be used to interact with the
 Remote JMX JSR 160 RMI Adaptor to get/set attributes, invoke MBean operations
 and query for Mbeans inside a running instance of Tomcat.  For more information, see
-<a href="https://tomcat.apache.org/tomcat-9.0-doc/monitoring.html">
-https://tomcat.apache.org/tomcat-9.0-doc/monitoring.html</a>.</p>
+<a href="https://tomcat.apache.org/tomcat-10.0-doc/monitoring.html">
+https://tomcat.apache.org/tomcat-10.0-doc/monitoring.html</a>.</p>
 
 <p>Each task element can open a new jmx connection or reference an
 existing one. The following attribute are exists in every tasks:</p>
diff --git a/java/org/apache/catalina/ant/package.html b/java/org/apache/catalina/ant/package.html
index 5b816ad..ba06ae0 100644
--- a/java/org/apache/catalina/ant/package.html
+++ b/java/org/apache/catalina/ant/package.html
@@ -20,8 +20,8 @@
 <em>Ant (version 1.6.x or later)</em> that can be used to interact with the
 Manager application to deploy, undeploy, list, reload, start and stop web applications
 from a running instance of Tomcat.  For more information, see
-<a href="https://tomcat.apache.org/tomcat-9.0-doc/manager-howto.html">
-https://tomcat.apache.org/tomcat-9.0-doc/manager-howto.html</a>.</p>
+<a href="https://tomcat.apache.org/tomcat-10.0-doc/manager-howto.html">
+https://tomcat.apache.org/tomcat-10.0-doc/manager-howto.html</a>.</p>
 
 <p>The attributes of each task element correspond
 exactly to the request parameters that are included with an HTTP request


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


[tomcat] 02/02: Align master, 9.0.x and 8.5.x

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 cd5a2ed796271df34a946d3a79187820f9e80602
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 15 16:37:17 2020 +0000

    Align master, 9.0.x and 8.5.x
---
 java/org/apache/catalina/ant/ServerinfoTask.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/java/org/apache/catalina/ant/ServerinfoTask.java b/java/org/apache/catalina/ant/ServerinfoTask.java
index e6605e0..f8c2ced 100644
--- a/java/org/apache/catalina/ant/ServerinfoTask.java
+++ b/java/org/apache/catalina/ant/ServerinfoTask.java
@@ -14,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.catalina.ant;
 
 
@@ -44,5 +42,4 @@ public class ServerinfoTask extends AbstractCatalinaTask {
         execute("/serverinfo");
 
     }
-
 }


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