Bump to WildFly 29.0.1.Final

wildfly-extras · Sep 20, 2023 · c4f8c03 · c4f8c03
1 parent 7b0e8f8
commit c4f8c03
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 16 deletions.
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -12,7 +12,7 @@
     <properties>
         <version.bootable.jar>10.0.1.Final-SNAPSHOT</version.bootable.jar>
         <version.keycloak>18.0.2</version.keycloak>
-        <version.wildfly>29.0.0.Final</version.wildfly>
+        <version.wildfly>29.0.1.Final</version.wildfly>
         <version.wildfly.datasources.galleon-pack>5.0.0.Final</version.wildfly.datasources.galleon-pack>
         <version.jkube>1.0.1</version.jkube>
         <plugin.fork.embedded>true</plugin.fork.embedded>

diff --git a/pom.xml b/pom.xml
@@ -54,7 +54,7 @@
     <!-- Require Java 11 -->
     <maven.compiler.target>11</maven.compiler.target>
     <maven.compiler.source>11</maven.compiler.source>
-    <version.wildfly>29.0.0.Final</version.wildfly>
+    <version.wildfly>29.0.1.Final</version.wildfly>
     <!-- docs properties -->
     <docs.project.branch>main</docs.project.branch>
     <docs.wildfly.major>29.0</docs.wildfly.major>
@@ -96,7 +96,7 @@
     <test.fpl>wildfly@maven(org.jboss.universe:community-universe)#${version.wildfly}</test.fpl>
     <test.ee.fpl>wildfly-ee@maven(org.jboss.universe:community-universe)#${version.wildfly}</test.ee.fpl>
     <test.version.wildfly>${version.wildfly}</test.version.wildfly>
-    <test.version.wildfly-ee.upgrade>27.0.1.Final</test.version.wildfly-ee.upgrade>
+    <test.version.wildfly-ee.upgrade>29.0.0.Final</test.version.wildfly-ee.upgrade>
     <test.patch.ee.product>WildFly EE</test.patch.ee.product>
     <test.patch.product>WildFly Full</test.patch.product>
     <test.patch.version>${version.wildfly}</test.patch.version>

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -200,12 +200,6 @@
                                 <test.default.cloud.config>${test.default.ee.cloud.config}</test.default.cloud.config>
                                 <test.patch.product>${test.patch.ee.product}</test.patch.product>
                             </systemPropertyVariables>
-                            <excludes>
-                                <!-- This test upgrades the wildfly-ee dependency that is not a dependency when provisioning wildfly-ee -->
-                                <exclude>org.wildfly.plugins.bootablejar.maven.goals.UpgradeArtifactFPLTestCase.java</exclude>
-                                <!-- We can't mix an FP dep that packages configgen in the FP zip. It is not compatible -->
-                                <exclude>org.wildfly.plugins.bootablejar.maven.goals.UpgradeArtifactTestCase.java</exclude>
-                            </excludes>
                             <includes>
                                 <!-- Other tests would be redundant with wildfly-ee-galleon-pack -->
                                 <include>org.wildfly.plugins.bootablejar.maven.goals.DefaultCloudConfigurationExcludeLayerTestCase</include>
@@ -235,11 +229,6 @@
                                 <test.default.cloud.config>${test.default.cloud.config}</test.default.cloud.config>
                                 <test.patch.product>${test.patch.product}</test.patch.product>
                             </systemPropertyVariables>
-                            <excludes>
-                                <!-- We can't mix an FP dep that packages config-gen in the FP zip. It is not compatible -->
-                                <exclude>org.wildfly.plugins.bootablejar.maven.goals.UpgradeArtifactTestCase.java</exclude>
-                                <exclude>org.wildfly.plugins.bootablejar.maven.goals.UpgradeArtifactFPLTestCase.java</exclude>
-                            </excludes>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/...src/test/java/org/wildfly/plugins/bootablejar/maven/goals/UpgradeArtifactFPLTestCase.java b/...src/test/java/org/wildfly/plugins/bootablejar/maven/goals/UpgradeArtifactFPLTestCase.java
@@ -59,7 +59,7 @@ public void testUpgrade() throws Exception {
         Path unzippedJar = checkAndGetWildFlyHome(dir, true, true, layers, null, mojo.recordState);
         try {
             Path modulesDir = unzippedJar.resolve("modules").resolve("system").resolve("layers").resolve("base");
-            Path ee = modulesDir.resolve("org").resolve("jboss").resolve("as").resolve("ee").resolve("main").resolve("wildfly-ee-jakarta-" + wildflyeeVersion + ".jar");
+            Path ee = modulesDir.resolve("org").resolve("jboss").resolve("as").resolve("ee").resolve("main").resolve("wildfly-ee-" + wildflyeeVersion + ".jar");
             Assert.assertTrue(ee.toString(), Files.exists(ee));
         } finally {
             BuildBootableJarMojo.deleteDir(unzippedJar);

diff --git a/tests/src/test/java/org/wildfly/plugins/bootablejar/maven/goals/UpgradeArtifactTestCase.java b/tests/src/test/java/org/wildfly/plugins/bootablejar/maven/goals/UpgradeArtifactTestCase.java
@@ -76,7 +76,7 @@ public void testUpgrade() throws Exception {
             Path modulesDir = unzippedJar.resolve("modules").resolve("system").resolve("layers").resolve("base");
             Path undertow = modulesDir.resolve("io").resolve("undertow").resolve("core").resolve("main").resolve("undertow-core-" + undertowVersion + ".jar");
             Assert.assertTrue(undertow.toString(), Files.exists(undertow));
-            Path ee = modulesDir.resolve("org").resolve("jboss").resolve("as").resolve("ee").resolve("main").resolve("wildfly-ee-jakarta-" + wildflyeeVersion + ".jar");
+            Path ee = modulesDir.resolve("org").resolve("jboss").resolve("as").resolve("ee").resolve("main").resolve("wildfly-ee-" + wildflyeeVersion + ".jar");
             Assert.assertTrue(ee.toString(), Files.exists(ee));
             Assert.assertTrue(ee.toString(), Files.exists(ee));
         } finally {