root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge pull request #12767 from jkschneider 

* pr/12767:
  Upgrade to Micrometer 1.0.3
This commit is contained in:
Phillip Webb 2018-04-04 20:42:50 -07:00
parent 236b1bc4b6 03158e2fd5
commit f76c574f8e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/PropertiesMeterFilterTests.java
View File

@ -276,9 +276,9 @@ public class PropertiesMeterFilterTests {
assertThat(filter.configure(timer, DistributionStatisticConfig.DEFAULT)
.getSlaBoundaries()).containsExactly(1000000, 2000000, 3000000);
assertThat(filter.configure(summary, DistributionStatisticConfig.DEFAULT)
.getSlaBoundaries()).isEmpty();
.getSlaBoundaries()).isNullOrEmpty();
assertThat(filter.configure(counter, DistributionStatisticConfig.DEFAULT)
.getSlaBoundaries()).isEmpty();
.getSlaBoundaries()).isNullOrEmpty();
}
@Test
@ -293,7 +293,7 @@ public class PropertiesMeterFilterTests {
assertThat(filter.configure(summary, DistributionStatisticConfig.DEFAULT)
.getSlaBoundaries()).containsExactly(1, 2, 3);
assertThat(filter.configure(counter, DistributionStatisticConfig.DEFAULT)
.getSlaBoundaries()).isEmpty();
.getSlaBoundaries()).isNullOrEmpty();
}
private Id createMeterId(String name) {

2
spring-boot-project/spring-boot-dependencies/pom.xml
View File

@ -120,7 +120,7 @@
<logback.version>1.2.3</logback.version>
<lombok.version>1.16.20</lombok.version>
<mariadb.version>2.2.3</mariadb.version>
<micrometer.version>1.0.2</micrometer.version>
<micrometer.version>1.0.3</micrometer.version>
<mockito.version>2.15.0</mockito.version>
<mongo-driver-reactivestreams.version>1.7.1</mongo-driver-reactivestreams.version>
<mongodb.version>3.6.3</mongodb.version>