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.

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

Change min version for versionless features #914

Merged
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
9 changes: 5 additions & 4 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
matrix:
# test against latest update of each major Java version, as well as specific updates of LTS versions:
RUNTIME: [ol, wlp]
RUNTIME_VERSION: [24.0.0.9]
RUNTIME_VERSION: [24.0.0.10]
java: [21, 17, 11, 8]
exclude:
- java: 8
Expand All @@ -39,7 +39,8 @@ jobs:
- name: Checkout ci.common
uses: actions/checkout@v3
with:
repository: OpenLiberty/ci.common
repository: cherylking/ci.common
ref: changeMinVersionForVersionlessFeatures
path: ci.common
- name: Checkout ci.ant
uses: actions/checkout@v3
Expand Down Expand Up @@ -100,7 +101,7 @@ jobs:
matrix:
# test against latest update of each major Java version, as well as specific updates of LTS versions:
RUNTIME: [ol, wlp]
RUNTIME_VERSION: [24.0.0.9]
RUNTIME_VERSION: [24.0.0.10]
java: [21, 17, 11, 8]
exclude:
- java: 8
Expand All @@ -124,7 +125,7 @@ jobs:
- name: Clone ci.ant, ci.common, ci.gradle repos to C drive
run: |
cp -r D:/a/ci.gradle/ci.gradle C:/ci.gradle
git clone https://github.com/OpenLiberty/ci.common.git C:/ci.common
git clone https://github.com/cherylking/ci.common.git --branch changeMinVersionForVersionlessFeatures --single-branch C:/ci.common
git clone https://github.com/OpenLiberty/ci.ant.git C:/ci.ant
# Cache mvn/gradle packages
- name: Cache Maven packages
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ apply plugin: "com.gradle.plugin-publish"
apply plugin: 'base'

group = 'io.openliberty.tools'
version = '3.8.4-SNAPSHOT'
version = '3.9.0-SNAPSHOT'
base {
archivesName='liberty-gradle-plugin'
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ class KernelInstallVersionlessFeatureTest extends AbstractIntegrationTest{
// expect failure - check for error message
BuildResult result = runTasksFailResult(buildDir, "installFeature")
String output = result.getOutput()
assertTrue(output.contains("PluginExecutionException: Detected versionless feature(s) for installation. The minimum required Liberty version for versionless feature support is 24.0.0.9"))
assertTrue(output.contains("PluginExecutionException: Detected versionless feature(s) for installation. The minimum required Liberty version for versionless feature support is 24.0.0.10"))
}

@Test
Expand All @@ -123,17 +123,16 @@ class KernelInstallVersionlessFeatureTest extends AbstractIntegrationTest{
// expect failure - check for error message
BuildResult result = runTasksFailResult(buildDir, "installFeature")
String output = result.getOutput()
assertTrue(output.contains("Detected possible versionless feature(s) for installation. The minimum required Liberty version for versionless feature support is 24.0.0.9"))
assertTrue(output.contains("Detected possible versionless feature(s) for installation. The minimum required Liberty version for versionless feature support is 24.0.0.10"))

String messageWL = "PluginExecutionException: CWWKF1203E: Unable to obtain the following features: ejb. Ensure that the features are valid."
String messageOL = "PluginExecutionException: CWWKF1299E: The following features could not be obtained: ejb. Ensure that the features are valid for Open Liberty."
assertTrue(output.contains(messageOL) || output.contains(messageWL))
}

//@Test
// Commented out because current failure returns
// "Cannot invoke "com.ibm.ws.kernel.feature.provisioning.ProvisioningFeatureDefinition.getSymbolicName()" because the return value of "java.util.HashMap.get(Object)" is null"
// Opened issue https://github.com/OpenLiberty/ci.common/issues/452 to follow up.
@Test
// This test required a fix that is in 24.0.0.10.
// Opened issue https://github.com/OpenLiberty/ci.common/issues/452 for it.
/**
* Install with only server.xml features
*/
Expand Down
Loading