Spring4

.github/workflows/build-and-test.yml

@@ -7,7 +7,7 @@ jobs:
     strategy:
       matrix:
         os: [ "ubuntu-latest", "windows-latest"]
-        version: [21, 25]
+        version: [25]
       fail-fast: false
     steps:
       - uses: actions/checkout@v5

README.md

@@ -42,9 +42,9 @@ This is the main websocket connection endpoint. See `/pvws` for information on c
 Requirements
 ------------
 
-To build: JDK 17, Maven 3.8+
+To build: JDK 25, Maven 3.8+
 
-To run: JRE 17
+To run: JRE 25
 
 Build
 =====
@@ -100,7 +100,7 @@ Command line options will override definitions in ``application.properties``.
 Tomcat war
 ----------
 
-**NOTE:** Verified on Tomcat 9 only.
+**NOTE:** Spring Boot 4 requires a Jakarta EE 11 compatible servlet container, such as Tomcat 11.
 
 Copy ``pvws.war`` to ``TOMCAT_ROOT/webapps``. Set environment variable:
 
@@ -110,5 +110,3 @@ and launch Tomcat.
 
 
 
-
-

pom.xml

@@ -5,17 +5,17 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.3</version>
+        <version>4.1.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>org.phoebus</groupId>
     <artifactId>pvws</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.2-SNAPSHOT</version>
     <name>EPICS web socket server</name>
     <description>EPICS web socket server</description>
     <packaging>${packaging.type}</packaging>
     <properties>
-        <java.version>11</java.version>
+        <java.version>25</java.version>
     </properties>
     <dependencies>
 
@@ -40,10 +40,15 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webmvc-test</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-ui</artifactId>
-            <version>1.8.0</version>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+            <version>3.1.1</version>
         </dependency>
 
         <dependency>
@@ -73,23 +78,19 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.16.0</version>
         </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.16.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>2.16.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.15.4</version>
         </dependency>
         <dependency>
             <groupId>regexp</groupId>
@@ -130,7 +131,6 @@
                     <plugin>
                         <groupId>org.springframework.boot</groupId>
                         <artifactId>spring-boot-maven-plugin</artifactId>
-                        <version>3.2.1</version>
                         <configuration>
                             <mainClass>org.phoebus.pvws.EpicsWebSocketServerApplication</mainClass>
                             <layout>WAR</layout>
@@ -160,7 +160,6 @@
                     <plugin>
                         <groupId>org.springframework.boot</groupId>
                         <artifactId>spring-boot-maven-plugin</artifactId>
-                        <version>3.2.1</version>
                         <configuration>
                             <mainClass>org.phoebus.pvws.EpicsWebSocketServerApplication</mainClass>
                             <layout>JAR</layout>
@@ -178,4 +177,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>

src/main/java/org/phoebus/pvws/EpicsConfiguration.java

@@ -23,7 +23,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.prefs.Preferences;

src/main/java/org/phoebus/pvws/PvwsWebListener.java

@@ -26,9 +26,9 @@
 import org.springframework.web.context.ContextLoader;
 import org.springframework.web.context.WebApplicationContext;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.annotation.WebListener;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.annotation.WebListener;
 import java.util.List;
 
 @WebListener

src/main/java/org/phoebus/pvws/ws/PvSocketHandler.java

@@ -29,7 +29,7 @@
 import org.springframework.web.socket.WebSocketSession;
 import org.springframework.web.socket.handler.TextWebSocketHandler;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 import java.io.EOFException;
 import java.util.List;
 import java.util.Optional;

src/main/webapp/WEB-INF/web.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" id="WebApp_ID" version="3.1">
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://jakarta.ee/xml/ns/jakartaee" xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd" id="WebApp_ID" version="6.1">
   <display-name>pvws</display-name>
   <welcome-file-list>
     <welcome-file>index.html</welcome-file>

src/test/java/org/phoebus/pvws/controllers/PvwsRestControllerTest.java

@@ -25,7 +25,7 @@
 import org.phoebus.pvws.model.InfoData;
 import org.phoebus.pvws.model.PvPoolData;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;