From 409677f4a723c8441efe82af76adebdffd42520a Mon Sep 17 00:00:00 2001
From: Cheryl King <cheryllk@us.ibm.com>
Date: Mon, 5 Jun 2023 11:05:56 -0500
Subject: [PATCH 1/3] Issue warning for empty feature and remove from
 collection

---
 .github/workflows/maven.yml                                  | 5 +++--
 liberty-maven-plugin/pom.xml                                 | 2 +-
 .../io/openliberty/tools/maven/InstallFeatureSupport.java    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index dc05206a3..4b9d8b5b0 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -43,7 +43,8 @@ jobs:
     - name: Checkout ci.common
       uses: actions/checkout@v3
       with:
-        repository: OpenLiberty/ci.common
+        repository: cherylking/ci.common
+        ref: warnEmptyFeature
         path: ci.common
     - name: Checkout ci.ant
       uses: actions/checkout@v3
@@ -98,7 +99,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 https://github.com/cherylking/ci.common.git --branch warnEmptyFeature --single-branch C:/ci.common
         git clone https://github.com/OpenLiberty/ci.ant.git C:/ci.ant
     - name: Cache maven packages
       uses: actions/cache@v3
diff --git a/liberty-maven-plugin/pom.xml b/liberty-maven-plugin/pom.xml
index 905e1a64a..e2dfb2247 100644
--- a/liberty-maven-plugin/pom.xml
+++ b/liberty-maven-plugin/pom.xml
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>io.openliberty.tools</groupId>
             <artifactId>ci.common</artifactId>
-            <version>1.8.24</version>
+            <version>1.8.25-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.twdata.maven</groupId>
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
index 1b4da99a8..db13a1416 100644
--- 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
@@ -201,7 +201,7 @@ else if (util == null && !noFeaturesSection) {
         else {
             Set<String> dependencyFeatures = getDependencyFeatures();
             Set<String> serverFeatures = serverDirectory.exists() ? util.getServerFeatures(serverDirectory, getLibertyDirectoryPropertyFiles()) : null;
-            return InstallFeatureUtil.combineToSet(pluginListedFeatures, dependencyFeatures, serverFeatures);
+            return util.combineToSet(pluginListedFeatures, dependencyFeatures, serverFeatures);
             
         }
     }

From c2a4043fd77267b92a88819febf323c35ad2ba3a Mon Sep 17 00:00:00 2001
From: Cheryl King <cheryllk@us.ibm.com>
Date: Mon, 5 Jun 2023 11:11:53 -0500
Subject: [PATCH 2/3] Change version to 3.8.1-SNAPSHOT

---
 liberty-maven-app-parent/pom.xml | 2 +-
 liberty-maven-plugin/pom.xml     | 2 +-
 pom.xml                          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/liberty-maven-app-parent/pom.xml b/liberty-maven-app-parent/pom.xml
index 22fd2521e..e1b052b90 100644
--- a/liberty-maven-app-parent/pom.xml
+++ b/liberty-maven-app-parent/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.openliberty.tools</groupId>
         <artifactId>liberty-maven</artifactId>
-        <version>3.9-SNAPSHOT</version>
+        <version>3.8.1-SNAPSHOT</version>
     </parent>
     
     <artifactId>liberty-maven-app-parent</artifactId>
diff --git a/liberty-maven-plugin/pom.xml b/liberty-maven-plugin/pom.xml
index e2dfb2247..b84d8e277 100644
--- a/liberty-maven-plugin/pom.xml
+++ b/liberty-maven-plugin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.openliberty.tools</groupId>
         <artifactId>liberty-maven</artifactId>
-        <version>3.9-SNAPSHOT</version>
+        <version>3.8.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>liberty-maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index bab04c4f6..3295073d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>io.openliberty.tools</groupId>
     <artifactId>liberty-maven</artifactId>
-    <version>3.9-SNAPSHOT</version>
+    <version>3.8.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Liberty Tools for Maven</name>
     <description>

From 62d23e5d653567fe78aff839c0a0f2eb5c9cc545 Mon Sep 17 00:00:00 2001
From: Cheryl King <cheryllk@us.ibm.com>
Date: Mon, 5 Jun 2023 13:20:53 -0500
Subject: [PATCH 3/3] Remove yaml change for common branch

---
 .github/workflows/maven.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 4b9d8b5b0..dc05206a3 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -43,8 +43,7 @@ jobs:
     - name: Checkout ci.common
       uses: actions/checkout@v3
       with:
-        repository: cherylking/ci.common
-        ref: warnEmptyFeature
+        repository: OpenLiberty/ci.common
         path: ci.common
     - name: Checkout ci.ant
       uses: actions/checkout@v3
@@ -99,7 +98,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/cherylking/ci.common.git --branch warnEmptyFeature --single-branch C:/ci.common
+        git clone https://github.com/OpenLiberty/ci.common.git C:/ci.common
         git clone https://github.com/OpenLiberty/ci.ant.git C:/ci.ant
     - name: Cache maven packages
       uses: actions/cache@v3