feat(JWT-4555)!: Spring Boot 4

Author: werthdavid

.github/workflows/continuous-delivery.yml

@@ -23,7 +23,7 @@ jobs:
       releaseVersion: ${{ steps.semanticversion.outputs.new_version }}
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
 
     - name: Bump version and create tag
       id: semanticversion
@@ -41,11 +41,11 @@ jobs:
           exit -1
         fi
 
-    - name: Set up JDK 17
-      uses: actions/setup-java@v4
+    - name: Set up JDK 21
+      uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
-        java-version: '17'
+        java-version: '21'
         cache: 'maven'
 
     - name: Set version

.github/workflows/continuous-integration.yml

@@ -25,11 +25,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           cache: 'maven'
 
       - name: Perform build

bom/pom.xml

@@ -99,26 +99,22 @@
         <version>${gwt.version}</version>
       </dependency>
 
-      <!-- CodeServer-Jetty -->
+      <!-- CodeServer-Jetty (Jetty 12 EE11 modules, versions managed by Spring Boot BOM) -->
       <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-servlets</artifactId>
-        <version>${jetty.version}</version>
+        <groupId>org.eclipse.jetty.ee11</groupId>
+        <artifactId>jetty-ee11-servlets</artifactId>
       </dependency>
       <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-servlet</artifactId>
-        <version>${jetty.version}</version>
+        <groupId>org.eclipse.jetty.ee11</groupId>
+        <artifactId>jetty-ee11-servlet</artifactId>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-server</artifactId>
-        <version>${jetty.version}</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-http</artifactId>
-        <version>${jetty.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

example/pom.xml

@@ -11,6 +11,11 @@
   <name>gwt-spring-boot-starter-example</name>
   <packaging>war</packaging>
 
+  <properties>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
+  </properties>
+
   <description>This demo illustrates the use of Jadice Web Toolkit in a Spring Boot application.</description>
 
   <dependencyManagement>
@@ -91,6 +96,11 @@
             <artifactId>gwt-user</artifactId>
             <version>${gwt.version}</version>
           </dependency>
+          <dependency>
+            <groupId>org.gwtproject</groupId>
+            <artifactId>gwt-codeserver</artifactId>
+            <version>${gwt.version}</version>
+          </dependency>
         </dependencies>
       </plugin>
       <plugin>

example/src/main/java/org/jadice/gwt/spring/demo/server/DemoApplication.java

@@ -11,7 +11,7 @@
 import org.jadice.gwt.spring.autoconfig.EnableGWTSpringBootApplication;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.boot.web.server.servlet.context.ServletComponentScan;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 /**

pom.xml

@@ -12,17 +12,16 @@
   <url>https://github.com/levigo/gwt-spring-boot-starter</url>
 
   <properties>
-    <version.java>11</version.java>
+    <version.java>21</version.java>
     <java.version>${version.java}</java.version>
     <maven.compiler.source>${version.java}</maven.compiler.source>
     <maven.compiler.target>${version.java}</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <gwt.version>2.12.2</gwt.version>
 
-    <!-- Attention! the jetty version must be the same as the one defined in the spring-boot bom-->
-    <spring-boot.version>3.5.8</spring-boot.version>
-    <jetty.version>12.0.30</jetty.version>
+    <!-- Spring Boot 4 manages Jetty 12 EE11 via its BOM -->
+    <spring-boot.version>4.0.2</spring-boot.version>
 
   </properties>
 

starter/src/main/java/org/jadice/gwt/spring/autoconfig/GWTRPCServletComponentRegisteringPostProcessor.java

@@ -24,7 +24,7 @@
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.boot.web.server.servlet.context.ServletComponentScan;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;

starter/src/main/java/org/jadice/gwt/spring/autoconfig/GWTRPCServletComponentScanRegistrar.java

@@ -22,7 +22,7 @@
 import org.springframework.beans.factory.config.ConstructorArgumentValues.ValueHolder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
-import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.boot.web.server.servlet.context.ServletComponentScan;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.type.AnnotationMetadata;