This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push: new 34dccfd345 Fix Checkstyle import order warnings 34dccfd345 is described below commit 34dccfd345b3205f765dabaa912989a70f7b28d8 Author: Mark Thomas <ma...@apache.org> AuthorDate: Thu Aug 25 14:44:07 2022 +0100 Fix Checkstyle import order warnings --- test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java | 2 +- test/org/apache/catalina/valves/TestErrorReportValve.java | 2 +- test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java | 2 +- test/org/apache/coyote/http2/TestFlowControl.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java b/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java index 3fa7e4839c..37701b576b 100644 --- a/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java +++ b/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java @@ -16,7 +16,6 @@ */ package org.apache.catalina.tribes.group; -import org.apache.tomcat.util.res.StringManager; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -25,6 +24,7 @@ import org.junit.Test; import org.apache.catalina.tribes.Channel; import org.apache.catalina.tribes.ChannelException; import org.apache.catalina.tribes.ChannelInterceptor; +import org.apache.tomcat.util.res.StringManager; public class TestGroupChannelOptionFlag { private final StringManager sm = StringManager.getManager(TestGroupChannelOptionFlag.class); diff --git a/test/org/apache/catalina/valves/TestErrorReportValve.java b/test/org/apache/catalina/valves/TestErrorReportValve.java index cee135304f..979d57a4da 100644 --- a/test/org/apache/catalina/valves/TestErrorReportValve.java +++ b/test/org/apache/catalina/valves/TestErrorReportValve.java @@ -28,7 +28,6 @@ import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.apache.tomcat.util.res.StringManager; import org.junit.Assert; import org.junit.Test; @@ -38,6 +37,7 @@ import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; import org.apache.tomcat.util.descriptor.web.ErrorPage; +import org.apache.tomcat.util.res.StringManager; public class TestErrorReportValve extends TomcatBaseTest { diff --git a/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java b/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java index 5096cfafd8..c43f32f033 100644 --- a/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java +++ b/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java @@ -32,7 +32,6 @@ import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.apache.tomcat.util.res.StringManager; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -41,6 +40,7 @@ import org.apache.catalina.Context; import org.apache.catalina.connector.Connector; import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.TomcatBaseTest; +import org.apache.tomcat.util.res.StringManager; public class TestAbstractAjpProcessor extends TomcatBaseTest { diff --git a/test/org/apache/coyote/http2/TestFlowControl.java b/test/org/apache/coyote/http2/TestFlowControl.java index 4ea1a074d5..9093a8e924 100644 --- a/test/org/apache/coyote/http2/TestFlowControl.java +++ b/test/org/apache/coyote/http2/TestFlowControl.java @@ -21,11 +21,11 @@ import java.nio.ByteBuffer; import java.util.logging.Level; import java.util.logging.LogManager; -import org.apache.tomcat.util.res.StringManager; import org.junit.Assert; import org.junit.Test; import org.apache.tomcat.util.http.MimeHeaders; +import org.apache.tomcat.util.res.StringManager; public class TestFlowControl extends Http2TestBase { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org