From 34d3814dfa3193795137fb600d449a4c58808333 Mon Sep 17 00:00:00 2001
From: Tom Slattery <tom.slattery@ibm.com>
Date: Wed, 4 Jun 2025 09:48:01 +0100
Subject: [PATCH] Update error message to represent versions of Java supported

Signed-off-by: Tom Slattery <tom.slattery@ibm.com>
---
 .../main/java/dev/galasa/boot/Launcher.java   | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/framework/galasa-parent/galasa-boot/src/main/java/dev/galasa/boot/Launcher.java b/modules/framework/galasa-parent/galasa-boot/src/main/java/dev/galasa/boot/Launcher.java
index bcf069b55..303ca4151 100644
--- a/modules/framework/galasa-parent/galasa-boot/src/main/java/dev/galasa/boot/Launcher.java
+++ b/modules/framework/galasa-parent/galasa-boot/src/main/java/dev/galasa/boot/Launcher.java
@@ -32,10 +32,10 @@
 
 /**
  * Galasa command line launcher.<br>
- * 
+ *
  * Required parameters:<br>
  * &nbsp;&nbsp;<code>--obr infra.obr --obr test.obr test.bundle/test.package.TestClass</code><br>
- * 
+ *
  * <ol>
  * <li>Start Felix OSGi framework</li>
  * <li>Loads required bundles</li>
@@ -111,7 +111,7 @@ public class Launcher {
 
     /**
      * Launcher main method
-     * 
+     *
      * @param args Arguments from the command line
      */
     public static void main(String[] args) {
@@ -127,7 +127,7 @@ public static void main(String[] args) {
 
     /**
      * Process supplied command line arguments and run the test
-     * 
+     *
      * @param args test run parameters
      * @throws InterruptedException
      * @throws Exception
@@ -229,7 +229,7 @@ protected String logCommandLineArguments(String[] args) {
 
     /**
      * Process the supplied command line augments
-     * 
+     *
      * @param args supplied arguments
      * @throws ParseException
      */
@@ -262,7 +262,7 @@ private void processCommandLine(String[] args) throws ParseException {
         options.addOption(null, DRY_RUN_OPTION, false, "Perform a dry-run of the specified actions. Can be combined with \"" + FILE_OPTION_LONG + "\"");
         options.addOption(null, SETUPECO_OPTION, false, "Setup the Galasa Ecosystem");
         options.addOption(null, VALIDATEECO_OPTION, false, "Validate the Galasa Ecosystem");
-        
+
 
         CommandLineParser parser = new DefaultParser();
         CommandLine commandLine = null;
@@ -349,11 +349,11 @@ private void processCommandLine(String[] args) throws ParseException {
         if (isMetricsServer) {
             return;
         }
-        
+
         if (isApiServer) {
             return;
         }
-        
+
         if (setupEco) {
             return;
         }
@@ -447,7 +447,7 @@ private void checkForBundles(CommandLine commandLine) {
      * Retrieve the bootstrap URI from the command line and load the properties
      * file. If the the option is not provided, getGalasaHome is called to provide a path
      * which will be created if it does not exist.
-     * 
+     *
      * @param commandLine - The command line instance
      */
     private void checkForBootstrap(CommandLine commandLine) {
@@ -484,7 +484,7 @@ private void checkForBootstrap(CommandLine commandLine) {
      * Retrieve the overrides URI from the command line and load the overrides file.
      * If the the option is not provided,
      * If the the option is not provided, getGalasaHome is called to provide a path
-     * 
+     *
      * @param commandLine - The command line instance
      */
     private void checkForOverrides(CommandLine commandLine) {
@@ -542,10 +542,10 @@ public void validateJavaLevel(Environment env) throws LauncherException{
             return;
         }
 
-        logger.error("Galasa requires Java 11, we found: " + version + " will exit");
-        throw new LauncherException("Galasa requires Java 11, we found: " + version + " will exit");
+        logger.error("Galasa requires Java 11 or 17, we found: " + version + " will exit");
+        throw new LauncherException("Galasa requires Java 11 or 17, we found: " + version + " will exit");
     }
-    
+
     /**
      * Obtain the location of the galasa home directory
      * @return a String representing the location of the users Galasa home directory
@@ -597,7 +597,7 @@ String stripLeadingAndTrailingQuotes(String input ) {
 
     /**
      * Read a set of environment variables that will override the values of the CPS, RAS, DSS and Creds store
-     * if these are set then they override the value in the bootstrap   
+     * if these are set then they override the value in the bootstrap
      */
     public void setStoresFromEnvironmentVariables(Environment env, Properties bootstrap) {
         String CPS_ENV_VAR = "GALASA_CONFIG_STORE";