You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2023/07/18 08:33:30 UTC

[camel-quarkus] branch main updated: Manage io.dropwizard.metrics dependencies used by camel-quarkus extensions

This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git


The following commit(s) were added to refs/heads/main by this push:
     new cd39c3c5e5 Manage io.dropwizard.metrics dependencies used by camel-quarkus extensions
cd39c3c5e5 is described below

commit cd39c3c5e5c759aa4ca51476114030d483f3e982
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Jul 17 15:19:15 2023 +0100

    Manage io.dropwizard.metrics dependencies used by camel-quarkus extensions
    
    Fixes #5086
---
 .../quarkus/component/micrometer/it/MicrometerTest.java   |  2 +-
 pom.xml                                                   |  1 +
 poms/bom/pom.xml                                          | 10 ++++++++++
 poms/bom/src/main/generated/flattened-full-pom.xml        | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java b/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
index 6b677c92d5..4ff1c8ce5c 100644
--- a/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
+++ b/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
@@ -204,7 +204,7 @@ class MicrometerTest extends AbstractMicrometerTest {
     public void testJMXQuarkusDomain(String domain) throws Exception {
         MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer();
 
-        ObjectName objectName = new ObjectName(domain + ":name=jvmClassesLoaded");
+        ObjectName objectName = new ObjectName(domain + ":name=jvmClassesLoaded,type=gauges");
         Set<ObjectInstance> mbeans = mBeanServer.queryMBeans(objectName, null);
 
         assertEquals(1, mbeans.size());
diff --git a/pom.xml b/pom.xml
index 18503e3ee3..020f52d209 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,6 +90,7 @@
         <commons-exec.version>${commons-exec-version}</commons-exec.version>
         <commons-lang.version>2.6</commons-lang.version><!-- used by hbase, should be pretty stable as commons-lang is not developed actively anymore -->
         <cxf.version>4.0.2</cxf.version><!-- @sync io.quarkiverse.cxf:quarkus-cxf-parent:${quarkiverse-cxf.version} prop:cxf.version -->
+        <dropwizard-metrics.version>${metrics-version}</dropwizard-metrics.version>
         <eddsa.version>${eddsa-version}</eddsa.version>
         <eclipse-transformer.version>0.5.0</eclipse-transformer.version>
         <freemarker.version>2.3.32</freemarker.version><!-- @sync io.quarkiverse.freemarker:quarkus-freemarker-parent:${quarkiverse-freemarker.version} prop:freemarker.version -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index b56dca81b3..3b70a8ccb2 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -6249,6 +6249,16 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>io.dropwizard.metrics</groupId>
+                <artifactId>dropwizard-core</artifactId>
+                <version>${dropwizard-metrics.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.dropwizard.metrics</groupId>
+                <artifactId>metrics-jmx</artifactId>
+                <version>${dropwizard-metrics.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.perfmark</groupId>
                 <artifactId>perfmark-api</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index 5595af3155..04057839c4 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6172,6 +6172,16 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>io.dropwizard.metrics</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+        <artifactId>dropwizard-core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+        <version>4.2.19</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+      </dependency>
+      <dependency>
+        <groupId>io.dropwizard.metrics</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+        <artifactId>metrics-jmx</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+        <version>4.2.19</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+      </dependency>
       <dependency>
         <groupId>io.perfmark</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
         <artifactId>perfmark-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -21010,11 +21020,6 @@
         <artifactId>metrics-core</artifactId><!-- io.debezium:debezium-bom:2.2.0.Final -->
         <version>4.0.1</version><!-- io.debezium:debezium-bom:2.2.0.Final -->
       </dependency>
-      <dependency>
-        <groupId>io.dropwizard.metrics</groupId><!-- io.debezium:debezium-bom:2.2.0.Final -->
-        <artifactId>metrics-jmx</artifactId><!-- io.debezium:debezium-bom:2.2.0.Final -->
-        <version>4.0.1</version><!-- io.debezium:debezium-bom:2.2.0.Final -->
-      </dependency>
       <dependency>
         <groupId>io.dropwizard.metrics</groupId><!-- io.debezium:debezium-bom:2.2.0.Final -->
         <artifactId>metrics-healthchecks</artifactId><!-- io.debezium:debezium-bom:2.2.0.Final -->