Skip to content

Commit

Permalink
Merge pull request #370 from jfdenise/main
Browse files Browse the repository at this point in the history 
Fix for Issue #369, bump to WildFly 29.0.1.Final
  • Loading branch information
@jfdenise
jfdenise authored Sep 26, 2023
2 parents 312e991 + c4f8c03 commit 3ca6e2d
Show file tree
Hide file tree
Showing 15 changed files with 15 additions and 16 deletions.
1 change: 1 addition & 0 deletions examples/arquillian/jaxrs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
<configuration>
<feature-pack-location>wildfly@maven(org.jboss.universe:community-universe)#${version.wildfly}</feature-pack-location>
<layers>
<layer>bean-validation</layer>
<layer>jaxrs</layer>
<layer>management</layer>
</layers>
Expand Down
1 change: 1 addition & 0 deletions examples/jaxrs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<configuration>
<feature-pack-location>wildfly@maven(org.jboss.universe:community-universe)#${version.wildfly}</feature-pack-location>
<layers>
<layer>bean-validation</layer>
<layer>jaxrs</layer>
<layer>management</layer>
</layers>
Expand Down
1 change: 1 addition & 0 deletions examples/jib-layers/server-layer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<configuration>
<feature-pack-location>wildfly@maven(org.jboss.universe:community-universe)#${version.wildfly}</feature-pack-location>
<layers>
<layer>bean-validation</layer>
<layer>jaxrs</layer>
<layer>management</layer>
</layers>
Expand Down
1 change: 1 addition & 0 deletions examples/jib/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
<configuration>
<feature-pack-location>wildfly@maven(org.jboss.universe:community-universe)#${version.wildfly}</feature-pack-location>
<layers>
<layer>bean-validation</layer>
<layer>jaxrs</layer>
<layer>management</layer>
</layers>
Expand Down
1 change: 1 addition & 0 deletions examples/logging/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
</cli-sessions>
<feature-pack-location>wildfly@maven(org.jboss.universe:community-universe)#${version.wildfly}</feature-pack-location>
<layers>
<layer>bean-validation</layer>
<layer>jaxrs</layer>
<layer>logging</layer>
<layer>management</layer>
Expand Down
1 change: 1 addition & 0 deletions examples/microprofile-config/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
<configuration>
<feature-pack-location>wildfly@maven(org.jboss.universe:community-universe)#${version.wildfly}</feature-pack-location>
<layers>
<layer>bean-validation</layer>
<layer>jaxrs</layer>
<layer>observability</layer>
</layers>
Expand Down
2 changes: 1 addition & 1 deletion examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions examples/secmanager/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<configuration>
<feature-pack-location>wildfly@maven(org.jboss.universe:community-universe)#${version.wildfly}</feature-pack-location>
<layers>
<layer>bean-validation</layer>
<layer>security-manager</layer>
<layer>jaxrs</layer>
</layers>
Expand Down
1 change: 1 addition & 0 deletions examples/slim/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<configuration>
<feature-pack-location>wildfly@maven(org.jboss.universe:community-universe)#${version.wildfly}</feature-pack-location>
<layers>
<layer>bean-validation</layer>
<layer>jaxrs</layer>
</layers>
<excluded-layers>
Expand Down
1 change: 1 addition & 0 deletions examples/web-console/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<configuration>
<feature-pack-location>wildfly@maven(org.jboss.universe:community-universe)#${version.wildfly}</feature-pack-location>
<layers>
<layer>bean-validation</layer>
<layer>jaxrs</layer>
<layer>web-console</layer>
</layers>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
11 changes: 0 additions & 11 deletions tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...src/test/java/org/wildfly/plugins/bootablejar/maven/goals/UpgradeArtifactFPLTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion tests/src/test/java/org/wildfly/plugins/bootablejar/maven/goals/UpgradeArtifactTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions tests/src/test/resources/projects/jaxrs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
<configuration>
<feature-pack-location>TEST_REPLACE</feature-pack-location>
<layers>
<layer>bean-validation</layer>
<layer>jaxrs</layer>
<layer>management</layer>
<layer>logging</layer>
Expand Down

0 comments on commit 3ca6e2d

Please sign in to comment.