Upgrade to Spring Boot 4 and apply required compatibility changes

Signed-off-by: Simone Di Stefano <[email protected]>

Author: Simone Di Stefano

client/build.gradle

@@ -13,7 +13,7 @@ dependencies {
   api 'io.micrometer:micrometer-registry-prometheus:1.13.+'
   implementation 'org.xerial.snappy:snappy-java:latest.release'
 
-  testImplementation(platform('org.junit:junit-bom:5.12.1'))
+  testImplementation(platform('org.junit:junit-bom:6.0.1'))
 
   testImplementation 'ch.qos.logback:logback-classic:1.4.+'
   testImplementation 'org.junit.jupiter:junit-jupiter'

proxy-server/build.gradle

@@ -2,7 +2,7 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin
 
 plugins {
     id 'java-library'
-    id 'org.springframework.boot' version '3.4.0' apply false
+    id 'org.springframework.boot' version '4.0.0' apply false
 }
 
 apply plugin: 'io.spring.dependency-management'

proxy/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-  id 'org.springframework.boot' version '3.4.0'
+  id 'org.springframework.boot' version '4.0.0'
 }
 
 apply plugin: 'io.spring.dependency-management'

starter-spring/build.gradle

@@ -2,7 +2,7 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin
 
 plugins {
   id 'java-library'
-  id 'org.springframework.boot' version '3.4.0' apply false
+  id 'org.springframework.boot' version '4.0.0' apply false
 }
 
 apply plugin: 'io.spring.dependency-management'
@@ -22,6 +22,7 @@ dependencies {
 
   implementation 'org.springframework.boot:spring-boot-actuator-autoconfigure'
   implementation 'org.springframework.boot:spring-boot-autoconfigure'
+  implementation 'org.springframework.boot:spring-boot-starter-micrometer-metrics'
   implementation project(':prometheus-rsocket-client')
   implementation project(':prometheus-rsocket-proxy-server')
 
@@ -32,9 +33,12 @@ dependencies {
   // to validate auto-completion on configuration properties
   annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
 
+  testRuntimeOnly "org.junit.platform:junit-platform-launcher"
+
   testImplementation 'org.springframework.boot:spring-boot-starter-test'
   testImplementation 'io.projectreactor:reactor-test'
   testImplementation 'io.micrometer:micrometer-registry-prometheus'
+  testImplementation 'org.springframework.boot:spring-boot-starter-micrometer-metrics-test'
 }
 
 test {

starter-spring/src/main/java/io/micrometer/prometheus/rsocket/autoconfigure/PrometheusRSocketClientAutoConfiguration.java

@@ -18,13 +18,13 @@
 
 import io.micrometer.prometheus.rsocket.PrometheusRSocketClient;
 import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
-import org.springframework.boot.actuate.autoconfigure.metrics.export.prometheus.PrometheusMetricsExportAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.micrometer.metrics.autoconfigure.export.prometheus.PrometheusMetricsExportAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import reactor.util.retry.Retry;
 

starter-spring/src/test/java/io/micrometer/prometheus/rsocket/autoconfigure/PrometheusRSocketClientAutoConfigurationTest.java

@@ -25,9 +25,9 @@
 import io.rsocket.transport.netty.server.TcpServerTransport;
 import io.rsocket.transport.netty.server.WebsocketServerTransport;
 import org.junit.jupiter.api.Test;
-import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.metrics.export.prometheus.PrometheusMetricsExportAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.micrometer.metrics.autoconfigure.MetricsAutoConfiguration;
+import org.springframework.boot.micrometer.metrics.autoconfigure.export.prometheus.PrometheusMetricsExportAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.test.util.TestSocketUtils;
 import reactor.core.publisher.Mono;