Spring4

.github/CI_VERSIONS.md

@@ -5,7 +5,7 @@ file is the checklist of what needs periodic review and where each pin lives.
 
 | What | Version | Defined in | Notes |
 |------|---------|------------|-------|
-| Java (JDK) | `21` | `.github/actions/setup-java/action.yml` | Single source of truth for the CI JDK. Must match `maven.compiler.source`/`maven.compiler.target` in `pom.xml`. Review when the project adopts a new LTS. |
+| Java (JDK) | `25` | `.github/actions/setup-java/action.yml` | Single source of truth for the CI JDK. Must match `maven.compiler.source`/`maven.compiler.target` in `pom.xml` and the `openjfx.version` line. Review when the project adopts a new LTS. |
 | Elasticsearch | `8.11.2` | `.github/workflows/_integration-test.yml` and `services/save-and-restore/docker-compose.yml` | Service container for the save-and-restore integration tests. Update both files together. |
 
 ## Automatically maintained

.github/actions/setup-java/action.yml

@@ -7,5 +7,5 @@ runs:
     - uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287
       with:
         distribution: temurin
-        java-version: '21'
+        java-version: '25'
         cache: maven

app/display/model/src/test/java/org/csstudio/display/builder/PathTest.java

@@ -56,6 +56,7 @@ public void testDirectory()
     }
 
     @Test
+    @DisabledOnOs(OS.WINDOWS)
     public void testCombineNotWindows()
     {
         String path = ModelResourceUtil.combineDisplayPaths(null, "example.opi");

app/save-and-restore/model/pom.xml

@@ -72,12 +72,21 @@
 			<version>${tools.jackson.version}</version>
 		</dependency>
 
-		<!-- https://mvnrepository.com/artifact/org.glassfish/javax.json -->
+		<!-- Old Glassfish javax.json impl — required by org.epics:vtype-json which
+		     uses javax.json.spi.JsonProvider SPI. Must coexist with jakarta.json
+		     because the two SPI registrations are under different class names. -->
 		<dependency>
 			<groupId>org.glassfish</groupId>
 			<artifactId>javax.json</artifactId>
 			<version>1.1.4</version>
 		</dependency>
+		<!-- New Glassfish jakarta.json impl — satisfies jakarta.json.spi.JsonProvider
+		     SPI used by elasticsearch-java 9.x and other Jakarta EE consumers. -->
+		<dependency>
+			<groupId>org.glassfish</groupId>
+			<artifactId>jakarta.json</artifactId>
+			<version>2.0.1</version>
+		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/junit/junit -->
 		<dependency>

core/websocket/client/src/main/java/org/phoebus/core/websocket/client/WebSocketClientService.java

@@ -19,14 +19,12 @@
 import org.springframework.web.socket.client.standard.StandardWebSocketClient;
 import org.springframework.web.socket.messaging.WebSocketStompClient;
 
-import javax.websocket.DeploymentException;
 import java.lang.reflect.Type;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -37,7 +35,7 @@
  *     <li>Manages keep alive as supported by the Spring Framework libs</li>
  *     <li>Passes string messages to registered {@link WebSocketMessageHandler}a</li>
  *     <li>Calls {@link Runnable}s (if specified) to signal connection or disconnection</li>
- *     <li>Attempts to auto-reconnect if web socket is closed by remote peer.</li>
+ *     <li>Attempts to auto-reconnect if web socket is closed by remote peer or if connection attempt fails.</li>
  * </ul>
  * <p>
  *     All messages received from the remote peer are strings only, but may be JSON formatted.
@@ -56,12 +54,13 @@
  */
 public class WebSocketClientService {
 
-
     private StompSession stompSession;
     private Runnable connectCallback;
     private Runnable disconnectCallback;
     private final List<WebSocketMessageHandler> webSocketMessageHandlers = Collections.synchronizedList(new ArrayList<>());
-    private final AtomicBoolean attemptReconnect = new AtomicBoolean();
+    private final WebSocketClient webSocketClient = new StandardWebSocketClient();
+    private final WebSocketStompClient stompClient;
+    private final StompSessionHandler sessionHandler = new StompSessionHandler();
     /**
      * Full path to the web socket connection URL, e.g. ws://localhost:8080/Olog/web-socket
      */
@@ -88,6 +87,12 @@
             path = path.substring(0, path.length() - 1);
         }
         this.subscriptionEndpoint = path + Constants.MESSAGES;
+        stompClient = new WebSocketStompClient(webSocketClient);
+        stompClient.setMessageConverter(new StringMessageConverter());
+        ThreadPoolTaskScheduler threadPoolTaskScheduler = new ThreadPoolTaskScheduler();
+        threadPoolTaskScheduler.initialize();
+        stompClient.setTaskScheduler(threadPoolTaskScheduler);
+        stompClient.setDefaultHeartbeat(new long[]{60000, 60000});
     }
 
     /**
@@ -122,62 +127,20 @@
     }
 
     /**
-     * Disconnects the socket if connected and terminates connection thread.
+     * Disconnects the socket if connected.
      */
-    public synchronized void shutdown() {
-        attemptReconnect.set(false);
+    public void shutdown() {
         if (stompSession != null && stompSession.isConnected()) {
             stompSession.disconnect();
         }
     }
 
     /**
-     * Attempts to connect to the remote peer, both in initial connection and in a reconnection scenario.
-     * If connection fails, new attempts are made every 10s until successful.
+     * Attempts to connect to the remote peer.
      */
     public void connect() {
-        attemptReconnect.set(true);
-        WebSocketClient webSocketClient = new StandardWebSocketClient();
-        WebSocketStompClient stompClient = new WebSocketStompClient(webSocketClient);
-        stompClient.setMessageConverter(new StringMessageConverter());
-        ThreadPoolTaskScheduler threadPoolTaskScheduler = new ThreadPoolTaskScheduler();
-        threadPoolTaskScheduler.initialize();
-        stompClient.setTaskScheduler(threadPoolTaskScheduler);
-        stompClient.setDefaultHeartbeat(new long[]{60000, 60000});
-        StompSessionHandler sessionHandler = new StompSessionHandler();
         logger.log(Level.INFO, "Attempting web socket connection to " + connectUrl);
-        new Thread(() -> {
-            while (true) {
-                try {
-                    synchronized (WebSocketClientService.this) {
-                        if (attemptReconnect.get()) {
-                            stompSession = stompClient.connect(connectUrl, sessionHandler).get();
-                            stompSession.subscribe(this.subscriptionEndpoint, new StompFrameHandler() {
-                                @Override
-                                public Type getPayloadType(StompHeaders headers) {
-                                    return String.class;
-                                }
-
-                                @Override
-                                public void handleFrame(StompHeaders headers, Object payload) {
-                                    logger.log(Level.INFO, "Handling subscription frame: " + payload);
-                                    webSocketMessageHandlers.forEach(h -> h.handleWebSocketMessage((String) payload));
-                                }
-                            });
-                            attemptReconnect.set(false);
-                        }
-                        break;
-                    }
-                } catch (Exception e) {
-                    logger.log(Level.WARNING, "Got exception when trying to connect", e);
-                }
-                try {
-                    Thread.sleep(10000);
-                } catch (InterruptedException e) {
-                    logger.log(Level.WARNING, "Got exception when putting thread to sleep", e);
-                }
-            }
-        }).start();
+        stompClient.connectAsync(connectUrl, sessionHandler);
     }
 
     /**
@@ -199,22 +162,34 @@
         }
 
         /**
-         * Handles connection success callback: thread to attempt connection is aborted,
-         * and connect callback is called, if set by API client.
+         * Registers subscription for messages.
          *
          * @param session          the client STOMP session
          * @param connectedHeaders the STOMP CONNECTED frame headers
          */
         @Override
         public void afterConnected(StompSession session, StompHeaders connectedHeaders) {
+            stompSession = session;
             logger.log(Level.INFO, "Connected to web socket");
+            stompSession.subscribe(subscriptionEndpoint, new StompFrameHandler() {
+                @Override
+                public Type getPayloadType(StompHeaders headers) {
+                    return String.class;
+                }
+
+                @Override
+                public void handleFrame(StompHeaders headers, Object payload) {
+                    logger.log(Level.INFO, "Handling subscription frame: " + payload);
+                    webSocketMessageHandlers.forEach(h -> h.handleWebSocketMessage((String) payload));
+                }
+            });
             if (connectCallback != null) {
                 connectCallback.run();
             }
         }
 
         /**
-         * Hit for instance if an attempt is made to send a message to peer after {@link StompSession} has been closed.
+         * Called when - for instance - an attempt is made to send a message to peer after {@link StompSession} has been closed.
          *
          * @param session   the client STOMP session
          * @param command   the STOMP command of the frame
@@ -229,30 +204,22 @@
         }
 
         /**
-         * Handles error for different type of {@link Exception}s:
-         * <ol>
-         *     <li>{@link DeploymentException}: unable to connect, i.e. do not start a new connection thread.</li>
-         *     <li>{@link ConnectionLostException}: service not reachable, e.g. due to network issues or service down.
-         *     Connection thread started.</li>
-         *     <li>{@link IllegalStateException}: service very busy or being debugged, i.e. heartbeat messages
-         *     not received. Connection thread started.</li>
-         * </ol>
+         * Called if connection fails or if connection is lost (e.g. remote service is terminated).
          *
          * @param session   the client STOMP session
-         * @param exception the exception that occurred. This is evaluated to determine if a reconnection
-         *                  thread should be launched.
+         * @param exception the exception that occurred.
          */
         @Override
         public void handleTransportError(StompSession session, Throwable exception) {
-            if(exception instanceof DeploymentException){
-                logger.log(Level.WARNING, "Unable to connect", exception);
+            logger.log(Level.WARNING, "Connection failed or lost, will attempt to reconnect", exception);
+            if (disconnectCallback != null && exception instanceof ConnectionLostException) {
+                disconnectCallback.run();
             }
-            else {
-                logger.log(Level.WARNING, "Connection lost, will attempt to reconnect", exception);
-                if (exception instanceof ConnectionLostException && disconnectCallback != null) {
-                    disconnectCallback.run();
-                }
+            try {
+                Thread.sleep(10000);
                 connect();
+            } catch (InterruptedException e) {
+                logger.log(Level.WARNING, "Sleep interrupted", e);
             }
         }
     }
@@ -268,7 +235,7 @@
         WebSocketClient webSocketClient = new StandardWebSocketClient();
         WebSocketStompClient stompClient = new WebSocketStompClient(webSocketClient);
         try {
-            StompSession stompSession = stompClient.connect(webSocketConnectUrl, new StompSessionHandlerAdapter() {
+            StompSession stompSession = stompClient.connectAsync(webSocketConnectUrl, new StompSessionHandlerAdapter() {
                 @Override
                 public Type getPayloadType(StompHeaders headers) {
                     return super.getPayloadType(headers);
@@ -277,7 +244,7 @@
             stompSession.disconnect();
             return true;
         } catch (Exception e) {
-            logger.log(Level.WARNING, "Remote service on " + webSocketConnectUrl + " does not support web socket connection", e);
+            logger.log(Level.WARNING, "Remote service on " + webSocketConnectUrl + " does not support web socket connection on url " + webSocketConnectUrl, e);
         }
         return false;
     }

dependencies/phoebus-target/pom.xml

@@ -12,8 +12,8 @@
   </properties>
 
   <profiles>
-    <!-- Overriding the default release profile to run the pre release script 
-      with makes the required modification to .classpath and other manually maintained 
+    <!-- Overriding the default release profile to run the pre release script
+      with makes the required modification to .classpath and other manually maintained
       files -->
     <profile>
       <id>release</id>
@@ -60,7 +60,7 @@
   </profiles>
 
   <dependencies>
-    <!-- For testing. mockito-all contains hamcrest packages, resulting in 
+    <!-- For testing. mockito-all contains hamcrest packages, resulting in
       conflicts. This combination of junit, mockito, hamcrest seems to work -->
     <dependency>
       <groupId>org.phoebus</groupId>
@@ -481,10 +481,10 @@
     </dependency>
 
     <dependency>
-       <groupId>org.springdoc</groupId>
-       <artifactId>springdoc-openapi-ui</artifactId>
-       <version>1.7.0</version>
-     </dependency>
+      <groupId>org.springdoc</groupId>
+      <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+      <version>${springdoc.version}</version>
+    </dependency>
 
     <dependency>
       <groupId>javax.validation</groupId>
@@ -500,7 +500,7 @@
     </dependency>
 
     <!--JUL bindings for sfl4j-->
-    <dependency> 
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-jdk14</artifactId>
       <version>1.7.28</version>
@@ -551,7 +551,7 @@
       <artifactId>epics-jackie-client</artifactId>
       <version>3.1.0</version>
     </dependency>
-    
+
     <!-- bouncycastle library used in PVA to decode and check OCSP confirmation of certificates
          bcpkix depends on bcutil, which depends on bcprov
      -->
@@ -570,7 +570,7 @@
       <artifactId>bcprov-jdk18on</artifactId>
       <version>1.84</version>
     </dependency>
-    
+
     <!-- Lib to read/write MS Office (Excel, ..) files, fetching only POI itself -->
     <dependency>
       <groupId>org.apache.poi</groupId>
@@ -610,7 +610,7 @@
       <artifactId>tika-core</artifactId>
       <version>3.2.0</version>
     </dependency>
-    
+
     <!-- ChartFX library for the Waterfall Plot widget -->
     <dependency>
       <groupId>io.fair-acc</groupId>

dependencies/pom.xml

@@ -15,13 +15,13 @@
   <profiles>
     <profile>
       <id>packageTarget</id>
-      <!-- Package the phoebus product with dependencies, run scripts, and 
+      <!-- Package the phoebus product with dependencies, run scripts, and
         sources -->
       <build>
         <plugins>
           <plugin>
             <artifactId>maven-dependency-plugin</artifactId>
-            <version>2.10</version>
+            <version>3.11.0</version>
             <executions>
               <execution>
                 <id>download-sources</id>