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

Upgrade to Micrometer 1.7.0-M1 

See gh-25707
This commit is contained in:
Jonatan Ivanov 2021-03-16 17:25:58 -07:00 committed by Stephane Nicoll
parent 7e6df7d0e8
commit 7c5e0505d8
5 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle
View File

@ -55,6 +55,7 @@ dependencies {
optional("io.micrometer:micrometer-registry-signalfx") optional("io.micrometer:micrometer-registry-signalfx")
optional("io.micrometer:micrometer-registry-statsd") optional("io.micrometer:micrometer-registry-statsd")
optional("io.micrometer:micrometer-registry-wavefront") optional("io.micrometer:micrometer-registry-wavefront")
optional("org.hibernate:hibernate-micrometer")
optional("io.projectreactor.netty:reactor-netty-http") optional("io.projectreactor.netty:reactor-netty-http")
optional("io.r2dbc:r2dbc-pool") optional("io.r2dbc:r2dbc-pool")
optional("io.r2dbc:r2dbc-spi") optional("io.r2dbc:r2dbc-spi")

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfiguration.java
View File

@ -23,8 +23,8 @@ import javax.persistence.EntityManagerFactory;
import javax.persistence.PersistenceException; import javax.persistence.PersistenceException;
import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.binder.jpa.HibernateMetrics;
import org.hibernate.SessionFactory; import org.hibernate.SessionFactory;
import org.hibernate.stat.HibernateMetrics;
import org.springframework.beans.factory.SmartInitializingSingleton; import org.springframework.beans.factory.SmartInitializingSingleton;
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -1178,7 +1178,7 @@ bom {
] ]
} }
} }
library("Micrometer", "1.6.5") { library("Micrometer", "1.7.0-M1") {
group("io.micrometer") { group("io.micrometer") {
modules = [ modules = [
"micrometer-registry-stackdriver" { "micrometer-registry-stackdriver" {

1
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/build.gradle
View File

@ -11,6 +11,7 @@ dependencies {
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator")) implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator"))
runtimeOnly("com.h2database:h2") runtimeOnly("com.h2database:h2")
runtimeOnly("org.hibernate:hibernate-micrometer")
testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
} }

1
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-flyway/build.gradle
View File

@ -12,6 +12,7 @@ dependencies {
runtimeOnly("com.h2database:h2") runtimeOnly("com.h2database:h2")
runtimeOnly("org.flywaydb:flyway-core") runtimeOnly("org.flywaydb:flyway-core")
runtimeOnly("org.hibernate:hibernate-micrometer")
testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
} }