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

Compose parameters for binary scanner from umbrella version numbers in build file #767

Merged
merged 3 commits into from
Jun 30, 2022
Merged

Compose parameters for binary scanner from umbrella version numbers in build file #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8c1308
Call BinaryScannerUtil to compose the parameters rather than use the …
turkeylurkey Jun 9, 2022
b726fbc
Use latest ci.common.
turkeylurkey Jun 23, 2022
785adc1
Simplify the code to detect Java and Jakarta EE.
turkeylurkey Jun 29, 2022
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
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ compileTestGroovy {
}

def libertyAntVersion = "1.9.10"
def libertyCommonVersion = "1.8.21"
def libertyCommonVersion = "1.8.22-SNAPSHOT"

dependencies {
implementation gradleApi()
Expand Down
35 changes: 9 additions & 26 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 @@ -334,23 +334,17 @@ class GenerateFeaturesTask extends AbstractFeatureTask {
String eeVersion = null
project.configurations.compileClasspath.allDependencies.each {
dependency ->
if (dependency.group.equals("javax") && dependency.name.equals("javaee-api")) {
if (dependency.version.startsWith("8.")) {
eeVersion = BINARY_SCANNER_EEV8
} else if (dependency.version.startsWith("7.") && (isLatestVersion(eeVersion, BINARY_SCANNER_EEV7))) {
eeVersion = BINARY_SCANNER_EEV7
} else if (dependency.version.startsWith("6.") && (isLatestVersion(eeVersion, BINARY_SCANNER_EEV6))) {
eeVersion = BINARY_SCANNER_EEV6
if ((dependency.group.equals("javax") && dependency.name.equals("javaee-api")) ||
(dependency.group.equals("jakarta.platform") &&
dependency.name.equals("jakarta.jakartaee-api"))) {
String newVersion = composeEEVersion(dependency.version)
if (newVersion != null && isLatestVersion(eeVersion, newVersion)) {
eeVersion = newVersion
}
} else if (dependency.group.equals("jakarta.platform") &&
dependency.name.equals("jakarta.jakartaee-api") &&
dependency.version.startsWith("8.")) {
eeVersion = BINARY_SCANNER_EEV8
}
}
return eeVersion;
}

/**
* Returns the latest MicroProfile major version detected in the project dependencies
*
Expand All @@ -363,20 +357,9 @@ class GenerateFeaturesTask extends AbstractFeatureTask {
dependency ->
if (dependency.group.equals("org.eclipse.microprofile") &&
dependency.name.equals("microprofile")) {
String version = null;
if (dependency.version.length() == 3) { // version is 'm.n'
version = BINARY_SCANNER_MP.get(dependency.version);
}
if ((version != null) && (isLatestVersion(mpVersion, version))) {
mpVersion = version;
} else if (dependency.version.startsWith("1") && (isLatestVersion(mpVersion, BINARY_SCANNER_MPV1))) {
mpVersion = BINARY_SCANNER_MPV1
} else if (dependency.version.startsWith("2") && (isLatestVersion(mpVersion, BINARY_SCANNER_MPV2))) {
mpVersion = BINARY_SCANNER_MPV2
} else if (dependency.version.startsWith("3") && (isLatestVersion(mpVersion, BINARY_SCANNER_MPV3))) {
mpVersion = BINARY_SCANNER_MPV3
} else if (dependency.version.startsWith("4")) {
mpVersion = BINARY_SCANNER_MPV4
String newVersion = composeMPVersion(dependency.version)
if (newVersion != null && isLatestVersion(mpVersion, newVersion)) {
mpVersion = newVersion;
}
}
}
Expand Down