Check for property key in project properties and update compiler version

OpenLiberty · Oct 19, 2023 · 3ee65c4 · 3ee65c4
1 parent fd7ef36
commit 3ee65c4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -40,26 +40,26 @@ configurations {
 }
 
 compileJava {
-    sourceCompatibility = JavaVersion.VERSION_1_7
-    targetCompatibility = JavaVersion.VERSION_1_7
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 compileTestJava {
-    sourceCompatibility = JavaVersion.VERSION_1_7
-    targetCompatibility = JavaVersion.VERSION_1_7
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 compileGroovy {
-    sourceCompatibility = JavaVersion.VERSION_1_7
-    targetCompatibility = JavaVersion.VERSION_1_7
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 compileTestGroovy {
-    sourceCompatibility = JavaVersion.VERSION_1_7
-    targetCompatibility = JavaVersion.VERSION_1_7
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-def libertyAntVersion = "1.9.13"
+def libertyAntVersion = "1.9.14-SNAPSHOT"
 def libertyCommonVersion = "1.8.30-SNAPSHOT"
 
 dependencies {

diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/AbstractFeatureTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/AbstractFeatureTask.groovy
@@ -296,9 +296,8 @@ public class AbstractFeatureTask extends AbstractServerTask {
     protected void setContainerEngine(AbstractContainerSupportUtil util) throws PluginExecutionException {
         String LIBERTY_DEV_PODMAN = "liberty.dev.podman";
         Map<String, Object> projectProperties = project.getProperties();
-        if (!projectProperties.isEmpty()) {
+        if (!projectProperties.isEmpty() && projectProperties.containsKey(LIBERTY_DEV_PODMAN)) {
             Object isPodman = projectProperties.get(LIBERTY_DEV_PODMAN);
-            isPodman = projectProperties.get(LIBERTY_DEV_PODMAN);
             if (isPodman != null) {
                 util.setIsDocker(!(Boolean.parseBoolean(isPodman.toString())));
                 logger.debug("liberty.dev.podman was set to: " + (Boolean.parseBoolean(isPodman.toString())));