Skip to content

Commit c2d6477

Browse files
committed
Revert "Make Micrometer dependency optional"
This reverts commit 4959e60. Spring Batch has a compile-time dependency to spring-context, which in turn has a compile-time dependency to micrometer-observation. Issue #4973
1 parent 4959e60 commit c2d6477

File tree

3 files changed

+11
-23
lines changed

3 files changed

+11
-23
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555
<spring-framework.version>7.0.0-SNAPSHOT</spring-framework.version>
5656
<spring-retry.version>2.0.13-SNAPSHOT</spring-retry.version>
5757
<spring-integration.version>7.0.0-SNAPSHOT</spring-integration.version>
58+
<micrometer.version>1.16.0-SNAPSHOT</micrometer.version>
5859

5960
<!-- optional production dependencies -->
60-
<micrometer.version>1.16.0-SNAPSHOT</micrometer.version>
6161
<spring-data-commons.version>4.0.0-SNAPSHOT</spring-data-commons.version>
6262
<spring-data-jpa.version>4.0.0-SNAPSHOT</spring-data-jpa.version>
6363
<spring-data-redis.version>4.0.0-SNAPSHOT</spring-data-redis.version>

spring-batch-core/pom.xml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,18 @@
5454
<artifactId>spring-jdbc</artifactId>
5555
<version>${spring-framework.version}</version>
5656
</dependency>
57+
<dependency>
58+
<groupId>io.micrometer</groupId>
59+
<artifactId>micrometer-core</artifactId>
60+
<version>${micrometer.version}</version>
61+
</dependency>
62+
<dependency>
63+
<groupId>io.micrometer</groupId>
64+
<artifactId>micrometer-observation</artifactId>
65+
<version>${micrometer.version}</version>
66+
</dependency>
5767

5868
<!-- optional production dependencies -->
59-
<dependency>
60-
<groupId>io.micrometer</groupId>
61-
<artifactId>micrometer-core</artifactId>
62-
<version>${micrometer.version}</version>
63-
<optional>true</optional>
64-
</dependency>
65-
<dependency>
66-
<groupId>io.micrometer</groupId>
67-
<artifactId>micrometer-observation</artifactId>
68-
<version>${micrometer.version}</version>
69-
<optional>true</optional>
70-
</dependency>
7169
<dependency>
7270
<groupId>com.fasterxml.jackson.core</groupId>
7371
<artifactId>jackson-databind</artifactId>

spring-batch-samples/pom.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,6 @@
5959
<artifactId>micrometer-registry-prometheus-simpleclient</artifactId>
6060
<version>${micrometer.version}</version>
6161
</dependency>
62-
<dependency>
63-
<groupId>io.micrometer</groupId>
64-
<artifactId>micrometer-core</artifactId>
65-
<version>${micrometer.version}</version>
66-
</dependency>
67-
<dependency>
68-
<groupId>io.micrometer</groupId>
69-
<artifactId>micrometer-observation</artifactId>
70-
<version>${micrometer.version}</version>
71-
</dependency>
7262
<dependency>
7363
<groupId>commons-io</groupId>
7464
<artifactId>commons-io</artifactId>

0 commit comments

Comments
 (0)