Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Gradle 7 fix for ServerFeatureUtil #681

Merged
merged 2 commits into from
Dec 17, 2021
Merged

Gradle 7 fix for ServerFeatureUtil #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a4f68f
Gradle 7 fix for ServerFeatureUtil
kathrynkodama Dec 16, 2021
51a13ab
Use project compileClasspath for determining MP and EE versions in ge…
kathrynkodama Dec 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/groovy/io/openliberty/tools/gradle/tasks/AbstractFeatureTask.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ public class AbstractFeatureTask extends AbstractServerTask {
return featuresToInstall
}

@Internal
protected ServerFeatureUtil getServerFeatureUtil() {
if (servUtil == null) {
servUtil = new ServerFeatureTaskUtil();
Expand Down
4 changes: 2 additions & 2 deletions src/main/groovy/io/openliberty/tools/gradle/tasks/GenerateFeaturesTask.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.")) {
Expand All @@ -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")) {
Expand Down