Fix Liberty version comparison

cherylking · May 4, 2024 · 560a9c0 · 560a9c0
1 parent 5a19012
commit 560a9c0
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/src/main/java/io/openliberty/tools/ant/jsp/CompileJSPs.java b/src/main/java/io/openliberty/tools/ant/jsp/CompileJSPs.java
@@ -367,6 +367,23 @@ private ServerTask createServerTask(File usrDir) {
         return server;
     }
 
+    private boolean isVersion24xxOrLater(String version) {
+        boolean flag = false;
+
+        if (version != null && version.contains(".")) {
+            String majorVersion = version.substring(0,version.indexOf("."));
+            try {
+                Integer majorVersionInt = new Integer(majorVersion);
+                if (majorVersionInt.intValue() >= 24) {
+                    flag = true;
+                }    
+            } catch (NumberFormatException e) {
+            }
+        }
+
+        return flag;
+    }
+
     private String determineSourceAttribute(File serverDir) {
         String sourceAttrToUse = "jdkSourceLevel";
         File f = new File(wlpHome,"lib/versions/openliberty.properties");
@@ -377,7 +394,7 @@ private String determineSourceAttribute(File serverDir) {
 
                 libertyProductProperties.load(input);
                 String version = libertyProductProperties.getProperty("com.ibm.websphere.productVersion");
-                if (version != null && version.startsWith("24.")) {
+                if (isVersion24xxOrLater(version)) {
                     if (useJdkSourceLevel && source.equals("18")) {
                         // change source 18 to 8 and use javaSourceLevel instead
                         source = "8";