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/10/12 14:24:37 UTC
[tomcat] branch master updated (d6e5d83 -> 97dad11)
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 d6e5d83 Added Javadoc comments for Java 15
new 0dc0d7e Update import rules to catch issues like BZ 64805
new 97dad11 Fix BZ 84805 Correct imports
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/manager/JMXProxyServlet.java | 2 +-
res/checkstyle/org-import-control.xml | 4 ++--
webapps/docs/changelog.xml | 4 ++++
3 files changed, 7 insertions(+), 3 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Update import rules to catch issues like BZ 64805
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 0dc0d7ed43d55aaa2766353844688df0075cccb8
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Oct 12 15:21:18 2020 +0100
Update import rules to catch issues like BZ 64805
https://bz.apache.org/bugzilla/show_bug.cgi?id=64805
---
res/checkstyle/org-import-control.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/res/checkstyle/org-import-control.xml b/res/checkstyle/org-import-control.xml
index a67ffa2..4d51160 100644
--- a/res/checkstyle/org-import-control.xml
+++ b/res/checkstyle/org-import-control.xml
@@ -44,9 +44,9 @@
<allow pkg="jakarta.persistence"/>
<allow pkg="jakarta.servlet"/>
<allow pkg="jakarta.xml.ws"/>
+ <disallow pkg="org\.apache\.catalina\.ha.*" regex="true"/>
+ <disallow pkg="org\.apache\.catalina\.tribes.*" regex="true"/>
<allow pkg="org.apache.catalina"/>
- <disallow pkg="org.apache.catalina.ha"/>
- <disallow pkg="org.apache.catalina.tribes"/>
<allow pkg="org.apache.coyote"/>
<allow pkg="org.apache.juli"/>
<allow pkg="org.apache.naming"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Fix BZ 84805 Correct imports
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 97dad1177cfa09aeff60c5b9e2eb021b42c5fd25
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Oct 12 15:22:16 2020 +0100
Fix BZ 84805 Correct imports
https://bz.apache.org/bugzilla/show_bug.cgi?id=64805
---
java/org/apache/catalina/manager/JMXProxyServlet.java | 2 +-
webapps/docs/changelog.xml | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/manager/JMXProxyServlet.java b/java/org/apache/catalina/manager/JMXProxyServlet.java
index fa862c5..a3a8898 100644
--- a/java/org/apache/catalina/manager/JMXProxyServlet.java
+++ b/java/org/apache/catalina/manager/JMXProxyServlet.java
@@ -38,8 +38,8 @@ import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.apache.catalina.mbeans.MBeanDumper;
-import org.apache.catalina.tribes.util.StringManager;
import org.apache.tomcat.util.modeler.Registry;
+import org.apache.tomcat.util.res.StringManager;
/**
* This servlet will dump JMX attributes in a simple format and implement proxy
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 55b5251..d935750 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -54,6 +54,10 @@
context. This option is only useful when the Realm is defined on the
Context. (markt)
</fix>
+ <fix>
+ <bug>64805</bug>: Correct imports used by <code>JMXPorxyServlet</code>.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subseciton name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org