Merge branch 'jetty-12.0.x' into fix/jetty-12.0.x/transient-timeouts

jetty · Nov 7, 2023 · a27c26c · a27c26c
2 parents d1bc772 + b889082
commit a27c26c
Show file tree

Hide file tree

Showing 27 changed files with 350 additions and 79 deletions.
diff --git a/...documentation/src/main/asciidoc/programming-guide/maven/jetty-maven-plugin.adoc b/...documentation/src/main/asciidoc/programming-guide/maven/jetty-maven-plugin.adoc
@@ -57,13 +57,15 @@ We recommend either the traditional link:{DISTGUIDE}[distribution] deployment ap
 [[get-up-and-running]]
 ==== Get Up and Running
 
-First, add `jetty-maven-plugin` to your `pom.xml` definition:
+Since Jetty 12, Jetty Maven plugin is repackaged for corresponding Jakarta EE version with an `eeX` classifier in the groupId and artifactId. The `eeX` can be `ee8`,`ee9` or `ee10`, which stands for Jakarta EE 8, 9 and 10 respectively.
+
+First, add `jetty-ee10-maven-plugin` to your `pom.xml` definition. Here's an example of how to do that for EE10:
 
 [source,xml,subs="verbatim,attributes"]
 ----
 <plugin>
-  <groupId>org.eclipse.jetty</groupId>
-  <artifactId>jetty-maven-plugin</artifactId>
+  <groupId>org.eclipse.jetty.ee10</groupId>
+  <artifactId>jetty-ee10-maven-plugin</artifactId>
   <version>{version}</version>
 </plugin>
 ----
@@ -323,8 +325,8 @@ Here is an example, which turns on scanning for changes every ten seconds, and s
 [source,xml,subs="verbatim,attributes"]
 ----
 <plugin>
-  <groupId>org.eclipse.jetty</groupId>
-  <artifactId>jetty-maven-plugin</artifactId>
+  <groupId>org.eclipse.jetty.ee10</groupId>
+  <artifactId>jetty-ee10-maven-plugin</artifactId>
   <version>{version}</version>
   <configuration>
     <scan>10</scan>
@@ -421,8 +423,8 @@ Here is an example of a pom configuration for the plugin with the `run` goal:
   <plugins>
     ...
     <plugin>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-maven-plugin</artifactId>
+      <groupId>org.eclipse.jetty.ee10</groupId>
+      <artifactId>jetty-ee10-maven-plugin</artifactId>
       <version>{version}</version>
       <configuration>
         <webApp>
@@ -532,8 +534,8 @@ Here's an example of using the `pre-integration-test` and `post-integration-test
 [source,xml,subs="verbatim,attributes"]
 ----
 <plugin>
-  <groupId>org.eclipse.jetty</groupId>
-  <artifactId>jetty-maven-plugin</artifactId>
+  <groupId>org.eclipse.jetty.ee10</groupId>
+  <artifactId>jetty-ee10-maven-plugin</artifactId>
   <version>{version}</version>
   <configuration>
     <stopKey>foo</stopKey>
@@ -724,8 +726,8 @@ Here's a configuration example:
 [source,xml,subs="verbatim,attributes"]
 ----
 <plugin>
-  <groupId>org.eclipse.jetty</groupId>
-  <artifactId>jetty-maven-plugin</artifactId>
+  <groupId>org.eclipse.jetty.ee10</groupId>
+  <artifactId>jetty-ee10-maven-plugin</artifactId>
   <version>{version}</version>
   <configuration>
     <stopPort>9966</stopPort>
@@ -890,7 +892,7 @@ They are configured for the http://maven.apache.org/plugins/maven-war-plugin/ove
 
 Then executing jetty:run would yield the following ordering of resources: `com.acme.X.war : com.acme.Y.war: ${project.basedir}/src/main/webapp`.
 Note that the current project's resources are placed last in the ordering due to the empty <overlay/> element in the maven-war-plugin.
-You can either use that, or specify the `<baseAppFirst>false</baseAppFirst>` parameter to the jetty-maven-plugin.
+You can either use that, or specify the `<baseAppFirst>false</baseAppFirst>` parameter to the jetty-ee10-maven-plugin.
 
 Moreover, due to the `exclusions` specified above, a request for the resource ` bar.jsp` would only be satisfied from `com.acme.Y.war.`
 Similarly as `baz.jsp` is excluded, a request for it would result in a 404 error.
@@ -953,8 +955,8 @@ Here's an example of setting up the HashLoginService for a webapp:
 [source,xml,subs="verbatim,attributes"]
 ----
 <plugin>
-  <groupId>org.eclipse.jetty</groupId>
-  <artifactId>jetty-maven-plugin</artifactId>
+  <groupId>org.eclipse.jetty.ee10</groupId>
+  <artifactId>jetty-ee10-maven-plugin</artifactId>
   <version>{version}</version>
   <configuration>
     <scan>10</scan>
@@ -1007,20 +1009,20 @@ Putting the configuration in webapp A's `pom.xml`:
 [source,xml,subs="verbatim,attributes"]
 ----
 <plugin>
-  <groupId>org.eclipse.jetty</groupId>
-  <artifactId>jetty-maven-plugin</artifactId>
+  <groupId>org.eclipse.jetty.ee10</groupId>
+  <artifactId>jetty-ee10-maven-plugin</artifactId>
   <version>{version}</version>
   <configuration>
     <scan>10</scan>
     <webApp>
       <contextPath>/test</contextPath>
     </webApp>
     <contextHandlers>
-      <contextHandler implementation="org.eclipse.jetty.maven.plugin.MavenWebAppContext">
+      <contextHandler implementation="org.eclipse.jetty.ee10.maven.plugin.MavenWebAppContext">
         <war>${project.basedir}../../B.war</war>
         <contextPath>/B</contextPath>
       </contextHandler>
-      <contextHandler implementation="org.eclipse.jetty.maven.plugin.MavenWebAppContext">
+      <contextHandler implementation="org.eclipse.jetty.ee10.maven.plugin.MavenWebAppContext">
         <war>${project.basedir}../../C.war</war>
         <contextPath>/C</contextPath>
       </contextHandler>
@@ -1031,7 +1033,7 @@ Putting the configuration in webapp A's `pom.xml`:
 
 [IMPORTANT]
 ====
-If the `ContextHandler` you are deploying is a webapp, it is *essential* that you use an `org.eclipse.jetty.maven.plugin.MavenWebAppContext` instance rather than a standard `org.eclipse.jetty.ee9.webapp.WebAppContext` instance.
+If the `ContextHandler` you are deploying is a webapp, it is *essential* that you use an `org.eclipse.jetty.ee10.maven.plugin.MavenWebAppContext` instance rather than a standard `org.eclipse.jetty.ee10.webapp.WebAppContext` instance.
 Only the former will allow the webapp to function correctly in the maven environment.
 ====
 
@@ -1043,15 +1045,15 @@ Copy the `jetty.xml` file from the Jetty distribution, and then add WebAppContex
 <Ref refid="Contexts">
   <Call name="addHandler">
     <Arg>
-      <New class="org.eclipse.jetty.maven.plugin.MavenWebAppContext">
+      <New class="org.eclipse.jetty.ee10.maven.plugin.MavenWebAppContext">
         <Set name="contextPath">/B</Set>
         <Set name="war">../../B.war</Set>
       </New>
     </Arg>
   </Call>
   <Call>
     <Arg>
-      <New class="org.eclipse.jetty.maven.plugin.MavenWebAppContext">
+      <New class="org.eclipse.jetty.ee10.maven.plugin.MavenWebAppContext">
         <Set name="contextPath">/C</Set>
         <Set name="war">../../C.war</Set>
       </New>
@@ -1065,8 +1067,8 @@ Then configure the location of this `jetty.xml` file into webapp A's jetty plugi
 [source,xml,subs="verbatim,attributes"]
 ----
 <plugin>
-  <groupId>org.eclipse.jetty</groupId>
-  <artifactId>jetty-maven-plugin</artifactId>
+  <groupId>org.eclipse.jetty.ee10</groupId>
+  <artifactId>jetty-ee10-maven-plugin</artifactId>
   <version>{version}</version>
   <configuration>
     <scan>10</scan>
@@ -1127,8 +1129,8 @@ Here's an example of how to specify System properties in the POM:
 [source,xml]
 ----
 <plugin>
-  <groupId>org.eclipse.jetty</groupId>
-  <artifactId>jetty-maven-plugin</artifactId>
+  <groupId>org.eclipse.jetty.ee10</groupId>
+  <artifactId>jetty-ee10-maven-plugin</artifactId>
   <configuration>
     <systemProperties>
         <fooprop>222</fooprop>
@@ -1157,8 +1159,8 @@ This can be configured on the plugin like so:
 [source,xml]
 ----
 <plugin>
-  <groupId>org.eclipse.jetty</groupId>
-  <artifactId>jetty-maven-plugin</artifactId>
+  <groupId>org.eclipse.jetty.ee10</groupId>
+  <artifactId>jetty-ee10-maven-plugin</artifactId>
   <configuration>
     <systemPropertiesFile>${project.basedir}/mysys.props</systemPropertiesFile>
     <webApp>

diff --git a/jetty-core/jetty-session/src/test/java/org/eclipse/jetty/session/SessionHandlerTest.java b/jetty-core/jetty-session/src/test/java/org/eclipse/jetty/session/SessionHandlerTest.java
@@ -26,7 +26,6 @@
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.Session;
 import org.eclipse.jetty.util.Callback;
-import org.junit.Assert;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -39,6 +38,7 @@
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.Matchers.startsWith;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 /**
  * SessionHandlerTest
@@ -656,7 +656,7 @@ public void testUriParameterOnly() throws Exception
             response = HttpTester.parseResponse(endPoint.getResponse());
             assertThat(response.getStatus(), equalTo(200));
 
-            Assert.assertNull(response.get(HttpHeader.SET_COOKIE));
+            assertNull(response.get(HttpHeader.SET_COOKIE));
 
             String content = response.getContent();
             assertThat(content, startsWith("Session="));

diff --git a/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml b/jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml
@@ -34,6 +34,16 @@
       <groupId>com.googlecode.json-simple</groupId>
       <artifactId>json-simple</artifactId>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.hamcrest</groupId>
+          <artifactId>hamcrest-core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

diff --git a/jetty-ee10/jetty-ee10-maven-plugin/pom.xml b/jetty-ee10/jetty-ee10-maven-plugin/pom.xml
@@ -28,11 +28,6 @@
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-tools-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>maven-artifact-transfer</artifactId>
-      <version>${maven-artifact-transfer.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-xml</artifactId>

diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml
@@ -12,6 +12,8 @@
   <properties>
     <assembly-directory>target/distribution</assembly-directory>
     <bundle-symbolic-name>${project.groupId}.boot.test.osgi</bundle-symbolic-name>
+    <!-- too many duplicates with osgi jars... -->
+    <duplicate-finder.skip>true</duplicate-finder.skip>
     <maven.deploy.skip>true</maven.deploy.skip>
     <maven.javadoc.skip>true</maven.javadoc.skip>
   </properties>
@@ -415,6 +417,12 @@
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam-junit4</artifactId>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.hamcrest</groupId>
+          <artifactId>hamcrest-core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>

diff --git a/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/pom.xml b/jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/pom.xml
@@ -31,12 +31,6 @@
     <dependency>
       <groupId>org.eclipse.jetty.tests</groupId>
       <artifactId>jetty-test-session-common</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.hamcrest</groupId>
-          <artifactId>hamcrest-core</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.toolchain</groupId>

diff --git a/...e10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-infinispan/pom.xml b/...e10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-infinispan/pom.xml
@@ -76,17 +76,17 @@
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-client-hotrod</artifactId>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.wildfly.security</groupId>
+          <artifactId>wildfly-elytron</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-core</artifactId>
       <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.wildfly.common</groupId>
-          <artifactId>wildfly-common</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.infinispan</groupId>
@@ -128,6 +128,41 @@
       <artifactId>testcontainers</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.wildfly.security</groupId>
+      <artifactId>wildfly-elytron-sasl-digest</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.security</groupId>
+      <artifactId>wildfly-elytron-sasl-external</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.security</groupId>
+      <artifactId>wildfly-elytron-sasl-gs2</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.security</groupId>
+      <artifactId>wildfly-elytron-sasl-gssapi</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.security</groupId>
+      <artifactId>wildfly-elytron-sasl-oauth2</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.security</groupId>
+      <artifactId>wildfly-elytron-sasl-plain</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.security</groupId>
+      <artifactId>wildfly-elytron-sasl-scram</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

diff --git a/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml b/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml
@@ -41,6 +41,10 @@
           <groupId>javax.servlet.jsp</groupId>
           <artifactId>*</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>javax.servlet.jsp.jstl</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 

diff --git a/jetty-ee8/jetty-ee8-maven-plugin/pom.xml b/jetty-ee8/jetty-ee8-maven-plugin/pom.xml
@@ -28,11 +28,6 @@
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-tools-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>maven-artifact-transfer</artifactId>
-      <version>${maven-artifact-transfer.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-xml</artifactId>

diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/pom.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/pom.xml
@@ -15,6 +15,8 @@
     <assembly-directory>target/distribution</assembly-directory>
     <bundle-symbolic-name>${project.groupId}.boot.test.osgi</bundle-symbolic-name>
     <bundle.debug>true</bundle.debug>
+    <!-- too many duplicates with osgi jars... -->
+    <duplicate-finder.skip>true</duplicate-finder.skip>
     <ee9.module>jetty-ee9-osgi/test-jetty-ee9-osgi</ee9.module>
     <el.artifactId>apache-el</el.artifactId>
     <el.groupId>org.mortbay.jasper</el.groupId>

diff --git a/jetty-ee8/pom.xml b/jetty-ee8/pom.xml
@@ -50,7 +50,7 @@
     <javax.mail.glassfish.version>1.4.1.v201005082020</javax.mail.glassfish.version>
     <jetty.servlet.api.version>4.0.6</jetty.servlet.api.version>
     <jsp.impl.version>9.0.52</jsp.impl.version>
-    <modify-sources-plugin.version>1.0.8</modify-sources-plugin.version>
+    <modify-sources-plugin.version>1.0.9</modify-sources-plugin.version>
     <sonar.skip>true</sonar.skip>
     <weld.version>3.1.9.Final</weld.version>
 

diff --git a/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/pom.xml b/jetty-ee9/jetty-ee9-demos/jetty-ee9-demo-embedded/pom.xml
@@ -62,6 +62,12 @@
     <dependency>
       <groupId>org.eclipse.jetty.ee9</groupId>
       <artifactId>jetty-ee9-plus</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>jakarta.el</groupId>
+          <artifactId>jakarta.el-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.ee9</groupId>
@@ -85,15 +91,6 @@
       <version>${project.version}</version>
       <type>war</type>
     </dependency>
-    <!-- sounds cyclic -->
-    <!--
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-home</artifactId>
-      <type>zip</type>
-      <scope>test</scope>
-    </dependency>
-    -->
     <dependency>
       <groupId>org.eclipse.jetty.ee9.demos</groupId>
       <artifactId>jetty-ee9-demo-jndi-webapp</artifactId>