Post merge
Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/examples/servlet3-webapp/pom.xml b/examples/servlet3-webapp/pom.xml
index 51b85c2..8693516 100644
--- a/examples/servlet3-webapp/pom.xml
+++ b/examples/servlet3-webapp/pom.xml
@@ -112,15 +112,6 @@
<profiles>
<profile>
- <id>jdk8_tests</id>
- <activation>
- <jdk>1.8</jdk>
- </activation>
- <properties>
- <junit5.version>${junit5.jdk8.version}</junit5.version>
- </properties>
- </profile>
- <profile>
<id>pre-release</id>
<build>
<plugins>
diff --git a/pom.xml b/pom.xml
index 8413b89..b3ed8d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2099,7 +2099,7 @@
<buildhelper.mvn.plugin.version>3.6.0</buildhelper.mvn.plugin.version>
<buildnumber.mvn.plugin.version>3.2.1</buildnumber.mvn.plugin.version>
<checkstyle.mvn.plugin.version>3.6.0</checkstyle.mvn.plugin.version>
- <checkstyle.version>10.23.1</checkstyle.version>
+ <checkstyle.version>10.21.4</checkstyle.version>
<compiler.mvn.plugin.version>3.14.0</compiler.mvn.plugin.version>
<!--
Special version of the compiler plugin just for the jersey-common. All versions above
diff --git a/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/SimilarInputStreamTest.java b/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/SimilarInputStreamTest.java
index 58e180c..8e8b5d4 100644
--- a/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/SimilarInputStreamTest.java
+++ b/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/SimilarInputStreamTest.java
@@ -18,8 +18,8 @@
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.glassfish.jersey.client.ClientConfig;
import org.glassfish.jersey.internal.InternalProperties;
import org.glassfish.jersey.jackson.JacksonFeature;
