Skip to content

Commit 7fc272d

Browse files
committed
Start building against Micrometer snapshots for 1.0.0-rc.2
1 parent 6323dc4 commit 7fc272d

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterBindersConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.metrics;
1818

19-
import io.micrometer.core.instrument.binder.JvmMemoryMetrics;
20-
import io.micrometer.core.instrument.binder.LogbackMetrics;
2119
import io.micrometer.core.instrument.binder.MeterBinder;
22-
import io.micrometer.core.instrument.binder.UptimeMetrics;
20+
import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
21+
import io.micrometer.core.instrument.binder.logging.LogbackMetrics;
22+
import io.micrometer.core.instrument.binder.system.UptimeMetrics;
2323

2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsAutoConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
import io.micrometer.core.instrument.MeterRegistry;
2424
import io.micrometer.core.instrument.Statistic;
25-
import io.micrometer.core.instrument.binder.JvmMemoryMetrics;
26-
import io.micrometer.core.instrument.binder.LogbackMetrics;
2725
import io.micrometer.core.instrument.binder.MeterBinder;
26+
import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
27+
import io.micrometer.core.instrument.binder.logging.LogbackMetrics;
2828
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
2929
import org.junit.Test;
3030
import org.junit.runner.RunWith;

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointWebIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import com.fasterxml.jackson.databind.ObjectMapper;
2424
import io.micrometer.core.instrument.MeterRegistry;
25-
import io.micrometer.core.instrument.binder.JvmMemoryMetrics;
25+
import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
2626
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
2727
import org.junit.Test;
2828
import org.junit.runner.RunWith;

spring-boot-project/spring-boot-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
<logback.version>1.2.3</logback.version>
114114
<lombok.version>1.16.18</lombok.version>
115115
<mariadb.version>2.1.2</mariadb.version>
116-
<micrometer.version>1.0.0-rc.1</micrometer.version>
116+
<micrometer.version>1.0.0-SNAPSHOT</micrometer.version>
117117
<mssql-jdbc.version>6.2.1.jre8</mssql-jdbc.version>
118118
<mockito.version>2.10.0</mockito.version>
119119
<mongo-driver-reactivestreams.version>1.6.0</mongo-driver-reactivestreams.version>

0 commit comments

Comments
 (0)