Skip to content

Commit 7072e46

Browse files
Upgraded to Micrometer 2.0.0-M2, Tracing 1.0.0-M2 and Micrometer Docs Generator 1.0.0-M1. Fixed docs generation
1 parent 308b70c commit 7072e46

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
<spring-framework.version>6.0.0-M2</spring-framework.version>
5555
<spring-retry.version>1.3.1</spring-retry.version>
5656
<spring-integration.version>6.0.0-M1</spring-integration.version>
57-
<micrometer.version>2.0.0-SNAPSHOT</micrometer.version>
58-
<micrometer-tracing.version>1.0.0-SNAPSHOT</micrometer-tracing.version>
57+
<micrometer.version>2.0.0-M2</micrometer.version>
58+
<micrometer-tracing.version>1.0.0-M2</micrometer-tracing.version>
5959
<jackson.version>2.13.1</jackson.version>
6060

6161
<!-- optional production dependencies -->

spring-batch-core/src/main/java/org/springframework/batch/core/metrics/BatchMetrics.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public static Timer createTimer(String name, String description, Tag... tags) {
7373
* explicitly call {@link Observation#start()} to start it.
7474
*
7575
* Remember to register the {@link TimerObservationHandler}
76-
* via the {@code Metrics.globalRegistry.withTimerObservationHandler()
76+
* via the {@code Metrics.globalRegistry.withTimerObservationHandler()}
7777
* in the user code. Otherwise you won't observe any metrics.
7878
* @return a new observation instance
7979
*/

spring-batch-docs/pom.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<properties>
1414
<!-- Observability -->
15-
<micrometer-docs-generator.version>1.0.0-SNAPSHOT</micrometer-docs-generator.version>
15+
<micrometer-docs-generator.version>1.0.0-M1</micrometer-docs-generator.version>
1616
<micrometer-docs-generator.inputPath>${maven.multiModuleProjectDirectory}/spring-batch-core/</micrometer-docs-generator.inputPath>
1717
<micrometer-docs-generator.inclusionPattern>.*</micrometer-docs-generator.inclusionPattern>
1818
<micrometer-docs-generator.outputPath>${maven.multiModuleProjectDirectory}/spring-batch-docs/target/observability/</micrometer-docs-generator.outputPath>
@@ -64,14 +64,13 @@
6464
</execution>
6565
</executions>
6666
</plugin>
67-
6867
<plugin>
6968
<groupId>org.codehaus.mojo</groupId>
7069
<artifactId>exec-maven-plugin</artifactId>
7170
<executions>
7271
<execution>
7372
<id>generate-metrics-metadata</id>
74-
<phase>prepare-package</phase>
73+
<phase>pre-site</phase>
7574
<goals>
7675
<goal>java</goal>
7776
</goals>
@@ -81,7 +80,7 @@
8180
</execution>
8281
<execution>
8382
<id>generate-tracing-metadata</id>
84-
<phase>prepare-package</phase>
83+
<phase>pre-site</phase>
8584
<goals>
8685
<goal>java</goal>
8786
</goals>

0 commit comments

Comments
 (0)