Update Jetty version

flowable · Nov 19, 2024 · 0dedbf2 · 0dedbf2
1 parent d855a15
commit 0dedbf2
Show file tree

Hide file tree

Showing 13 changed files with 53 additions and 53 deletions.
diff --git a/modules/flowable-app-engine-rest/pom.xml b/modules/flowable-app-engine-rest/pom.xml
@@ -17,7 +17,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jetty.version>11.0.16</jetty.version>
+        <jetty.version>12.0.15</jetty.version>
         <flowable.artifact>
             org.flowable.app.rest
         </flowable.artifact>
@@ -204,10 +204,10 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlet</artifactId>
-            <version>${jetty.version}</version>
-            <scope>test</scope>
+	       <groupId>org.eclipse.jetty.ee10</groupId>
+	       <artifactId>jetty-ee10-servlet</artifactId>
+	       <version>${jetty.version}</version>
+	       <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
@@ -216,8 +216,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-webapp</artifactId>
+            <groupId>org.eclipse.jetty.ee10</groupId>
+            <artifactId>jetty-ee10-webapp</artifactId>
             <version>${jetty.version}</version>
             <scope>test</scope>
         </dependency>

diff --git a/...les/flowable-app-engine-rest/src/test/java/org/flowable/app/rest/util/TestServerUtil.java b/...les/flowable-app-engine-rest/src/test/java/org/flowable/app/rest/util/TestServerUtil.java
@@ -15,8 +15,8 @@
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.flowable.app.rest.WebConfigurer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/modules/flowable-cmmn-rest/pom.xml b/modules/flowable-cmmn-rest/pom.xml
@@ -15,7 +15,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jetty.version>11.0.16</jetty.version>
+    <jetty.version>12.0.15</jetty.version>
     <flowable.artifact>
       org.flowable.cmmn.rest
     </flowable.artifact>
@@ -187,8 +187,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
+      <groupId>org.eclipse.jetty.ee10</groupId>
+      <artifactId>jetty-ee10-servlet</artifactId>
       <version>${jetty.version}</version>
       <scope>test</scope>
     </dependency>
@@ -199,8 +199,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-webapp</artifactId>
+      <groupId>org.eclipse.jetty.ee10</groupId>
+      <artifactId>jetty-ee10-webapp</artifactId>
       <version>${jetty.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/util/TestServerUtil.java b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/util/TestServerUtil.java
@@ -15,8 +15,8 @@
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.flowable.cmmn.rest.WebConfigurer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/modules/flowable-dmn-rest/pom.xml b/modules/flowable-dmn-rest/pom.xml
@@ -15,7 +15,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jetty.version>11.0.16</jetty.version>
+        <jetty.version>12.0.15</jetty.version>
         <flowable.artifact>
             org.flowable.dmn.rest.service
         </flowable.artifact>
@@ -214,10 +214,10 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlet</artifactId>
-            <version>${jetty.version}</version>
-            <scope>test</scope>
+        	<groupId>org.eclipse.jetty.ee10</groupId>
+        	<artifactId>jetty-ee10-servlet</artifactId>
+        	<version>${jetty.version}</version>
+        	<scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
@@ -226,8 +226,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-webapp</artifactId>
+            <groupId>org.eclipse.jetty.ee10</groupId>
+            <artifactId>jetty-ee10-webapp</artifactId>
             <version>${jetty.version}</version>
             <scope>test</scope>
         </dependency>

diff --git a/modules/flowable-dmn-rest/src/test/java/org/flowable/dmn/rest/util/TestServerUtil.java b/modules/flowable-dmn-rest/src/test/java/org/flowable/dmn/rest/util/TestServerUtil.java
@@ -15,8 +15,8 @@
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.flowable.dmn.rest.WebConfigurer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/modules/flowable-event-registry-rest/pom.xml b/modules/flowable-event-registry-rest/pom.xml
@@ -16,7 +16,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jetty.version>11.0.16</jetty.version>
+        <jetty.version>12.0.15</jetty.version>
         <flowable.artifact>
             org.flowable.eventregistry.rest
         </flowable.artifact>
@@ -203,10 +203,10 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlet</artifactId>
-            <version>${jetty.version}</version>
-            <scope>test</scope>
+        	<groupId>org.eclipse.jetty.ee10</groupId>
+        	<artifactId>jetty-ee10-servlet</artifactId>
+        	<version>${jetty.version}</version>
+        	<scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
@@ -215,8 +215,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-webapp</artifactId>
+            <groupId>org.eclipse.jetty.ee10</groupId>
+            <artifactId>jetty-ee10-webapp</artifactId>
             <version>${jetty.version}</version>
             <scope>test</scope>
         </dependency>

diff --git a/...vent-registry-rest/src/test/java/org/flowable/eventregistry/rest/util/TestServerUtil.java b/...vent-registry-rest/src/test/java/org/flowable/eventregistry/rest/util/TestServerUtil.java
@@ -15,8 +15,8 @@
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.flowable.eventregistry.rest.WebConfigurer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/modules/flowable-http/pom.xml b/modules/flowable-http/pom.xml
@@ -15,7 +15,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jetty.version>11.0.14</jetty.version>
+        <jetty.version>12.0.15</jetty.version>
         <flowable.osgi.import.pkg>*</flowable.osgi.import.pkg>
         <flowable.artifact>
             org.flowable.http
@@ -152,10 +152,10 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlet</artifactId>
-            <version>${jetty.version}</version>
-            <scope>test</scope>
+        	<groupId>org.eclipse.jetty.ee10</groupId>
+        	<artifactId>jetty-ee10-servlet</artifactId>
+        	<version>${jetty.version}</version>
+        	<scope>test</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.servlet</groupId>

diff --git a/modules/flowable-http/src/test/java/org/flowable/http/bpmn/HttpServiceTaskTestServer.java b/modules/flowable-http/src/test/java/org/flowable/http/bpmn/HttpServiceTaskTestServer.java
@@ -23,24 +23,17 @@
 import java.util.List;
 import java.util.Map;
 
-import jakarta.servlet.MultipartConfigElement;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.Part;
-
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
 import org.eclipse.jetty.http.HttpVersion;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.SslConnectionFactory;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.flowable.common.engine.impl.util.ReflectUtil;
 import org.slf4j.Logger;
@@ -51,6 +44,13 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
+import jakarta.servlet.MultipartConfigElement;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Part;
+
 /**
  * Http Server and API to test HTTP Activity
  *

diff --git a/modules/flowable-rest/pom.xml b/modules/flowable-rest/pom.xml
@@ -16,7 +16,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jetty.version>11.0.16</jetty.version>
+        <jetty.version>12.0.15</jetty.version>
         <flowable.artifact>
             org.flowable.rest
         </flowable.artifact>
@@ -218,10 +218,10 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlet</artifactId>
-            <version>${jetty.version}</version>
-            <scope>test</scope>
+        	<groupId>org.eclipse.jetty.ee10</groupId>
+        	<artifactId>jetty-ee10-servlet</artifactId>
+        	<version>${jetty.version}</version>
+        	<scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
@@ -230,8 +230,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-webapp</artifactId>
+            <groupId>org.eclipse.jetty.ee10</groupId>
+            <artifactId>jetty-ee10-webapp</artifactId>
             <version>${jetty.version}</version>
             <scope>test</scope>
         </dependency>

diff --git a/modules/flowable-rest/src/test/java/org/flowable/rest/util/TestServerUtil.java b/modules/flowable-rest/src/test/java/org/flowable/rest/util/TestServerUtil.java
@@ -15,8 +15,8 @@
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.flowable.rest.WebConfigurer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
 		<spring.framework.version>6.1.13</spring.framework.version>
 		<spring.security.version>6.3.3</spring.security.version>
 		<spring.amqp.version>3.1.7</spring.amqp.version>
-		<spring.kafka.version>3.3.0</spring.kafka.version>
+		<spring.kafka.version>3.2.5</spring.kafka.version>
 		<spring.ldap.version>3.2.6</spring.ldap.version>
 		<reactor-netty.version>1.1.22</reactor-netty.version>
 		<jackson.version>2.17.2</jackson.version>