Merge pull request #436 from cherylking/avoidVerifyFeatureError

Work around for LGP issue 867
OpenLiberty · Jan 19, 2024 · 3bc6e01 · 3bc6e01
2 parents ca14a06 + 9be6622
commit 3bc6e01
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/main/java/io/openliberty/tools/common/plugins/util/ServerFeatureUtil.java b/src/main/java/io/openliberty/tools/common/plugins/util/ServerFeatureUtil.java
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corporation 2019, 2023.
+ * (C) Copyright IBM Corporation 2019, 2024.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -680,11 +680,15 @@ protected Map<String, Object> createMapBasedInstallKernelInstance(String bundle,
         debug("install.kernel.init.error.message: " + mapBasedInstallKernel.get("install.kernel.init.error.message"));
         File usrDir = new File(installDirectory, "usr");
         mapBasedInstallKernel.put("target.user.directory", usrDir);
-	    if (isDebugEnabled()) {
-	        mapBasedInstallKernel.put("debug", Level.FINEST);
-        } else { //removed due to "java.lang.ClassNotFoundException: com.ibm.websphere.ras.DataFormatHelper" reported in ci.gradle issue 867
-            mapBasedInstallKernel.put("debug", Level.INFO);
-        } 
+
+        // Avoid "java.lang.ClassNotFoundException: com.ibm.websphere.ras.DataFormatHelper" reported in ci.gradle issue 867.
+        // When fix goes into OpenLiberty, remove this change. Then add check for OL version and set debug level accordingly.
+        // Reference PR: https://github.com/OpenLiberty/open-liberty/pull/27416
+	    // if (isDebugEnabled()) {
+	    //     mapBasedInstallKernel.put("debug", Level.FINEST);
+        // } else { 
+             mapBasedInstallKernel.put("debug", Level.INFO);
+        // } 
         return mapBasedInstallKernel;
     }