Merge pull request OpenLiberty#1846 from cherylking/bumpLibertyVersio…

…n240011 Test with 24.0.0.11 Liberty runtime
arunvenmany-ibm · Nov 19, 2024 · 333f9c9 · 333f9c9
2 parents 53cf892 + 2dba66b
commit 333f9c9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -22,7 +22,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.10]
+        RUNTIME_VERSION: [24.0.0.11]
         java: [21, 17, 11, 8]
         exclude:
         - java: 8
@@ -80,7 +80,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.10]
+        RUNTIME_VERSION: [24.0.0.11]
         java: [21, 17, 11, 8]
         exclude:
         - java: 8

diff --git a/...it/src/test/java/net/wasdev/wlp/test/feature/it/InstallFeaturesVersionlessServerTest.java b/...it/src/test/java/net/wasdev/wlp/test/feature/it/InstallFeaturesVersionlessServerTest.java
@@ -24,9 +24,9 @@ public class InstallFeaturesVersionlessServerTest extends BaseInstallFeature {
     @Test
     public void testInstalledFeatures() throws Exception {
 
-
+        // as of 24.0.0.11 the versionless features no longer get reported as "installed" via productInfo command
+        // check for specific installed versioned features instead
         assertInstalled("appSecurityClient-1.0");
-        assertInstalled("servlet");
         assertInstalled("servlet-4.0");
         assertNotInstalled("beanValidation-2.0");
         assertNotInstalled("couchdb-1.0");

diff --git a/...ava/net/wasdev/wlp/test/feature/it/InstallFeaturesVersionlessWithVersionedServerTest.java b/...ava/net/wasdev/wlp/test/feature/it/InstallFeaturesVersionlessWithVersionedServerTest.java
@@ -26,12 +26,14 @@ public class InstallFeaturesVersionlessWithVersionedServerTest extends BaseInsta
     @Test
     public void testInstalledFeatures() throws Exception {
 
-
-        assertInstalled("beanValidation");
-        assertInstalled("jsp");
+        // as of 24.0.0.11 the versionless features no longer get reported as "installed" via productInfo command
+        // check for specific installed versioned features instead
+        assertInstalled("beanValidation-3.0");
+        assertInstalled("pages-3.0");
         assertInstalled("enterpriseBeans-4.0");
-        assertInstalled("ejb");
-        assertInstalled("jdbc");
+        assertInstalled("enterpriseBeansHome-4.0");
+        assertInstalled("enterpriseBeansRemote-4.0");
+        assertInstalled("jdbc-4.2");
         assertInstalled("servlet-5.0");
 
         Set<String> expectedFeatures = new HashSet<String>();