More deprecation warning fixes

* Remove `com.github.spotbugs` from Dependabot config as this dependency is not managed anymore
* Update samples to Spring Boot `4.0.x` and Spring Functions Catalog `6.0.0-SNAPSHOT`

Author: artembilan

.github/dependabot.yml

@@ -19,7 +19,6 @@ updates:
         update-types:
           - patch
         patterns:
-          - com.github.spotbugs
           - io.spring.*
           - com.icegreen:greenmail
           - org.mock-server*

consumer/spring-mqtt-consumer/src/main/java/org/springframework/cloud/fn/consumer/mqtt/MqttConsumerConfiguration.java

@@ -18,6 +18,8 @@
 
 import java.util.function.Consumer;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -28,7 +30,6 @@
 import org.springframework.integration.mqtt.core.MqttPahoClientFactory;
 import org.springframework.integration.mqtt.outbound.MqttPahoMessageHandler;
 import org.springframework.integration.mqtt.support.DefaultPahoMessageConverter;
-import org.springframework.lang.Nullable;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHandler;
 

consumer/spring-rabbit-consumer/src/test/java/org/springframework/cloud/fn/consumer/rabbit/RabbitTestContainer.java

@@ -19,8 +19,8 @@
 import java.io.IOException;
 
 import org.junit.jupiter.api.BeforeAll;
-import org.testcontainers.containers.RabbitMQContainer;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.rabbitmq.RabbitMQContainer;
 
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;

consumer/spring-websocket-consumer/build.gradle

@@ -2,6 +2,7 @@ dependencies {
     api 'org.springframework.boot:spring-boot-starter-actuator'
     api 'org.springframework:spring-websocket'
     api 'io.netty:netty-all'
+    api 'io.netty:netty-pkitesting'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-web'
     testImplementation project(':spring-function-test-support')

consumer/spring-websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerServer.java

@@ -22,7 +22,8 @@
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.EventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.MultiThreadIoEventLoopGroup;
+import io.netty.channel.nio.NioIoHandler;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
 import io.netty.handler.logging.LogLevel;
 import io.netty.handler.logging.LoggingHandler;
@@ -70,8 +71,8 @@ public int getPort() {
 
 	@PostConstruct
 	public void init() {
-		this.bossGroup = new NioEventLoopGroup(this.properties.getThreads());
-		this.workerGroup = new NioEventLoopGroup();
+		this.bossGroup = new MultiThreadIoEventLoopGroup(this.properties.getThreads(), NioIoHandler.newFactory());
+		this.workerGroup = new MultiThreadIoEventLoopGroup(NioIoHandler.newFactory());
 	}
 
 	@PreDestroy

consumer/spring-websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerServerInitializer.java

@@ -16,18 +16,14 @@
 
 package org.springframework.cloud.fn.consumer.websocket;
 
-import java.security.cert.CertificateException;
-
-import javax.net.ssl.SSLException;
-
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.codec.http.HttpObjectAggregator;
 import io.netty.handler.codec.http.HttpServerCodec;
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
-import io.netty.handler.ssl.util.SelfSignedCertificate;
+import io.netty.pkitesting.CertificateBuilder;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -80,10 +76,10 @@ public void initChannel(SocketChannel ch) throws Exception {
 		pipeline.addLast(new WebsocketConsumerServerHandler(this.traceRepository, this.properties, this.traceEnabled));
 	}
 
-	private SslContext configureSslContext() throws CertificateException, SSLException {
+	private SslContext configureSslContext() throws Exception {
 		if (this.properties.isSsl()) {
-			SelfSignedCertificate ssc = new SelfSignedCertificate();
-			return SslContextBuilder.forServer(ssc.certificate(), ssc.privateKey()).build();
+			return SslContextBuilder.forServer(new CertificateBuilder().buildSelfSigned().toKeyManagerFactory())
+				.build();
 		}
 		else {
 			return null;

samples/time-spel-log/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '3.5.10'
+    id 'org.springframework.boot' version '4.0.2'
     id 'io.spring.dependency-management' version '1.1.7'
 }
 
@@ -20,8 +20,8 @@ repositories {
 }
 
 ext {
-    springCloudVersion = '2025.0.1'
-    springFunctionsCatalogVersion = '5.2.0-SNAPSHOT'
+    springCloudVersion = '2025.1.1'
+    springFunctionsCatalogVersion = '6.0.0-SNAPSHOT'
 }
 
 dependencyManagement {

samples/time-spel-log/gradle/wrapper/gradle-wrapper.jar

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionSha256Sum=b266d5ff6b90eada6dc3b20cb090e3731302e553a27c5d3e4df1f0d76beaff06
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

samples/time-spel-log/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 plugins {
 	id 'java'
-	id 'org.springframework.boot' version '3.5.10'
+	id 'org.springframework.boot' version '4.0.2'
 	id 'io.spring.dependency-management' version '1.1.7'
 }
 
@@ -20,8 +20,8 @@ repositories {
 }
 
 ext {
-	springCloudVersion = '2025.0.1'
-	springFunctionsCatalogVersion = '5.2.0-SNAPSHOT'
+	springCloudVersion = '2025.1.1'
+	springFunctionsCatalogVersion = '6.0.0-SNAPSHOT'
 }
 
 dependencyManagement {