From 1a4f68f24c71b337cbc9afa14176609e8aa3f2fb Mon Sep 17 00:00:00 2001 From: Kathryn Kodama Date: Thu, 16 Dec 2021 11:30:34 -0500 Subject: [PATCH 1/2] Gradle 7 fix for ServerFeatureUtil Signed-off-by: Kathryn Kodama --- .../io/openliberty/tools/gradle/tasks/AbstractFeatureTask.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/AbstractFeatureTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/AbstractFeatureTask.groovy index e2b0a2d7..6617ed43 100644 --- a/src/main/groovy/io/openliberty/tools/gradle/tasks/AbstractFeatureTask.groovy +++ b/src/main/groovy/io/openliberty/tools/gradle/tasks/AbstractFeatureTask.groovy @@ -195,6 +195,7 @@ public class AbstractFeatureTask extends AbstractServerTask { return featuresToInstall } + @Internal protected ServerFeatureUtil getServerFeatureUtil() { if (servUtil == null) { servUtil = new ServerFeatureTaskUtil(); From 51a13ab12126c081bd282d8e5a937b7e476e5bff Mon Sep 17 00:00:00 2001 From: Kathryn Kodama Date: Thu, 16 Dec 2021 14:56:30 -0500 Subject: [PATCH 2/2] Use project compileClasspath for determining MP and EE versions in generateFeatures Signed-off-by: Kathryn Kodama --- .../tools/gradle/tasks/GenerateFeaturesTask.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/groovy/io/openliberty/tools/gradle/tasks/GenerateFeaturesTask.groovy b/src/main/groovy/io/openliberty/tools/gradle/tasks/GenerateFeaturesTask.groovy index 33f1be03..f35bb407 100644 --- a/src/main/groovy/io/openliberty/tools/gradle/tasks/GenerateFeaturesTask.groovy +++ b/src/main/groovy/io/openliberty/tools/gradle/tasks/GenerateFeaturesTask.groovy @@ -277,7 +277,7 @@ class GenerateFeaturesTask extends AbstractFeatureTask { private getEEVersion(Object project) { String eeVersion = null - project.configurations.compile.allDependencies.each { + project.configurations.compileClasspath.allDependencies.each { dependency -> if (dependency.group.equals("javax") && dependency.name.equals("javaee-api")) { if (dependency.version.startsWith("8.")) { @@ -298,7 +298,7 @@ class GenerateFeaturesTask extends AbstractFeatureTask { private getMPVersion(Object project) { String mpVersion = null - project.configurations.compile.allDependencies.each { + project.configurations.compileClasspath.allDependencies.each { if (it.group.equals("org.eclipse.microprofile") && it.name.equals("microprofile")) { if (it.version.startsWith("1")) {