Issue warning for empty feature and remove from collection (#831)

* Issue warning for empty feature and remove from collection * Remove yaml change for common branch
OpenLiberty · Jun 5, 2023 · 9848d25 · 9848d25
1 parent 540ba55
commit 9848d25
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -60,7 +60,7 @@ compileTestGroovy {
 }
 
 def libertyAntVersion = "1.9.12"
-def libertyCommonVersion = "1.8.24"
+def libertyCommonVersion = "1.8.25-SNAPSHOT"
 
 dependencies {
     implementation gradleApi()

diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/AbstractFeatureTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/AbstractFeatureTask.groovy
@@ -234,7 +234,7 @@ public class AbstractFeatureTask extends AbstractServerTask {
             serverFeatures = util.getServerFeatures(getServerDir(project), getLibertyDirectoryPropertyFiles(null))
         }
 
-        Set<String> featuresToInstall = InstallFeatureUtil.combineToSet(pluginListedFeatures, dependencyFeatures, serverFeatures)
+        Set<String> featuresToInstall = util.combineToSet(pluginListedFeatures, dependencyFeatures, serverFeatures)
         return featuresToInstall
     }