From a6cd59761da1caef2df4f32e2d22b28175d0116f Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Thu, 11 Sep 2025 12:06:57 +0100 Subject: [PATCH 1/6] add note about JDK installation location --- doc/overview/First-Time-Build.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/overview/First-Time-Build.md b/doc/overview/First-Time-Build.md index 8391a9243..bc4456e31 100644 --- a/doc/overview/First-Time-Build.md +++ b/doc/overview/First-Time-Build.md @@ -21,6 +21,8 @@ See [Install Visual Studio](/iocs/compiling/Install-Visual-Studio) Install **OpenJDK 21 hotspot** from https://adoptium.net/?variant=openjdk21&jvmVariant=hotspot (the MSI installer is fine, tick all the boxes when it asks you which components to install) +The installation location should be `C:\Instrument\Apps\JDK\`. + ```{important} **Do not install an Oracle JDK**. It has an unsuitable license. ``` From 46a9dfbc5b4f0d1d7e52a2b7760a8a1b023009f7 Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Mon, 8 Dec 2025 11:49:31 +0000 Subject: [PATCH 2/6] Revise Java JDK installation instructions Updated Java installation instructions to use binary zip instead of MSI installer and specified extraction path. --- doc/overview/First-Time-Build.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/doc/overview/First-Time-Build.md b/doc/overview/First-Time-Build.md index bc4456e31..56f9e3d28 100644 --- a/doc/overview/First-Time-Build.md +++ b/doc/overview/First-Time-Build.md @@ -19,16 +19,12 @@ See [Install Visual Studio](/iocs/compiling/Install-Visual-Studio) {#first_time_install_java} ## Install Java JDK -Install **OpenJDK 21 hotspot** from https://adoptium.net/?variant=openjdk21&jvmVariant=hotspot (the MSI installer is fine, tick all the boxes when it asks you which components to install) - -The installation location should be `C:\Instrument\Apps\JDK\`. +Install the **OpenJDK 21 hotspot** binary zip from https://adoptium.net and extract to `\instrument\apps\JDK\21.x.x` ```{important} **Do not install an Oracle JDK**. It has an unsuitable license. ``` -You may wish to install some optional java components [as detailed here](#developer_upgrade_java). - {#first_time_install_maven} ## Install Maven From 11e5733147683fe35e199de02869c52362f0e800 Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Tue, 9 Dec 2025 17:53:40 +0000 Subject: [PATCH 3/6] add note on ansible --- doc/deployment/Creating-a-release.md | 2 ++ doc/overview/First-Time-Build.md | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/deployment/Creating-a-release.md b/doc/deployment/Creating-a-release.md index 64bf74256..03889ba8e 100644 --- a/doc/deployment/Creating-a-release.md +++ b/doc/deployment/Creating-a-release.md @@ -60,6 +60,8 @@ is recent enough to include the most recent changes in the 1. Do the same for the `EPICS32` 32-bit build, replacing `EPICS` with `EPICS32` everywhere in the commands above. 1. Check release is now listed in [`https://control-svcs.isis.cclrc.ac.uk/git/?a=project_list;pf=releases`](https://control-svcs.isis.cclrc.ac.uk/git/?a=project_list;pf=releases) +1. Run the [`instrument_deploy.yaml` ansible playbook](https://github.com/ISISComputingGroup/ansible-playbooks/tree/main?tab=readme-ov-file#instrument_deployyaml) which currently installs the JDK on instruments. + {#creating_release_testing_steps} ### Testing diff --git a/doc/overview/First-Time-Build.md b/doc/overview/First-Time-Build.md index 56f9e3d28..b2e980c5b 100644 --- a/doc/overview/First-Time-Build.md +++ b/doc/overview/First-Time-Build.md @@ -19,7 +19,7 @@ See [Install Visual Studio](/iocs/compiling/Install-Visual-Studio) {#first_time_install_java} ## Install Java JDK -Install the **OpenJDK 21 hotspot** binary zip from https://adoptium.net and extract to `\instrument\apps\JDK\21.x.x` +Install the **OpenJDK 25 hotspot** binary zip from https://adoptium.net and extract to `\instrument\apps\JDK\21` ```{important} **Do not install an Oracle JDK**. It has an unsuitable license. From 80c29422276165fc40308ade1735b1388ea537b4 Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Mon, 12 Jan 2026 10:06:46 +0000 Subject: [PATCH 4/6] add note in dependency updates --- doc/processes/dev_processes/Dependency-Updates.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/processes/dev_processes/Dependency-Updates.md b/doc/processes/dev_processes/Dependency-Updates.md index c8d4a2a70..ab4c315a6 100644 --- a/doc/processes/dev_processes/Dependency-Updates.md +++ b/doc/processes/dev_processes/Dependency-Updates.md @@ -138,16 +138,16 @@ In `create_icp_binaries.bat`, update the unpacked version of MySQL used during t In `c:\instrument\apps\epics\support\mysql\master\MySQLCppApp\src\mysql-connector-c++`, update the vendor submodule to a recent version, then rebuild `mysql`, `pvdump`, and then all IOCs, in that order. ### Java -- Get the latest AdoptOpen JDK msi file from `https://adoptium.net/releases.html?jvmVariant=hotspot` and put it in `\\isis\shares\ISIS_Experiment_Controls_Public\third_party_installers\latest_versions`. +- Get the latest AdoptOpen JDK zip file from `https://adoptium.net/releases.html?jvmVariant=hotspot` and put it in `C:\instrument\apps\JDK\\`. * Only upgrade major versions to another LTS version. -- Copy the older version onto the `\\isis\shares\ISIS_Experiment_Controls_Public\third_party_installers\old_versions`. -- Uninstall the older version from control Panel and install the new version. +- Uninstall the older version from control Panel, remove any references from the `PATH` environment variable. - Test that running `start_ibex_server.bat` completes successfully, and ensure there are no obvious errors in the IOC log files for: * ARBLOCK * ARINST * ALARM * IOCLOG - Check that CS Studio IDE is loaded correctly +- Update the ansible playbook with the new version as per [these instructions](https://github.com/ISISComputingGroup/ansible-playbooks/tree/main?tab=readme-ov-file#updating-jdk-version). ### Maven - There are two versions of maven, this is to update the one following the format `maven-X.x.x` From 749eefbbde734ff276e53a152a60fd1b2a9d8673 Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Mon, 12 Jan 2026 11:45:36 +0000 Subject: [PATCH 5/6] Update doc/overview/First-Time-Build.md Co-authored-by: Tom Willemsen --- doc/overview/First-Time-Build.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/overview/First-Time-Build.md b/doc/overview/First-Time-Build.md index b2e980c5b..fa0f9efab 100644 --- a/doc/overview/First-Time-Build.md +++ b/doc/overview/First-Time-Build.md @@ -19,7 +19,7 @@ See [Install Visual Studio](/iocs/compiling/Install-Visual-Studio) {#first_time_install_java} ## Install Java JDK -Install the **OpenJDK 25 hotspot** binary zip from https://adoptium.net and extract to `\instrument\apps\JDK\21` +Install the **OpenJDK 25 hotspot** binary zip from https://adoptium.net and extract to `\instrument\apps\JDK\25` ```{important} **Do not install an Oracle JDK**. It has an unsuitable license. From 426b4b231f12105e32d79e15ec68cadf5563b7a6 Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Mon, 12 Jan 2026 11:46:27 +0000 Subject: [PATCH 6/6] Correct capitalization in Dependency-Updates.md --- doc/processes/dev_processes/Dependency-Updates.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/processes/dev_processes/Dependency-Updates.md b/doc/processes/dev_processes/Dependency-Updates.md index ab4c315a6..2d31c64e4 100644 --- a/doc/processes/dev_processes/Dependency-Updates.md +++ b/doc/processes/dev_processes/Dependency-Updates.md @@ -147,7 +147,7 @@ In `c:\instrument\apps\epics\support\mysql\master\MySQLCppApp\src\mysql-connecto * ALARM * IOCLOG - Check that CS Studio IDE is loaded correctly -- Update the ansible playbook with the new version as per [these instructions](https://github.com/ISISComputingGroup/ansible-playbooks/tree/main?tab=readme-ov-file#updating-jdk-version). +- Update the Ansible playbook with the new version as per [these instructions](https://github.com/ISISComputingGroup/ansible-playbooks/tree/main?tab=readme-ov-file#updating-jdk-version). ### Maven - There are two versions of maven, this is to update the one following the format `maven-X.x.x`