Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
7fc272df
Commit
7fc272df
authored
Oct 05, 2017
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Start building against Micrometer snapshots for 1.0.0-rc.2
parent
6323dc4e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
MeterBindersConfiguration.java
...uate/autoconfigure/metrics/MeterBindersConfiguration.java
+3
-3
MetricsAutoConfigurationTests.java
.../autoconfigure/metrics/MetricsAutoConfigurationTests.java
+2
-2
MetricsEndpointWebIntegrationTests.java
...t/actuate/metrics/MetricsEndpointWebIntegrationTests.java
+1
-1
pom.xml
spring-boot-project/spring-boot-dependencies/pom.xml
+1
-1
No files found.
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MeterBindersConfiguration.java
View file @
7fc272df
...
@@ -16,10 +16,10 @@
...
@@ -16,10 +16,10 @@
package
org
.
springframework
.
boot
.
actuate
.
autoconfigure
.
metrics
;
package
org
.
springframework
.
boot
.
actuate
.
autoconfigure
.
metrics
;
import
io.micrometer.core.instrument.binder.JvmMemoryMetrics
;
import
io.micrometer.core.instrument.binder.LogbackMetrics
;
import
io.micrometer.core.instrument.binder.MeterBinder
;
import
io.micrometer.core.instrument.binder.MeterBinder
;
import
io.micrometer.core.instrument.binder.UptimeMetrics
;
import
io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics
;
import
io.micrometer.core.instrument.binder.logging.LogbackMetrics
;
import
io.micrometer.core.instrument.binder.system.UptimeMetrics
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnClass
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnClass
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
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
View file @
7fc272df
...
@@ -22,9 +22,9 @@ import java.util.Set;
...
@@ -22,9 +22,9 @@ import java.util.Set;
import
io.micrometer.core.instrument.MeterRegistry
;
import
io.micrometer.core.instrument.MeterRegistry
;
import
io.micrometer.core.instrument.Statistic
;
import
io.micrometer.core.instrument.Statistic
;
import
io.micrometer.core.instrument.binder.JvmMemoryMetrics
;
import
io.micrometer.core.instrument.binder.LogbackMetrics
;
import
io.micrometer.core.instrument.binder.MeterBinder
;
import
io.micrometer.core.instrument.binder.MeterBinder
;
import
io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics
;
import
io.micrometer.core.instrument.binder.logging.LogbackMetrics
;
import
io.micrometer.core.instrument.simple.SimpleMeterRegistry
;
import
io.micrometer.core.instrument.simple.SimpleMeterRegistry
;
import
org.junit.Test
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.junit.runner.RunWith
;
...
...
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointWebIntegrationTests.java
View file @
7fc272df
...
@@ -22,7 +22,7 @@ import java.util.Map;
...
@@ -22,7 +22,7 @@ import java.util.Map;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
io.micrometer.core.instrument.MeterRegistry
;
import
io.micrometer.core.instrument.MeterRegistry
;
import
io.micrometer.core.instrument.binder.JvmMemoryMetrics
;
import
io.micrometer.core.instrument.binder.
jvm.
JvmMemoryMetrics
;
import
io.micrometer.core.instrument.simple.SimpleMeterRegistry
;
import
io.micrometer.core.instrument.simple.SimpleMeterRegistry
;
import
org.junit.Test
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.junit.runner.RunWith
;
...
...
spring-boot-project/spring-boot-dependencies/pom.xml
View file @
7fc272df
...
@@ -113,7 +113,7 @@
...
@@ -113,7 +113,7 @@
<logback.version>
1.2.3
</logback.version>
<logback.version>
1.2.3
</logback.version>
<lombok.version>
1.16.18
</lombok.version>
<lombok.version>
1.16.18
</lombok.version>
<mariadb.version>
2.1.2
</mariadb.version>
<mariadb.version>
2.1.2
</mariadb.version>
<micrometer.version>
1.0.0-
rc.1
</micrometer.version>
<micrometer.version>
1.0.0-
SNAPSHOT
</micrometer.version>
<mssql-jdbc.version>
6.2.1.jre8
</mssql-jdbc.version>
<mssql-jdbc.version>
6.2.1.jre8
</mssql-jdbc.version>
<mockito.version>
2.10.0
</mockito.version>
<mockito.version>
2.10.0
</mockito.version>
<mongo-driver-reactivestreams.version>
1.6.0
</mongo-driver-reactivestreams.version>
<mongo-driver-reactivestreams.version>
1.6.0
</mongo-driver-reactivestreams.version>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment