Test with Liberty 23.0.0.10

OpenLiberty · Oct 19, 2023 · 620b4be · 620b4be
1 parent bd726b2
commit 620b4be
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 5 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -22,7 +22,7 @@ jobs:
       matrix:
         # test against latest update of each major Java version, as well as specific updates of LTS versions:
         RUNTIME: [ol, wlp]
-        RUNTIME_VERSION: [23.0.0.9]
+        RUNTIME_VERSION: [23.0.0.10]
         java: [21, 17, 11, 8]
         exclude:
         - java: 8
@@ -76,7 +76,7 @@ jobs:
       matrix:
         # test against latest update of each major Java version, as well as specific updates of LTS versions:
         RUNTIME: [ol, wlp]
-        RUNTIME_VERSION: [23.0.0.9]
+        RUNTIME_VERSION: [23.0.0.10]
         java: [21, 17, 11, 8]
         exclude:
         - java: 8

diff --git a/liberty-maven-plugin/pom.xml b/liberty-maven-plugin/pom.xml
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>io.openliberty.tools</groupId>
             <artifactId>ci.common</artifactId>
-            <version>1.8.29</version>
+            <version>1.8.30-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.twdata.maven</groupId>

diff --git a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/BasicSupport.java b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/BasicSupport.java
@@ -44,6 +44,8 @@
 import org.codehaus.plexus.util.IOUtil;
 
 import io.openliberty.tools.ant.install.InstallLibertyTask;
+import io.openliberty.tools.common.plugins.util.AbstractContainerSupportUtil;
+import io.openliberty.tools.common.plugins.util.PluginExecutionException;
 import io.openliberty.tools.common.plugins.util.ServerFeatureUtil;
 
 /**
@@ -714,4 +716,17 @@ protected Map<String,File> getLibertyDirectoryPropertyFiles() {
         return new HashMap<String,File> ();
     }
 
+    protected void setContainerEngine(AbstractContainerSupportUtil util) throws PluginExecutionException {
+        String LIBERTY_DEV_PODMAN = "liberty.dev.podman";
+        Properties mergedProperties = project.getProperties();
+        mergedProperties.putAll(System.getProperties()); //System/command line properties will take precedence
+        if (!mergedProperties.isEmpty()) {
+            Object isPodman = mergedProperties.get(LIBERTY_DEV_PODMAN);
+            isPodman = mergedProperties.get(LIBERTY_DEV_PODMAN);
+            if (isPodman != null) {
+                util.setIsDocker(!(Boolean.parseBoolean(isPodman.toString())));
+                getLog().debug("liberty.dev.podman was set to: " + (Boolean.parseBoolean(isPodman.toString())));
+            }
+        }
+    }
 }
diff --git a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/InstallFeatureSupport.java b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/InstallFeatureSupport.java
@@ -55,6 +55,7 @@ protected class InstallFeatureMojoUtil extends InstallFeatureUtil {
         public InstallFeatureMojoUtil(Set<String> pluginListedEsas, List<ProductProperties> propertiesList, String openLibertyVerion, String containerName, List<String> additionalJsons)
                 throws PluginScenarioException, PluginExecutionException {
             super(installDirectory, new File(project.getBuild().getDirectory()), features.getFrom(), features.getTo(), pluginListedEsas, propertiesList, openLibertyVerion, containerName, additionalJsons);
+            setContainerEngine(this);
         }
 
         @Override

diff --git a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/DevMojo.java b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/DevMojo.java
@@ -298,7 +298,7 @@ public DevMojoUtil(File installDir, File userDir, File serverDirectory, File sou
                 List<File> resourceDirs, JavaCompilerOptions compilerOptions, String mavenCacheLocation,
                 List<ProjectModule> upstreamProjects, List<MavenProject> upstreamMavenProjects, boolean recompileDeps,
                 File pom, Map<String, List<String>> parentPoms, boolean generateFeatures, boolean skipInstallFeature,
-                Set<String> compileArtifactPaths, Set<String> testArtifactPaths, List<Path> webResourceDirs) throws IOException {
+                Set<String> compileArtifactPaths, Set<String> testArtifactPaths, List<Path> webResourceDirs) throws IOException, PluginExecutionException {
             super(new File(project.getBuild().getDirectory()), serverDirectory, sourceDirectory, testSourceDirectory,
                     configDirectory, projectDirectory, multiModuleProjectDirectory, resourceDirs, hotTests, skipTests,
                     skipUTs, skipITs, skipInstallFeature, project.getArtifactId(), serverStartTimeout, verifyTimeout, verifyTimeout,
@@ -312,6 +312,8 @@ public DevMojoUtil(File installDir, File userDir, File serverDirectory, File sou
             ServerFeatureUtil servUtil = getServerFeatureUtil(true, libertyDirPropertyFiles);           
             this.existingFeatures = servUtil.getServerFeatures(serverDirectory, libertyDirPropertyFiles);
             this.upstreamMavenProjects = upstreamMavenProjects;
+
+            setContainerEngine(this);
         }
 
         @Override
@@ -1471,7 +1473,7 @@ private void doDevMode() throws MojoExecutionException {
                     configDirectory, project.getBasedir(), multiModuleProjectDirectory, resourceDirs, compilerOptions,
                     settings.getLocalRepository(), upstreamProjects, upstreamMavenProjects, recompileDeps, pom, parentPoms, 
                     generateFeatures, skipInstallFeature, compileArtifactPaths, testArtifactPaths, webResourceDirs);
-        } catch (IOException | DependencyResolutionRequiredException e) {
+        } catch (IOException | PluginExecutionException |DependencyResolutionRequiredException e) {
             throw new MojoExecutionException("Error initializing dev mode.", e);
         }