Update micrometer to 1.5.5

Co-authored-by: Guillaume Smet <[email protected]>
gastaldi · Oct 9, 2020 · 3c34f50 · 3c34f50
1 parent 71289cd
commit 3c34f50
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 33 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -118,6 +118,9 @@ updates:
       - dependency-name: com.amazonaws:aws-lambda-java-events
       # Apache Commons
       - dependency-name: commons-io:commons-io
+      # Micrometer
+      - dependency-name: io.micrometer:micrometer-bom
+      - dependency-name: io.micrometer:micrometer-registry-stackdriver
     rebase-strategy: disabled
   - package-ecosystem: gradle
     directory: "/integration-tests/gradle"

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -26,7 +26,7 @@
         <quarkus-http.version>3.0.15.Final</quarkus-http.version>
         <jboss-servlet-api_4.0_spec.version>1.0.0.Final</jboss-servlet-api_4.0_spec.version>
         <threetenbp.version>1.4.3</threetenbp.version>
-        <micrometer.version>1.5.3</micrometer.version>
+        <micrometer.version>1.5.5</micrometer.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>
@@ -294,6 +294,15 @@
                 <type>pom</type>
             </dependency>
 
+            <!-- Micrometer Core and Registries, imported as BOM -->
+            <dependency>
+                <groupId>io.micrometer</groupId>
+                <artifactId>micrometer-bom</artifactId>
+                <version>${micrometer.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
             <!-- Quarkus core -->
 
             <dependency>
@@ -4560,26 +4569,6 @@
                 <artifactId>threetenbp</artifactId>
                 <version>${threetenbp.version}</version>
             </dependency>
-            <dependency>
-                <groupId>io.micrometer</groupId>
-                <artifactId>micrometer-core</artifactId>
-                <version>${micrometer.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.micrometer</groupId>
-                <artifactId>micrometer-registry-datadog</artifactId>
-                <version>${micrometer.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.micrometer</groupId>
-                <artifactId>micrometer-registry-jmx</artifactId>
-                <version>${micrometer.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.micrometer</groupId>
-                <artifactId>micrometer-registry-prometheus</artifactId>
-                <version>${micrometer.version}</version>
-            </dependency>
             <dependency>
                 <groupId>io.micrometer</groupId>
                 <artifactId>micrometer-registry-stackdriver</artifactId>
@@ -4611,11 +4600,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>io.micrometer</groupId>
-                <artifactId>micrometer-registry-azure-monitor</artifactId>
-                <version>${micrometer.version}</version>
-            </dependency>
 
             <!-- Picocli -->
             <dependency>

diff --git a/extensions/micrometer/deployment/pom.xml b/extensions/micrometer/deployment/pom.xml
@@ -43,34 +43,33 @@
             <artifactId>quarkus-resteasy-common-spi</artifactId>
         </dependency>
 
-        <!-- Registry providers (optional) -->
+        <!-- test -->
 
         <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-datadog</artifactId>
-            <optional>true</optional>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-jmx</artifactId>
-            <optional>true</optional>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-prometheus</artifactId>
-            <optional>true</optional>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-stackdriver</artifactId>
-            <optional>true</optional>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-azure-monitor</artifactId>
-            <optional>true</optional>
+            <scope>test</scope>
         </dependency>
-        <!-- test -->
 
         <dependency>
             <groupId>io.quarkus</groupId>