Jdk25

.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

README.md

@@ -8,7 +8,7 @@ https://control-system-studio.readthedocs.io
 
 
 ## Requirements
- - [JDK21 or later, suggested is OpenJDK](https://adoptium.net/en-GB/temurin/releases?version=21).
+ - [JDK 25 or later, suggested is OpenJDK](https://adoptium.net/en-GB/temurin/releases?version=25).
  - [maven 3.x](https://maven.apache.org/) or [ant](http://ant.apache.org/)
 
 
@@ -27,7 +27,7 @@ mvn clean verify -f dependencies/pom.xml
 Define the JAVA_HOME environment variable to point to your Java installation directory. 
 Mac OS users should use something like:
 ```
-export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-21.0.11+10/Contents/Home
+export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-25/Contents/Home
 ```
 Verify through:
 ```
@@ -73,14 +73,14 @@ Download "Eclipse for Java Developers" from https://www.eclipse.org/downloads/pa
 
 Start Eclipse like this:
 
-    export JAVA_HOME=/path/to/your/jdk-21-or-later
+    export JAVA_HOME=/path/to/your/jdk-25-or-later
     export PATH="$JAVA_HOME/bin:$PATH"
     eclipse/eclipse -consoleLog
 
 Check Eclipse Preferences:
 
- * Java, Installed JREs: JDK 21-or-later should be the default
- * Java, Compiler: JDK Compliance should be "21" or higher
+ * Java, Installed JREs: JDK 25-or-later should be the default
+ * Java, Compiler: JDK Compliance should be "25" or higher
 
 
 ### Use plain Java configuration
@@ -112,7 +112,7 @@ In Help/Eclipse Marketplace, search for Maven Integration for Eclipse Luna or ne
 Use File/Import/Maven/Existing Maven Projects to import the phoebus source code.
 
 There can be a compiler error because the "JRE System Library" in the Package Explorer shows "[J2SE-1.4]".
-Right click on the affected projects (greeting-app, probe), Build Path, Configure Build Path, Libraries, Edit the JRE System Library to use the Workspace default (jdk-21).
+Right click on the affected projects (greeting-app, probe), Build Path, Configure Build Path, Libraries, Edit the JRE System Library to use the Workspace default (jdk-25).
 Restart Eclipse IDE.
 
 Can now start product/src/main/java/org.phoebus.product/Launcher.java.
@@ -126,14 +126,14 @@ To import the project:
 * Select the Phoebus directory
 * Import project from external model: Maven
 * Accept the default options and click Next twice
- * Ensure that the JDK is version 21 or above
+ * Ensure that the JDK is version 25 or above
 * Change the project name to Phoebus and click finish
 
 To run the Phoebus application:
 
 * Run | Edit Configurations...
 * Select + | Application
- * Module: Your JRE 21
+ * Module: Your JRE 25
 * Classpath `-cp`: select `product` from drop-down
 * Main class: `org.phoebus.product.Launcher`
 * Set the name to Phoebus
@@ -145,7 +145,7 @@ To run the Phoebus application:
 
 First download [NetBeans 9](https://netbeans.apache.org/download/nb90/nb90.html),
 then the target platform as described above. After running NetBeans, select
-**Tools** ➜ **Java Platforms** and make sure that a Java 9 or 10 platform is set as
+**Tools** ➜ **Java Platforms** and make sure that a Java 25 platform is set as
 the default one.
 
 To open the Maven project Select the **File** ➜ **Open Project…** and select the

app/alarm/logging-ui/pom.xml

@@ -40,24 +40,19 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
+      <groupId>tools.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>${jackson.version}</version>
+      <version>${tools.jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>${jackson.version}</version>
+      <version>${jackson.annotations.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
+      <groupId>tools.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>${jackson.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jsr310</artifactId>
-      <version>${jackson.version}</version>
+      <version>${tools.jackson.version}</version>
     </dependency>
   </dependencies>
 </project>

app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogConfigSearchJob.java

@@ -1,8 +1,8 @@
 package org.phoebus.applications.alarm.logging.ui;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.core.type.TypeReference;
+import tools.jackson.databind.DeserializationFeature;
+import tools.jackson.databind.ObjectMapper;
 import org.phoebus.framework.jobs.Job;
 import org.phoebus.framework.jobs.JobManager;
 import org.phoebus.framework.jobs.JobRunnableWithCancel;

app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogSearchJob.java

@@ -1,8 +1,8 @@
 package org.phoebus.applications.alarm.logging.ui;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.core.type.TypeReference;
+import tools.jackson.databind.DeserializationFeature;
+import tools.jackson.databind.ObjectMapper;
 import javafx.collections.ObservableMap;
 import org.phoebus.applications.alarm.logging.ui.AlarmLogTableQueryUtil.Keys;
 import org.phoebus.framework.jobs.Job;

app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTableController.java

@@ -1,9 +1,8 @@
 package org.phoebus.applications.alarm.logging.ui;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import tools.jackson.core.JacksonException;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.ObjectMapper;
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
 import javafx.animation.Timeline;
@@ -289,7 +288,7 @@
                                 }
                                 final boolean latching = jsonNode.get("latching").asBoolean();
                                 return new SimpleStringProperty(latching ? "Enabled:Latched" : "Enabled:Unlatch");
                             } catch (Exception e) {
                                 logger.log(Level.SEVERE, "Unexpected error in alarmMessage" + e);
                             }
                         }
@@ -550,10 +549,6 @@
 
     private static final ObjectMapper objectMapper = new ObjectMapper();
 
-    static {
-        objectMapper.registerModule(new JavaTimeModule());
-    }
-
     @FXML
     public void createContextMenu() {
         final ContextMenu contextMenu = new ContextMenu();
@@ -564,7 +559,7 @@
                         try {
                             URI uri = new URI(e.getConfig().replace(" ", "%20"));
                             return uri.getSchemeSpecificPart();
                         } catch (URISyntaxException ex) {
                             ex.printStackTrace();
                         }
                         return null;
@@ -593,7 +588,7 @@
                                 Object jsonObject = objectMapper.readValue(result.getConfig_msg(), Object.class);
                                 sb.append("config_msg: ").append(objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(jsonObject)).append(newLine);
                                 alarmInfo.setContentText(sb.toString());
-                            } catch (JsonProcessingException e) {
+                            } catch (JacksonException e) {
                                 alarmInfo.setContentText(Messages.ConfigurationInfoNotFound);
                             }
                         }

app/alarm/logging-ui/src/main/java/org/phoebus/applications/alarm/logging/ui/AlarmLogTableItem.java

@@ -2,13 +2,12 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import tools.jackson.core.JacksonException;
+import tools.jackson.core.JsonParser;
+import tools.jackson.databind.DeserializationContext;
+import tools.jackson.databind.JsonDeserializer;
+import tools.jackson.databind.annotation.JsonDeserialize;
 
-import java.io.IOException;
 import java.time.Instant;
 
 @JsonInclude(Include.NON_NULL)
@@ -158,7 +157,7 @@ public AlarmInstantDeserializer() {
         }
 
         @Override
-        public Instant deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException {
+        public Instant deserialize(JsonParser p, DeserializationContext ctxt) throws JacksonException {
             return Instant.parse(p.getText());
         }
     }

app/alarm/model/pom.xml

@@ -21,19 +21,14 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
+        <groupId>tools.jackson.core</groupId>
         <artifactId>jackson-core</artifactId>
-        <version>${jackson.version}</version>
+        <version>${tools.jackson.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
+      <groupId>tools.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>${jackson.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jsr310</artifactId>
-      <version>${jackson.version}</version>
+      <version>${tools.jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.kafka</groupId>

app/alarm/model/src/main/java/org/phoebus/applications/alarm/messages/AlarmCommandMessage.java

@@ -15,7 +15,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.core.JsonProcessingException;
+import tools.jackson.core.JacksonException;
 
 /**
  *
@@ -108,7 +108,7 @@ public Map<String, String> sourceMap() {
     public String toString() {
         try {
             return objectMapper.writeValueAsString(this);
-        } catch (JsonProcessingException e) {
+        } catch (JacksonException e) {
             logger.log(Level.WARNING, "failed to parse the alarm command message ", e);
         }
         return "";

app/alarm/model/src/main/java/org/phoebus/applications/alarm/messages/AlarmConfigMessage.java

@@ -16,7 +16,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.core.JsonProcessingException;
+import tools.jackson.core.JacksonException;
 
 /**
  *
@@ -225,7 +225,7 @@ public boolean isLeaf() {
     public String toString() {
         try {
             return AlarmMessageUtil.objectConfigMapper.writeValueAsString(this);
-        } catch (JsonProcessingException e) {
+        } catch (JacksonException e) {
             logger.log(Level.WARNING, "failed to parse the alarm config message ", e);
         }
         return "";

app/alarm/model/src/main/java/org/phoebus/applications/alarm/messages/AlarmDetail.java

@@ -5,7 +5,7 @@
 
 import java.util.logging.Level;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
+import tools.jackson.core.JacksonException;
 
 /** Alarm detail */
 public class AlarmDetail {
@@ -62,7 +62,7 @@ public void setDelay(int delay) {
     public String toString() {
         try {
             return objectMapper.writeValueAsString(this);
-        } catch (JsonProcessingException e) {
+        } catch (JacksonException e) {
             logger.log(Level.WARNING, "failed to parse the alarm detail message ", e);
         }
         return "";

app/alarm/model/src/main/java/org/phoebus/applications/alarm/messages/AlarmMessage.java

@@ -16,7 +16,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.core.JsonProcessingException;
+import tools.jackson.core.JacksonException;
 
 /**
  * A message which describes both state and configuration events
@@ -417,9 +417,9 @@ public void setDelete(String delete) {
     /**
      * @return json string representation of this object
      *
-     * @throws JsonProcessingException on error
+     * @throws JacksonException on error
      */
-    public String toJson() throws JsonProcessingException {
+    public String toJson() throws JacksonException {
         if (isConfig()) {
             return objectConfigMapper.writeValueAsString(this);
         } else if (isState()){
@@ -433,7 +433,7 @@ public String toJson() throws JsonProcessingException {
     public String toString() {
         try {
             return toJson();
-        } catch (JsonProcessingException e) {
+        } catch (JacksonException e) {
             logger.log(Level.WARNING, "failed to parse the alarm message ", e);
         }
         return "";

app/alarm/model/src/main/java/org/phoebus/applications/alarm/messages/AlarmMessageUtil.java

@@ -3,9 +3,9 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
+import tools.jackson.databind.module.SimpleModule;
 import org.phoebus.applications.alarm.model.EnabledState;
 
 import java.io.Serializable;
@@ -24,30 +24,26 @@ public class AlarmMessageUtil implements Serializable{
 
     // Object mapper for the alarm state messages
    @JsonIgnore
-    static final ObjectMapper objectStateMapper = new ObjectMapper();
-    static {
-        objectStateMapper.registerModule(new JavaTimeModule());
-        objectStateMapper.addMixIn(AlarmMessageUtil.class, AlarmStateJsonMessage.class);
-    }
+    static final ObjectMapper objectStateMapper = JsonMapper.builder()
+            .addMixIn(AlarmMessageUtil.class, AlarmStateJsonMessage.class)
+            .build();
 
     // Object mapper for the alarm config messages
     @JsonIgnore
-    static final ObjectMapper objectConfigMapper = new ObjectMapper();
+    static final ObjectMapper objectConfigMapper;
     static {
         SimpleModule simple_module = new SimpleModule();
         simple_module.addSerializer(new EnabledSerializer());
 
-        objectConfigMapper.registerModule(new JavaTimeModule());
-        objectConfigMapper.registerModule(simple_module);
-        objectConfigMapper.addMixIn(AlarmMessageUtil.class, AlarmConfigJsonMessage.class);
+        objectConfigMapper = JsonMapper.builder()
+                .addModule(simple_module)
+                .addMixIn(AlarmMessageUtil.class, AlarmConfigJsonMessage.class)
+                .build();
     }
 
     // Object mapper for all other alarm messages
     @JsonIgnore
     static final ObjectMapper objectMapper = new ObjectMapper();
-    static {
-        objectMapper.registerModule(new JavaTimeModule());
-    }
 
     private static class AlarmStateJsonMessage {
         @JsonIgnore

app/alarm/model/src/main/java/org/phoebus/applications/alarm/messages/AlarmStateMessage.java

@@ -14,7 +14,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.core.JsonProcessingException;
+import tools.jackson.core.JacksonException;
 
 /**
  * A bean representing a alarm state message
@@ -206,7 +206,7 @@ public Map<String, String> sourceMap() {
     public String toString() {
         try {
             return AlarmMessageUtil.objectStateMapper.writeValueAsString(this);
-        } catch (JsonProcessingException e) {
+        } catch (JacksonException e) {
             logger.log(Level.WARNING, "failed to parse the alarm state message ", e);
         }
         return "";

app/alarm/model/src/main/java/org/phoebus/applications/alarm/messages/AlarmTalkMessage.java

@@ -7,7 +7,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.core.JsonProcessingException;
+import tools.jackson.core.JacksonException;
 
 /** Talk message */
 @JsonInclude(Include.NON_NULL)
@@ -56,7 +56,7 @@ public void setTalk(String talk) {
     public String toString() {
         try {
             return objectMapper.writeValueAsString(this);
-        } catch (JsonProcessingException e) {
+        } catch (JacksonException e) {
             logger.log(Level.WARNING, "failed to parse the alarm talk message ", e);
         }
         return "";