Skip to content

Commit c6946b1

Browse files
committed
fix the doc to list jdk 21 as the new dependency
1 parent 71ebb98 commit c6946b1

4 files changed

Lines changed: 13 additions & 13 deletions

File tree

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ https://control-system-studio.readthedocs.io
88

99

1010
## Requirements
11-
- [JDK17 or later, suggested is OpenJDK](https://adoptium.net/en-GB/temurin/archive/?version=17).
11+
- [JDK21 or later, suggested is OpenJDK](https://adoptium.net/en-GB/temurin/releases?version=21).
1212
- [maven 3.x](https://maven.apache.org/) or [ant](http://ant.apache.org/)
1313

1414

@@ -27,7 +27,7 @@ mvn clean verify -f dependencies/pom.xml
2727
Define the JAVA_HOME environment variable to point to your Java installation directory.
2828
Mac OS users should use something like:
2929
```
30-
export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-17.0.10+7/Contents/Home
30+
export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-21.0.11+10/Contents/Home
3131
```
3232
Verify through:
3333
```
@@ -73,14 +73,14 @@ Download "Eclipse for Java Developers" from https://www.eclipse.org/downloads/pa
7373

7474
Start Eclipse like this:
7575

76-
export JAVA_HOME=/path/to/your/jdk-17-or-later
76+
export JAVA_HOME=/path/to/your/jdk-21-or-later
7777
export PATH="$JAVA_HOME/bin:$PATH"
7878
eclipse/eclipse -consoleLog
7979

8080
Check Eclipse Preferences:
8181

82-
* Java, Installed JREs: JDK 17-or-later should be the default
83-
* Java, Compiler: JDK Compliance should be "9" or higher
82+
* Java, Installed JREs: JDK 21-or-later should be the default
83+
* Java, Compiler: JDK Compliance should be "21" or higher
8484

8585

8686
### Use plain Java configuration
@@ -112,7 +112,7 @@ In Help/Eclipse Marketplace, search for Maven Integration for Eclipse Luna or ne
112112
Use File/Import/Maven/Existing Maven Projects to import the phoebus source code.
113113

114114
There can be a compiler error because the "JRE System Library" in the Package Explorer shows "[J2SE-1.4]".
115-
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).
115+
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).
116116
Restart Eclipse IDE.
117117

118118
Can now start product/src/main/java/org.phoebus.product/Launcher.java.
@@ -126,14 +126,14 @@ To import the project:
126126
* Select the Phoebus directory
127127
* Import project from external model: Maven
128128
* Accept the default options and click Next twice
129-
* Ensure that the JDK is version 11 or above
129+
* Ensure that the JDK is version 21 or above
130130
* Change the project name to Phoebus and click finish
131131

132132
To run the Phoebus application:
133133

134134
* Run | Edit Configurations...
135135
* Select + | Application
136-
* Module: Your JRE 17
136+
* Module: Your JRE 21
137137
* Classpath `-cp`: select `product` from drop-down
138138
* Main class: `org.phoebus.product.Launcher`
139139
* Set the name to Phoebus

app/queue-server/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ A JavaFX-based client for the [Bluesky QueueServer](https://blueskyproject.io/bl
3030

3131
### Prerequisites
3232

33-
- **Java 17** or later
33+
- **Java 21** or later
3434
- **Maven** (for building from source)
3535
- **Bluesky Queue Server** running and accessible
3636

@@ -107,4 +107,4 @@ When making changes:
107107
2. Test with both WebSocket and HTTP fallback modes
108108
3. Verify API key authentication works
109109
4. Update documentation for new features
110-
5. Follow existing code style and patterns
110+
5. Follow existing code style and patterns

services/save-and-restore/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ The save-and-restore service implements service as a collection
44
of REST endpoints. These can be used by clients to manage configurations (aka save sets) and
55
snapshots, to compare snapshots and to restore PV values from snapshots.
66

7-
The service is packaged as a self-contained Spring Boot jar file. External dependencies are limited to a JVM (Java 17+)
7+
The service is packaged as a self-contained Spring Boot jar file. External dependencies are limited to a JVM (Java 21+)
88
and a running instance of Elasticsearch (8.x).
99

1010
# Build
@@ -82,4 +82,4 @@ This may be preferable compared to setting environment variables on command line
8282
```>export HOST_IP_ADDRESS=1.2.3.4```.
8383

8484
**NOTE:** Accessing IOCs over pva (default mode in the Docker compose files) works **only** if IOC is running on the
85-
same host as the Docker container. Moreover, this has been verified to work only on Linux.
85+
same host as the Docker container. Moreover, this has been verified to work only on Linux.

services/save-and-restore/doc/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ The save-and-restore service implements service as a collection
55
of REST endpoints. These can be used by clients to manage configurations (aka save sets) and
66
snapshots, to compare snapshots and to restore PV values from snapshots.
77

8-
The service is packaged as a self-contained Spring Boot jar file. External dependencies are limited to a JVM (Java 17+)
8+
The service is packaged as a self-contained Spring Boot jar file. External dependencies are limited to a JVM (Java 21+)
99
and a running instance of Elasticsearch (8.x).
1010

1111
Running the service

0 commit comments

Comments
 (0)