[issue 113] - Fixing BOMs for WildFly and EAP 7 deployments

Intersmash · Jan 11, 2024 · 0618584 · 0618584
1 parent 6494d70
commit 0618584
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 27 deletions.
diff --git a/...ntersmash-deployments-shared/intersmash-deployments-shared-eap7/eap7-bootable-jar/pom.xml b/...ntersmash-deployments-shared/intersmash-deployments-shared-eap7/eap7-bootable-jar/pom.xml
@@ -16,8 +16,24 @@
     <properties>
         <failOnMissingWebXml>false</failOnMissingWebXml>
         <formatting-style-base-directory>${project.parent.parent.parent.parent.basedir}/ide-config</formatting-style-base-directory>
+        <!--
+            Default version for the Bootable JAR Plugin is set here and can be overridden
+        -->
+        <version.wildfly-jar-maven-plugin>9.0.0.Final</version.wildfly-jar-maven-plugin>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.jboss.bom</groupId>
+                <artifactId>jboss-eap-xp-microprofile</artifactId>
+                <version>${jboss-eap7-xp.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.eclipse.microprofile.config</groupId>

diff --git a/deployments/intersmash-deployments-shared/intersmash-deployments-shared-eap7/pom.xml b/deployments/intersmash-deployments-shared/intersmash-deployments-shared-eap7/pom.xml
@@ -20,17 +20,13 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- Default EAP 7 version -->
         <jboss-eap7.version>7.4.13.GA</jboss-eap7.version>
+        <jboss-eap7-xp.version>4.0.1.GA-7.4.13.GA</jboss-eap7-xp.version>
         <!-- Default EAP `ee` BOMs version is set here for pulling the right EAP BOM -->
         <bom.jboss-eap7-jakartaee.groupId>org.jboss.bom</bom.jboss-eap7-jakartaee.groupId>
         <bom.jboss-eap7-jakartaee.artifactId>jboss-eap-jakartaee8</bom.jboss-eap7-jakartaee.artifactId>
         <bom.jboss-eap7-jakartaee.version>${jboss-eap7.version}</bom.jboss-eap7-jakartaee.version>
 
         <eap7.ee-feature-pack.location>org.jboss.eap:wildfly-galleon-pack:7.3.10.GA-redhat-00003</eap7.ee-feature-pack.location>
-        <!--
-            Default version for the Bootable JAR Plugin is set here and can be overridden
-        -->
-        <version.wildfly-jar-maven-plugin>9.0.0.Final</version.wildfly-jar-maven-plugin>
-        <version.microprofile-config-api>1.3</version.microprofile-config-api>
     </properties>
 
     <modules>
@@ -48,13 +44,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <!-- Used by EAP 7 bootable-jar app-->
-            <dependency>
-                <groupId>org.eclipse.microprofile.config</groupId>
-                <artifactId>microprofile-config-api</artifactId>
-                <version>${version.microprofile-config-api}</version>
-                <scope>provided</scope>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -191,6 +180,7 @@
             </build>
         </profile>
         <profile>
+            <!-- We could leverage this activation to generate a parallel Bootable JAR for bare metal-->
             <id>bootable-jar-baremetal</id>
             <activation>
                 <file>

diff --git a/deployments/intersmash-deployments-shared/intersmash-deployments-shared-wildfly/pom.xml b/deployments/intersmash-deployments-shared/intersmash-deployments-shared-wildfly/pom.xml
@@ -17,19 +17,15 @@
     <properties>
         <version.microprofile-config-api>1.3</version.microprofile-config-api>
 
-        <!--
-            Default version for the Bootable JAR Plugin is set here and can be overridden, e.g. also for pulling
-            the productized version
-        -->
-        <version.wildfly-jar-maven-plugin>10.0.0.Final</version.wildfly-jar-maven-plugin>
+        <version.wildfly-server>29.0.1.Final</version.wildfly-server>
         <!-- WildFly Maven Plugin coordinates -->
         <wildfly-maven-plugin.groupId>org.wildfly.plugins</wildfly-maven-plugin.groupId>
         <wildfly-maven-plugin.artifactId>wildfly-maven-plugin</wildfly-maven-plugin.artifactId>
         <wildfly-maven-plugin.version>4.2.0.Final</wildfly-maven-plugin.version>
         <!-- Default WildFly `ee` BOMs version is set here and can be overridden for pulling the right BOM -->
         <bom.wildfly-ee.groupId>org.wildfly.bom</bom.wildfly-ee.groupId>
         <bom.wildfly-ee.artifactId>wildfly-ee</bom.wildfly-ee.artifactId>
-        <bom.wildfly-ee.version>29.0.1.Final</bom.wildfly-ee.version>
+        <bom.wildfly-ee.version>${version.wildfly-server}</bom.wildfly-ee.version>
         <!--
             Feature packs and channel:
 
@@ -39,8 +35,8 @@
 
             Note: WF builds have both `wildfly-galleon-pack` and  `wildfly-ee-galleon-pack`
         -->
-        <wildfly.feature-pack.location>org.wildfly:wildfly-galleon-pack:29.0.1.Final</wildfly.feature-pack.location>
-        <wildfly.ee-feature-pack.location>org.wildfly:wildfly-ee-galleon-pack:29.0.1.Final</wildfly.ee-feature-pack.location>
+        <wildfly.feature-pack.location>org.wildfly:wildfly-galleon-pack:${version.wildfly-server}</wildfly.feature-pack.location>
+        <wildfly.ee-feature-pack.location>org.wildfly:wildfly-ee-galleon-pack:${version.wildfly-server}</wildfly.ee-feature-pack.location>
         <wildfly.cloud-feature-pack.location>org.wildfly.cloud:wildfly-cloud-galleon-pack:4.0.3.Final</wildfly.cloud-feature-pack.location>
     </properties>
 
@@ -59,13 +55,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <!-- Used by WildFly bootable-jar app-->
-            <dependency>
-                <groupId>org.eclipse.microprofile.config</groupId>
-                <artifactId>microprofile-config-api</artifactId>
-                <version>${version.microprofile-config-api}</version>
-                <scope>provided</scope>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/...ash-deployments-shared/intersmash-deployments-shared-wildfly/wildfly-bootable-jar/pom.xml b/...ash-deployments-shared/intersmash-deployments-shared-wildfly/wildfly-bootable-jar/pom.xml
@@ -16,8 +16,25 @@
     <properties>
         <failOnMissingWebXml>false</failOnMissingWebXml>
         <formatting-style-base-directory>${project.parent.parent.parent.parent.basedir}/ide-config</formatting-style-base-directory>
+        <!--
+            Default version for the Bootable JAR Plugin is set here and can be overridden, e.g. also for pulling
+            the productized version
+        -->
+        <version.wildfly-jar-maven-plugin>10.0.0.Final</version.wildfly-jar-maven-plugin>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.wildfly.bom</groupId>
+                <artifactId>wildfly-microprofile</artifactId>
+                <version>${version.wildfly-server}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.eclipse.microprofile.config</groupId>