ControlSystemStudio · shroffk · Feb 9, 2024 · Jan 25, 2024 · Jan 29, 2024 · Jan 29, 2024
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: '11'
+        java-version: '17'
     - name: Build
       run: mvn --batch-mode install
diff --git a/.github/workflows/build_latest.yml b/.github/workflows/build_latest.yml
@@ -15,10 +15,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: '11'
+        java-version: '17'
     - name: Build
       run: mvn --batch-mode install -DskipTests
 

diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ sudo: required
 language: java
 dist: xenial
 jdk:
-  - openjdk11
+  - openjdk17
 
 services:
   - xvfb

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ https://control-system-studio.readthedocs.io
 
 
 ## Requirements
- - [JDK11 or later, suggested is OpenJDK](http://jdk.java.net/12).
+ - [JDK17 or later, suggested is OpenJDK](https://adoptium.net/en-GB/temurin/archive/?version=17).
  - [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-11.0.5+10/Contents/Home
+export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-17.0.10+7/Contents/Home
 ```
 Verify through:
 ```
@@ -73,13 +73,13 @@ Download Eclipse Oxygen 4.7.1a or later from http://download.eclipse.org/eclipse
 
 Start Eclipse like this:
 
-    export JAVA_HOME=/path/to/your/jdk-9-or-later
+    export JAVA_HOME=/path/to/your/jdk-17-or-later
     export PATH="$JAVA_HOME/bin:$PATH"
     eclipse/eclipse -consoleLog
 
 Check Eclipse Preferences:
 
- * Java, Installed JREs: JDK 9-or-later should be the default
+ * Java, Installed JREs: JDK 17-or-later should be the default
  * Java, Compiler: JDK Compliance should be "9" or higher
 
 
@@ -108,7 +108,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-9).
+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-17).
 Restart Eclipse IDE.
 
 Can now start product/src/main/java/org.phoebus.product/Launcher.java.
@@ -129,7 +129,7 @@ To run the Phoebus application:
 
 * Run | Edit Configurations...
 * Select + | Application
-* Module: Your JRE 11
+* Module: Your JRE 17
 * Classpath `-cp`: select `product` from drop-down
 * Main class: `org.phoebus.product.Launcher`
 * Set the name to Phoebus

diff --git a/app/eslog/pom.xml b/app/eslog/pom.xml
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-client</artifactId>
-      <version>5.17.3</version>
+      <version>5.18.2</version>
     </dependency>
 
     <dependency>

diff --git a/app/logbook/ui/pom.xml b/app/logbook/ui/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>31.0.1-jre</version>
+            <version>${guava.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jfxtras</groupId>

diff --git a/app/save-and-restore/model/pom.xml b/app/save-and-restore/model/pom.xml
@@ -73,44 +73,4 @@
 			<scope>test</scope>
 		</dependency>
     </dependencies>
-
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.5</version>
-				<executions>
-					<execution>
-						<id>default-prepare-agent</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>default-report</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>report</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.0.1</version>
-
-				<executions>
-					<execution>
-						<id>attach-javadocs</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
 </project>
diff --git a/dependencies/phoebus-target/pom.xml b/dependencies/phoebus-target/pom.xml
@@ -501,22 +501,22 @@
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit</artifactId>
-      <version>6.6.0.202305301015-r</version>
+      <version>${jgit.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.archive</artifactId>
-      <version>6.6.0.202305301015-r</version>
+      <version>${jgit.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.ssh.jsch</artifactId>
-      <version>6.6.0.202305301015-r</version>
+      <version>${jgit.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.ssh.apache</artifactId>
-      <version>6.6.0.202305301015-r</version>
+      <version>${jgit.version}</version>
     </dependency>
     <!-- Spring Boot -->
     <dependency>
@@ -580,6 +580,14 @@
       <artifactId>javax.json-api</artifactId>
       <version>1.1.4</version>
     </dependency>
+
+    <!-- https://mvnrepository.com/artifact/org.apache.activemq/activemq-client -->
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-client</artifactId>
+      <version>5.18.2</version>
+    </dependency>
+
   </dependencies>
 
   <build>

diff --git a/pom.xml b/pom.xml
@@ -86,15 +86,17 @@
     <log4j-to-slf4j.version>2.17.1</log4j-to-slf4j.version>
     <derby.version>10.16.1.1</derby.version>
     <jython.version>2.7.3</jython.version>
+    <jgit.version>6.7.0.202309050840-r</jgit.version>
+    <maven.compiler.target>17</maven.compiler.target>
   </properties>
   <build>
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.6.2</version>
         <configuration>
-          <source>11</source>
-          <target>11</target>
+          <source>17</source>
+          <target>17</target>
           <fork>true</fork>
           <compilerArgs>
             <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>

diff --git a/services/alarm-config-logger/pom.xml b/services/alarm-config-logger/pom.xml
@@ -59,22 +59,22 @@
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit</artifactId>
-      <version>6.6.0.202305301015-r</version>
+      <version>${jgit.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.archive</artifactId>
-      <version>6.6.0.202305301015-r</version>
+      <version>${jgit.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.ssh.jsch</artifactId>
-      <version>6.6.0.202305301015-r</version>
+      <version>${jgit.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit.ssh.apache</artifactId>
-      <version>6.6.0.202305301015-r</version>
+      <version>${jgit.version}</version>
     </dependency>
     <!--JUL bindings for sfl4j-->
     <dependency> 

diff --git a/services/save-and-restore/pom.xml b/services/save-and-restore/pom.xml
@@ -158,41 +158,6 @@
 				<filtering>true</filtering>
 			</resource>
 		</resources>
-		<plugins>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.5</version>
-				<executions>
-					<execution>
-						<id>default-prepare-agent</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>default-report</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>report</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.0.1</version>
-				<executions>
-					<execution>
-						<id>attach-javadocs</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
 	</build>
 
 	<profiles>

diff --git a/...e-and-restore/src/main/java/org/phoebus/service/saveandrestore/NodeNotFoundException.java b/...e-and-restore/src/main/java/org/phoebus/service/saveandrestore/NodeNotFoundException.java
@@ -18,10 +18,18 @@
  */
 package org.phoebus.service.saveandrestore;
 
+/**
+ * Custom {@link Exception} used to indicate that a wanted {@link org.phoebus.applications.saveandrestore.model.Node}
+ * requested by client could not be found.
+ */
 public class NodeNotFoundException extends RuntimeException {
 
 	private static final long serialVersionUID = -1828621412391490962L;
-
+
+	/**
+	 *
+	 * @param message Some error message...
+	 */
 	public NodeNotFoundException(String message) {
 		super(message);
 	}

diff --git a/...d-restore/src/main/java/org/phoebus/service/saveandrestore/SnapshotNotFoundException.java b/...d-restore/src/main/java/org/phoebus/service/saveandrestore/SnapshotNotFoundException.java
@@ -18,10 +18,18 @@
  */
 package org.phoebus.service.saveandrestore;
 
+/**
+ * Custom {@link Exception} used to indicate that a {@link org.phoebus.applications.saveandrestore.model.Snapshot}
+ * request by client could not be found.
+ */
 public class SnapshotNotFoundException extends RuntimeException {
 
 	private static final long serialVersionUID = -980968730210448760L;
-
+
+	/**
+	 *
+	 * @param message Suitable error message.
+	 */
 	public SnapshotNotFoundException(String message) {
 		super(message);
 	}

diff --git a/...and-restore/src/main/java/org/phoebus/service/saveandrestore/application/Application.java b/...and-restore/src/main/java/org/phoebus/service/saveandrestore/application/Application.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018 European Spallation Source ERIC.
+ * Copyright (C) 2024 European Spallation Source ERIC.
  * <p>
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,21 +17,22 @@
  */
 package org.phoebus.service.saveandrestore.application;
 
-import com.fasterxml.jackson.databind.annotation.JsonAppend.Prop;
 import org.phoebus.service.saveandrestore.migration.MigrateRdbToElastic;
 import org.phoebus.service.saveandrestore.persistence.dao.impl.elasticsearch.ElasticsearchDAO;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.core.env.PropertiesPropertySource;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 
+/**
+ * Save-and-restore service main class.
+ */
 @SpringBootApplication(scanBasePackages = "org.phoebus.service.saveandrestore")
 @EnableScheduling
 @EnableAutoConfiguration
@@ -48,6 +49,10 @@ private static void help() {
         System.out.println();
     }
 
+    /**
+     * Main class
+     * @param args Program arguments. Specifying -help will print options.
+     */
     public static void main(String[] args) {
 
         // load the default properties
@@ -87,7 +92,6 @@ public static void main(String[] args) {
         }
 
 
-
         context = SpringApplication.run(Application.class, args);
 
         if (runMigration) {

diff --git a/...estore/src/main/java/org/phoebus/service/saveandrestore/application/PropertiesHelper.java b/...estore/src/main/java/org/phoebus/service/saveandrestore/application/PropertiesHelper.java
@@ -5,6 +5,9 @@
 import java.util.Properties;
 import java.util.logging.Logger;
 
+/**
+ * Helper class to read application properties.
+ */
 public class PropertiesHelper {
 
     static Properties prop = new Properties();
@@ -26,6 +29,10 @@ public class PropertiesHelper {
         }
     }
 
+    /**
+     *
+     * @return Properties read from application properties file.
+     */
     public static Properties getProperties() {
         return prop;
     }