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:28:12 UTC
[tomcat] branch 8.5.x updated (c085c48 -> 640dea1)
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 c085c48 Use SVG logo for a more modern and consistent look
new 7321ab0 Add release date for 8.5.59
new 9df3d4d Fix BZ 84805 Correct imports
new 640dea1 Update import rules to catch issues like BZ 64805
The 3 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 | 6 +++++-
3 files changed, 8 insertions(+), 4 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/03: 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 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 9df3d4dcd11a78045aea319405b86513f7bcfa1c
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 d6eeb70..d64087f 100644
--- a/java/org/apache/catalina/manager/JMXProxyServlet.java
+++ b/java/org/apache/catalina/manager/JMXProxyServlet.java
@@ -37,8 +37,8 @@ import javax.servlet.http.HttpServletRequest;
import javax.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 e9afa82..ea25154 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -57,6 +57,10 @@
<update>
Add connection pooling to JNDI realm. (remm)
</update>
+ <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
[tomcat] 03/03: 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 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 640dea16d769617605eb47b4f5e71064c89b36e7
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 3a3dde0..8723aec 100644
--- a/res/checkstyle/org-import-control.xml
+++ b/res/checkstyle/org-import-control.xml
@@ -40,9 +40,9 @@
<allow pkg="javax.ejb"/>
<allow pkg="javax.persistence"/>
<allow pkg="javax.servlet"/>
+ <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] 01/03: Add release date for 8.5.59
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 7321ab06fc45c47fe4fb314dc58b1023d51c1409
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Oct 9 18:54:06 2020 +0100
Add release date for 8.5.59
---
webapps/docs/changelog.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ce0a2f0..e9afa82 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -86,7 +86,7 @@
</changelog>
</subsection>
</section>
-<section name="Tomcat 8.5.59 (markt)" rtext="release in progress">
+<section name="Tomcat 8.5.59 (markt)" rtext="2020-10-09">
<subsection name="Catalina">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org