From 1530d046a744e5a4d527c00d5b8ce2081db4faaf Mon Sep 17 00:00:00 2001 From: Jonatan Ivanov Date: Fri, 11 Feb 2022 13:30:31 -0800 Subject: [PATCH 1/2] Upgrade next version of Micrometer and fix breaking changes --- pom.xml | 2 +- .../org/springframework/batch/core/job/AbstractJob.java | 6 +++--- .../springframework/batch/core/metrics/BatchMetrics.java | 8 ++++---- .../org/springframework/batch/core/step/AbstractStep.java | 4 ++-- .../batch/core/step/item/FaultTolerantChunkProcessor.java | 2 +- .../batch/core/step/item/SimpleChunkProcessor.java | 4 ++-- .../batch/core/step/item/SimpleChunkProvider.java | 6 +++--- .../batch/sample/metrics/PrometheusConfiguration.java | 2 +- .../batch/sample/metrics/BatchMetricsTests.java | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index debcb6c9f4..703a094f9e 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ 6.0.0-M2 1.3.1 6.0.0-M1 - 2.0.0-M1 + 2.0.0-SNAPSHOT 2.13.1 diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java index 006102f01c..5b3ac1502a 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java @@ -19,9 +19,9 @@ import java.util.Collection; import java.util.Date; -import io.micrometer.core.instrument.LongTaskTimer; -import io.micrometer.core.instrument.Tag; -import io.micrometer.core.instrument.Timer; +import io.micrometer.api.instrument.LongTaskTimer; +import io.micrometer.api.instrument.Tag; +import io.micrometer.api.instrument.Timer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.batch.core.BatchStatus; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/metrics/BatchMetrics.java b/spring-batch-core/src/main/java/org/springframework/batch/core/metrics/BatchMetrics.java index e00eeb8c7f..8ac8c28bc7 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/metrics/BatchMetrics.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/metrics/BatchMetrics.java @@ -20,10 +20,10 @@ import java.util.Date; import java.util.concurrent.TimeUnit; -import io.micrometer.core.instrument.LongTaskTimer; -import io.micrometer.core.instrument.Metrics; -import io.micrometer.core.instrument.Tag; -import io.micrometer.core.instrument.Timer; +import io.micrometer.api.instrument.LongTaskTimer; +import io.micrometer.api.instrument.Metrics; +import io.micrometer.api.instrument.Tag; +import io.micrometer.api.instrument.Timer; import org.springframework.lang.Nullable; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java index 4df145cc6a..91b5d519d2 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java @@ -18,8 +18,8 @@ import java.time.Duration; import java.util.Date; -import io.micrometer.core.instrument.Tag; -import io.micrometer.core.instrument.Timer; +import io.micrometer.api.instrument.Tag; +import io.micrometer.api.instrument.Timer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.batch.core.BatchStatus; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantChunkProcessor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantChunkProcessor.java index 09137e55a2..f188b1b244 100755 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantChunkProcessor.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantChunkProcessor.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import io.micrometer.core.instrument.Timer; +import io.micrometer.api.instrument.Timer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProcessor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProcessor.java index d946e39217..4ec68b4830 100755 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProcessor.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProcessor.java @@ -18,8 +18,8 @@ import java.util.List; -import io.micrometer.core.instrument.Tag; -import io.micrometer.core.instrument.Timer; +import io.micrometer.api.instrument.Tag; +import io.micrometer.api.instrument.Timer; import org.springframework.batch.core.StepContribution; import org.springframework.batch.core.StepExecution; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProvider.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProvider.java index 4a14220ae6..4c4068ac18 100755 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProvider.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProvider.java @@ -18,9 +18,9 @@ import java.util.List; -import io.micrometer.core.instrument.Metrics; -import io.micrometer.core.instrument.Tag; -import io.micrometer.core.instrument.Timer; +import io.micrometer.api.instrument.Metrics; +import io.micrometer.api.instrument.Tag; +import io.micrometer.api.instrument.Timer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.batch.core.StepContribution; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/PrometheusConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/PrometheusConfiguration.java index 6c5c226c63..7f15253e36 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/PrometheusConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/PrometheusConfiguration.java @@ -19,7 +19,7 @@ import java.util.Map; import jakarta.annotation.PostConstruct; -import io.micrometer.core.instrument.Metrics; +import io.micrometer.api.instrument.Metrics; import io.micrometer.prometheus.PrometheusConfig; import io.micrometer.prometheus.PrometheusMeterRegistry; import io.prometheus.client.CollectorRegistry; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/metrics/BatchMetricsTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/metrics/BatchMetricsTests.java index 081fbc478a..219380e55c 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/metrics/BatchMetricsTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/metrics/BatchMetricsTests.java @@ -25,8 +25,8 @@ import javax.sql.DataSource; -import io.micrometer.core.instrument.Meter; -import io.micrometer.core.instrument.Metrics; +import io.micrometer.api.instrument.Meter; +import io.micrometer.api.instrument.Metrics; import org.junit.Test; import org.springframework.batch.core.ExitStatus; From 18c4c5d05dbf64dc2887f99d5e31656fe85d4573 Mon Sep 17 00:00:00 2001 From: Jonatan Ivanov Date: Tue, 15 Feb 2022 15:31:57 -0800 Subject: [PATCH 2/2] Micrometer 2.0.0-M2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 703a094f9e..9222c041bd 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ 6.0.0-M2 1.3.1 6.0.0-M1 - 2.0.0-SNAPSHOT + 2.0.0-M2 2.13.1