Merge pull request wildfly#17464 from jasondlee/WFLY-18810

[WFLY-18810] Update Micrometer to 1.12.0
iweiss · Jan 2, 2024 · aaf99a4 · aaf99a4
2 parents 4f871cb + 8b09f29
commit aaf99a4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/boms/common-expansion/pom.xml b/boms/common-expansion/pom.xml
@@ -398,6 +398,17 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>io.micrometer</groupId>
+                <artifactId>micrometer-commons</artifactId>
+                <version>${version.io.micrometer}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>*</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
             <dependency>
                 <groupId>io.micrometer</groupId>
                 <artifactId>micrometer-core</artifactId>

diff --git a/galleon-pack/galleon-shared/pom.xml b/galleon-pack/galleon-shared/pom.xml
@@ -58,6 +58,7 @@
             <artifactId>grpc-api</artifactId>
         </dependency>
 
+        <dependency><groupId>io.micrometer</groupId><artifactId>micrometer-commons</artifactId></dependency>
         <dependency><groupId>io.micrometer</groupId><artifactId>micrometer-core</artifactId></dependency>
         <dependency><groupId>io.micrometer</groupId><artifactId>micrometer-registry-otlp</artifactId></dependency>
 

diff --git a/...alleon-shared/src/main/resources/modules/system/layers/base/io/micrometer/main/module.xml b/...alleon-shared/src/main/resources/modules/system/layers/base/io/micrometer/main/module.xml
@@ -11,6 +11,7 @@
     </properties>
 
     <resources>
+        <artifact name="${io.micrometer:micrometer-commons}"/>
         <artifact name="${io.micrometer:micrometer-core}"/>
         <artifact name="${io.micrometer:micrometer-registry-otlp}"/>
     </resources>

diff --git a/pom.xml b/pom.xml
@@ -396,7 +396,7 @@
         <version.gnu.getopt>1.0.13</version.gnu.getopt>
         <version.io.agroal>2.0</version.io.agroal>
         <version.io.grpc>1.58.0</version.io.grpc>
-        <version.io.micrometer>1.9.13</version.io.micrometer>
+        <version.io.micrometer>1.12.0</version.io.micrometer>
         <version.io.netty>4.1.100.Final</version.io.netty>
         <version.io.opentelemetry.opentelemetry>1.29.0</version.io.opentelemetry.opentelemetry>
         <version.io.opentelemetry.proto>0.20.0-alpha</version.io.opentelemetry.proto>