Adjust dependencies for MP Metrics 2.3

bom/runtime/pom.xml

@@ -27,13 +27,14 @@
         <quarkus-http.version>3.0.2.Final</quarkus-http.version>
         <jboss-servlet-api_4.0_spec.version>1.0.0.Final</jboss-servlet-api_4.0_spec.version>
         <microprofile-config-api.version>1.4</microprofile-config-api.version>
+        <microprofile-metrics-api.version>2.3</microprofile-metrics-api.version>
         <microprofile-context-propagation.version>1.0.1</microprofile-context-propagation.version>
         <microprofile-opentracing-api.version>1.3.1</microprofile-opentracing-api.version>
         <microprofile-reactive-streams-operators.version>1.0</microprofile-reactive-streams-operators.version>
         <microprofile-rest-client.version>1.3.4</microprofile-rest-client.version>
         <smallrye-config.version>1.6.1</smallrye-config.version>
         <smallrye-health.version>2.1.0</smallrye-health.version>
-        <smallrye-metrics.version>2.3.3</smallrye-metrics.version>
+        <smallrye-metrics.version>2.4.0</smallrye-metrics.version>
         <smallrye-open-api.version>1.2.0</smallrye-open-api.version>
         <smallrye-opentracing.version>1.3.3</smallrye-opentracing.version>
         <smallrye-fault-tolerance.version>4.0.0</smallrye-fault-tolerance.version>
@@ -1610,6 +1611,17 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.microprofile.metrics</groupId>
+                <artifactId>microprofile-metrics-api</artifactId>
+                <version>${microprofile-metrics-api.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.osgi</groupId>
+                        <artifactId>org.osgi.annotation.versioning</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.microprofile.context-propagation</groupId>
                 <artifactId>microprofile-context-propagation-api</artifactId>

build-parent/pom.xml

@@ -60,7 +60,7 @@
         <!-- MicroProfile TCK versions -->
         <microprofile-health-api.version>2.1</microprofile-health-api.version>
         <microprofile-config-api.version>1.4</microprofile-config-api.version>
-        <microprofile-metrics-api.version>2.2.1</microprofile-metrics-api.version>
+        <microprofile-metrics-api.version>2.3</microprofile-metrics-api.version>
         <microprofile-fault-tolerance-api.version>2.0.3</microprofile-fault-tolerance-api.version>
         <microprofile-reactive-messaging-api.version>1.0</microprofile-reactive-messaging-api.version>
         <microprofile-rest-client-api.version>1.3.4</microprofile-rest-client-api.version>

extensions/infinispan-embedded/runtime/pom.xml

@@ -26,9 +26,6 @@
             <artifactId>quarkus-caffeine</artifactId>
         </dependency>
 
-        <!-- Explicitly add in smallrye-metrics so that the proper version of
-             microprofile-metrics-api is brought along since it is excluded below
-             This and the exclusion can be removed when updating to 10.0.1.Final of Infinispan -->
         <dependency>
             <groupId>io.smallrye</groupId>
             <artifactId>smallrye-metrics</artifactId>
@@ -37,10 +34,6 @@
             <groupId>org.infinispan</groupId>
             <artifactId>infinispan-core</artifactId>
             <exclusions>
-                <exclusion>
-                    <groupId>org.eclipse.microprofile.metrics</groupId>
-                    <artifactId>microprofile-metrics-api</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.jboss.spec.javax.transaction</groupId>
                     <artifactId>jboss-transaction-api_1.2_spec</artifactId>

extensions/jaeger/runtime/pom.xml

@@ -34,6 +34,10 @@
             <groupId>io.smallrye</groupId>
             <artifactId>smallrye-metrics</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.microprofile.metrics</groupId>
+            <artifactId>microprofile-metrics-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

extensions/smallrye-metrics/deployment/pom.xml

@@ -38,6 +38,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-smallrye-metrics-spi</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.microprofile.metrics</groupId>
+            <artifactId>microprofile-metrics-api</artifactId>
+        </dependency>
 
         <!-- test dependencies -->
         <dependency>

extensions/smallrye-metrics/runtime/pom.xml

@@ -35,6 +35,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jsonp</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.microprofile.metrics</groupId>
+            <artifactId>microprofile-metrics-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>