Merge pull request #876 from emmartins/WFLY-19015

[WFLY-19015] Replaces usage of non-user expansion BOM, with MP BOM
wildfly · Feb 8, 2024 · 1f55d63 · 1f55d63
2 parents 1fb8663 + 2cfe4a4
commit 1f55d63
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/micrometer/pom.xml b/micrometer/pom.xml
@@ -25,6 +25,7 @@
         <version.server>31.0.0.Final</version.server>
         <!-- The versions for the BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
+        <version.bom.microprofile>${version.server}</version.bom.microprofile>
         <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
         <version.plugin.wildfly-jar>10.0.0.Final</version.plugin.wildfly-jar>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
@@ -88,23 +89,22 @@
 
     <dependencyManagement>
         <dependencies>
+            <!-- importing the ee-with-tools BOM adds specs and other useful artifacts as managed dependencies -->
             <dependency>
                 <groupId>org.wildfly.bom</groupId>
                 <artifactId>wildfly-ee-with-tools</artifactId>
                 <version>${version.bom.ee}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-
             <!-- Import micrometer dependency information -->
             <dependency>
-                <groupId>org.wildfly</groupId>
-                <artifactId>wildfly-common-expansion-dependency-management</artifactId>
-                <version>${version.server}</version>
+                <groupId>org.wildfly.bom</groupId>
+                <artifactId>wildfly-microprofile</artifactId>
+                <version>${version.bom.microprofile}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-
         </dependencies>
     </dependencyManagement>
 

diff --git a/opentelemetry-tracing/pom.xml b/opentelemetry-tracing/pom.xml
@@ -23,6 +23,7 @@
         <version.server>31.0.0.Final</version.server>
         <!-- The versions for the BOMs, Packs and Plugins -->
         <version.bom.ee>${version.server}</version.bom.ee>
+        <version.bom.microprofile>${version.server}</version.bom.microprofile>
         <version.plugin.wildfly>4.2.1.Final</version.plugin.wildfly>
         <version.plugin.wildfly-jar>10.0.0.Final</version.plugin.wildfly-jar>
         <version.pack.cloud>6.0.0.Final</version.pack.cloud>
@@ -86,19 +87,19 @@
 
     <dependencyManagement>
         <dependencies>
+            <!-- importing the ee-with-tools BOM adds specs and other useful artifacts as managed dependencies -->
             <dependency>
                 <groupId>org.wildfly.bom</groupId>
                 <artifactId>wildfly-ee-with-tools</artifactId>
                 <version>${version.bom.ee}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-
             <!-- Import opentelemetry dependency information -->
             <dependency>
-                <groupId>org.wildfly</groupId>
-                <artifactId>wildfly-common-expansion-dependency-management</artifactId>
-                <version>${version.server}</version>
+                <groupId>org.wildfly.bom</groupId>
+                <artifactId>wildfly-microprofile</artifactId>
+                <version>${version.bom.microprofile}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>