Prototype installing interim fixes

OpenLiberty · Oct 1, 2023 · 68c12b3 · 68c12b3
1 parent b7ff292
commit 68c12b3
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 4 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -53,7 +53,8 @@ jobs:
     - name: Checkout ci.ant
       uses: actions/checkout@v3
       with:
-        repository: OpenLiberty/ci.ant
+        repository: cherylking/ci.ant
+        ref: addIfixSupport
         path: ci.ant
     - name: Set up Maven
       uses: stCarolas/[email protected]
@@ -99,7 +100,7 @@ jobs:
       run: |
         cp -r D:/a/ci.maven/ci.maven C:/ci.maven
         git clone https://github.com/OpenLiberty/ci.common.git C:/ci.common
-        git clone https://github.com/OpenLiberty/ci.ant.git C:/ci.ant
+        git clone https://github.com/cherylking/ci.ant.git --branch addIfixSupport --single-branch C:/ci.ant
     - name: Set up Maven
       uses: stCarolas/[email protected]
       with:

diff --git a/liberty-maven-plugin/pom.xml b/liberty-maven-plugin/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>io.openliberty.tools</groupId>
             <artifactId>liberty-ant-tasks</artifactId>
-            <version>1.9.13</version>
+            <version>1.9.14-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.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
@@ -43,6 +43,7 @@
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
 
+import io.openliberty.tools.ant.InstallLibertyInterimFixTask;
 import io.openliberty.tools.ant.install.InstallLibertyTask;
 import io.openliberty.tools.common.plugins.util.ServerFeatureUtil;
 
@@ -93,6 +94,12 @@ public abstract class BasicSupport extends AbstractLibertySupport {
     @Parameter(property = "installDirectory")
     protected File installDirectory;
 
+    /**
+     * Directory containing interim fixes. 
+     */
+    @Parameter(property = "interimFixDirectory")
+    protected File interimFixDirectory;
+
     /**
      * Liberty server name, default is defaultServer
      */
@@ -443,6 +450,7 @@ protected void installServerAssembly() throws MojoExecutionException, IOExceptio
                 installFromFile();
             }
             installLicense();
+            installInterimFixes(installDirectory, interimFixDirectory);
         }
     }
 
@@ -575,6 +583,41 @@ protected void installLicense() throws MojoExecutionException, IOException {
         }
     }
 
+    /**
+     * Executes the InstallLibertyInterimFixTask to install interim fixes located in the specified interimFixDirectory.
+     * 
+     * @param installDirectory
+     *            : Installation directory of Liberty profile.
+     * @param interimFixDirectory
+     *            : Directory containing interim fixes
+     */
+    protected void installInterimFixes(File installDirectory, File interimFixDirectory) throws MojoExecutionException, IOException {
+        if (interimFixDirectory == null) {
+            return;
+        } else if (!interimFixDirectory.isDirectory()) {
+            getLog().warn("The interimFixDirectory is not a directory or does not exist. Interim fixes will not be installed.");
+            return;
+        }
+
+        getLog().info("Installing interim fixes...");
+        io.openliberty.tools.ant.InstallLibertyInterimFixTask iFixTask = (InstallLibertyInterimFixTask) ant
+                .createTask("antlib:io/openliberty/tools/ant:install-fix");
+        if (iFixTask == null) {
+            throw new IllegalStateException(
+                    MessageFormat.format(messages.getString("error.dependencies.not.found"), "install-fix"));
+        }
+
+        iFixTask.setInstallDir(installDirectory);
+        iFixTask.setInterimFixDirectory(interimFixDirectory);
+        iFixTask.setSuppressInfo(false);
+
+        try {
+            iFixTask.execute();
+        } catch (Exception e) {
+            getLog().warn("An error occurred when installing the Liberty interim fixes: "+e.getMessage());
+            getLog().debug("Exception received: "+e.getMessage(), (Throwable) e);
+        }
+    }
     /*
      * Handle cleaning up all three possible locations for applications, and check for both stripped and non-stripped file name in 
      * case that setting has been modified.

diff --git a/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/utils/ExecuteMojoUtil.java b/liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/utils/ExecuteMojoUtil.java
@@ -201,7 +201,7 @@ public class ExecuteMojoUtil {
                     "version"));
 
     private static final ArrayList<String> LIBERTY_COMMON_PARAMS = new ArrayList<>(Arrays.asList(
-            "installDirectory", "assemblyArchive", "assemblyArtifact", "libertyRuntimeVersion",
+            "installDirectory", "interimFixDirectory", "assemblyArchive", "assemblyArtifact", "libertyRuntimeVersion",
             "install", "licenseArtifact", "serverName", "userDirectory", "outputDirectory",
             "assemblyInstallDirectory", "refresh", "skip", "serverXmlFile", "configDirectory", 
             "serverEnvFile", "mergeServerEnv"