Skip to content

Commit e9d16da

Browse files
committed
Remove Netty 5 support
Closes gh-34345
1 parent bae12e7 commit e9d16da

File tree

51 files changed

+48
-4052
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+48
-4052
lines changed

buildSrc/src/main/java/org/springframework/build/TestConventions.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2024 the original author or authors.
2+
* Copyright 2002-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -54,10 +54,7 @@ private void configureTests(Project project, Test test) {
5454
test.include("**/*Tests.class", "**/*Test.class");
5555
test.setSystemProperties(Map.of(
5656
"java.awt.headless", "true",
57-
"io.netty.leakDetection.level", "paranoid",
58-
"io.netty5.leakDetectionLevel", "paranoid",
59-
"io.netty5.leakDetection.targetRecords", "32",
60-
"io.netty5.buffer.lifecycleTracingEnabled", "true"
57+
"io.netty.leakDetection.level", "paranoid"
6158
));
6259
if (project.hasProperty("testGroups")) {
6360
test.systemProperty("testGroups", project.getProperties().get("testGroups"));

framework-platform/framework-platform.gradle

-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ dependencies {
1010
api(platform("com.fasterxml.jackson:jackson-bom:2.18.2"))
1111
api(platform("io.micrometer:micrometer-bom:1.14.4"))
1212
api(platform("io.netty:netty-bom:4.1.117.Final"))
13-
api(platform("io.netty:netty5-bom:5.0.0.Alpha5"))
1413
api(platform("io.projectreactor:reactor-bom:2024.0.3"))
1514
api(platform("io.rsocket:rsocket-bom:1.1.5"))
1615
api(platform("org.apache.groovy:groovy-bom:4.0.24"))
@@ -49,7 +48,6 @@ dependencies {
4948
api("de.bechte.junit:junit-hierarchicalcontextrunner:4.12.2")
5049
api("io.micrometer:context-propagation:1.1.1")
5150
api("io.mockk:mockk:1.13.4")
52-
api("io.projectreactor.netty:reactor-netty5-http:2.0.0-M3")
5351
api("io.projectreactor.tools:blockhound:1.0.8.RELEASE")
5452
api("io.r2dbc:r2dbc-h2:1.0.0.RELEASE")
5553
api("io.r2dbc:r2dbc-spi-test:1.0.0.RELEASE")

spring-core/spring-core.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ dependencies {
7777
compileOnly("org.graalvm.sdk:graal-sdk")
7878
optional("io.micrometer:context-propagation")
7979
optional("io.netty:netty-buffer")
80-
optional("io.netty:netty5-buffer")
8180
optional("io.projectreactor:reactor-core")
8281
optional("io.reactivex.rxjava3:rxjava")
8382
optional("io.smallrye.reactive:mutiny")

spring-core/src/main/java/org/springframework/core/codec/Netty5BufferDecoder.java

-68
This file was deleted.

spring-core/src/main/java/org/springframework/core/codec/Netty5BufferEncoder.java

-77
This file was deleted.

0 commit comments

Comments
 (0)