Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade next version of Micrometer and fix breaking changes

Browse Source
This commit is contained in:
Jonatan Ivanov
2022-02-11 13:30:31 -08:00
committed by Mahmoud Ben Hassine
parent 401feb29f7
commit c1aec1d0ea
9 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -54,7 +54,7 @@
<spring-framework.version>6.0.0-M2</spring-framework.version>
<spring-retry.version>1.3.1</spring-retry.version>
<spring-integration.version>6.0.0-M1</spring-integration.version>
<micrometer.version>2.0.0-M1</micrometer.version>
<micrometer.version>2.0.0-M2</micrometer.version>
<jackson.version>2.13.1</jackson.version>
<!-- optional production dependencies -->

6
spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java
View File

@@ -19,9 +19,9 @@ package org.springframework.batch.core.job;
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;

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

@@ -20,10 +20,10 @@ import java.util.Arrays;
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;

4
spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java
View File

@@ -18,8 +18,8 @@ package org.springframework.batch.core.step;
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;

2
spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantChunkProcessor.java
View File

@@ -22,7 +22,7 @@ import java.util.Iterator;
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;

4
spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProcessor.java
View File

@@ -18,8 +18,8 @@ package org.springframework.batch.core.step.item;
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;

6
spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProvider.java
View File

@@ -18,9 +18,9 @@ package org.springframework.batch.core.step.item;
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;

2
spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/PrometheusConfiguration.java
View File

@@ -19,7 +19,7 @@ import java.util.HashMap;
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;

4
spring-batch-samples/src/test/java/org/springframework/batch/sample/metrics/BatchMetricsTests.java
View File

@@ -25,8 +25,8 @@ import java.util.List;
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;