GitHub Actions Test for ci.common 33-SNAPSHOT

.github/workflows/maven.yml

@@ -45,11 +45,12 @@ jobs:
       with:
         tool-cache: false
         large-packages: false
-    - name: Checkout ci.common
+    - name: Checkout dshimo ci.common
       uses: actions/checkout@v3
       with:
-        repository: OpenLiberty/ci.common
+        repository: dshimo/ci.common
         path: ci.common
+        ref: varProcessing
     - name: Checkout ci.ant
       uses: actions/checkout@v3
       with:
@@ -102,7 +103,7 @@ jobs:
     - name: Clone ci.ant, ci.common, ci.maven repos to C drive
       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 -b varProcessing --single-branch https://github.com/dshimo/ci.common.git C:/ci.common
         git clone https://github.com/OpenLiberty/ci.ant.git C:/ci.ant
     - name: Set up Maven
       uses: stCarolas/[email protected]

liberty-maven-plugin/pom.xml

@@ -88,7 +88,7 @@
         <dependency>
             <groupId>io.openliberty.tools</groupId>
             <artifactId>ci.common</artifactId>
-            <version>1.8.32</version>
+            <version>1.8.33-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.twdata.maven</groupId>

liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/applications/DeployMojoSupport.java

@@ -308,15 +308,11 @@ protected void verifyAppStarted(String appFile) throws MojoExecutionException {
         if (shouldValidateAppStart()) {
             String appName = appFile.substring(0, appFile.lastIndexOf('.'));
             if (getAppsDirectory().equals("apps")) {
-
-                File serverXML = new File(serverDirectory, "server.xml");
-
                 try {
                     Map<String, File> libertyDirPropertyFiles = getLibertyDirectoryPropertyFiles();
                     CommonLogger logger = new CommonLogger(getLog());
                     setLog(logger.getLog());
-                    getServerConfigDocument(logger, serverXML, configDirectory,
-                            bootstrapPropertiesFile, combinedBootstrapProperties, serverEnvFile, false, libertyDirPropertyFiles);
+                    getServerConfigDocument(logger, libertyDirPropertyFiles);
 
                     //appName will be set to a name derived from appFile if no name can be found.
                     appName = scd.findNameForLocation(appFile);

liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/applications/UndeployAppMojo.java

@@ -131,13 +131,10 @@ protected void undeployApp(File file) throws MojoExecutionException {
         if (getAppsDirectory().equals("apps")) {
 
             try {
-                File serverXML = new File(serverDirectory.getCanonicalPath(), "server.xml");
-
                 Map<String, File> libertyDirPropertyFiles = getLibertyDirectoryPropertyFiles();
                 CommonLogger logger = new CommonLogger(getLog());
                 setLog(logger.getLog());
-                getServerConfigDocument(logger, serverXML, configDirectory,
-                bootstrapPropertiesFile, combinedBootstrapProperties, serverEnvFile, false, libertyDirPropertyFiles);
+                getServerConfigDocument(logger, libertyDirPropertyFiles);
 
                 //appName will be set to a name derived from file if no name can be found.
                 appName = scd.findNameForLocation(appName);

liberty-maven-plugin/src/main/java/io/openliberty/tools/maven/server/PluginConfigSupport.java

@@ -374,9 +374,7 @@ protected Set<String> getAppConfigLocationsFromSourceServerXml() {
             Map<String, File> libertyDirPropertyFiles = getLibertyDirectoryPropertyFiles();
             CommonLogger logger = new CommonLogger(getLog());
             setLog(logger.getLog());
-            scd = getServerConfigDocument(logger, serverXML, configDirectory,
-                        bootstrapPropertiesFile, combinedBootstrapProperties, serverEnvFile, false,
-                        libertyDirPropertyFiles);
+            scd = getServerConfigDocument(logger, libertyDirPropertyFiles);
             } catch (Exception e) {
                 getLog().warn(e.getLocalizedMessage());
                 getLog().debug(e);
@@ -385,6 +383,7 @@ protected Set<String> getAppConfigLocationsFromSourceServerXml() {
         return scd != null ? scd.getLocations() : new HashSet<String>();
     }
 
+    // Deprecated after ci.common 1.8.33
     protected ServerConfigDocument getServerConfigDocument(CommonLoggerI log, File serverXML, File configDir, File bootstrapFile,
             Map<String, String> bootstrapProp, File serverEnvFile, boolean giveConfigDirPrecedence, Map<String, File> libertyDirPropertyFiles) throws IOException {
         if (scd == null || !scd.getServerXML().getCanonicalPath().equals(serverXML.getCanonicalPath())) {
@@ -394,6 +393,10 @@ protected ServerConfigDocument getServerConfigDocument(CommonLoggerI log, File s
         return scd;
     }
 
+    protected ServerConfigDocument getServerConfigDocument(CommonLoggerI log, Map<String, File> libertyDirPropertyFiles) throws IOException {
+        return new ServerConfigDocument(log, libertyDirPropertyFiles);
+    }
+
     protected String getAppsDirectory() {
         return getAppsDirectory(true);
     }