joerg/netty
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update to gradle 8.7, update dependencies, reduce test logging, add libtest

Browse source
This commit is contained in:
Jörg Prante 2024-08-31 20:58:48 +02:00
parent 09ba068497
commit 52d3d16cb0
28 changed files with 60 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -2,7 +2,6 @@
/.classpath
/.project
/.gradle
**/data
**/work
**/logs
**/.idea

4
gradle/test/junit5.gradle
View file

@ -12,8 +12,8 @@ test {
useJUnitPlatform()
failFast = false
ignoreFailures = true
minHeapSize = "2g" // initial heap size
maxHeapSize = "4g" // maximum heap size
minHeapSize = "1g" // initial heap size
maxHeapSize = "2g" // maximum heap size
jvmArgs '--add-exports=java.base/jdk.internal=ALL-UNNAMED',
'--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED',
'--add-exports=java.base/sun.nio.ch=ALL-UNNAMED',

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View file

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

20
gradlew.bat vendored
View file

@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
goto fail
@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
goto fail

4
netty-buffer/src/test/resources/logging.properties
View file

@ -1,7 +1,7 @@
handlers=java.util.logging.ConsoleHandler
.level=ALL
.level=INFO
java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$-7s [%3$s] %5$s %6$s%n
java.util.logging.ConsoleHandler.level=ALL
java.util.logging.ConsoleHandler.level=INFO
java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
jdk.event.security.level=INFO
org.junit.jupiter.engine.execution.ConditionEvaluator.level=OFF

4
netty-channel-epoll/src/test/resources/logging.properties
View file

@ -1,7 +1,7 @@
handlers=java.util.logging.ConsoleHandler
.level=ALL
.level=INFO
java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$-7s [%3$s] %5$s %6$s%n
java.util.logging.ConsoleHandler.level=ALL
java.util.logging.ConsoleHandler.level=INFO
java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
jdk.event.security.level=INFO
org.junit.jupiter.engine.execution.ConditionEvaluator.level=OFF

4
netty-channel-unix/src/test/resources/logging.properties
View file

@ -1,7 +1,7 @@
handlers=java.util.logging.ConsoleHandler
.level=ALL
.level=INFO
java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$-7s [%3$s] %5$s %6$s%n
java.util.logging.ConsoleHandler.level=ALL
java.util.logging.ConsoleHandler.level=INFO
java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
jdk.event.security.level=INFO
org.junit.jupiter.engine.execution.ConditionEvaluator.level=OFF

4
netty-channel/src/test/resources/logging.properties
View file

@ -1,7 +1,7 @@
handlers=java.util.logging.ConsoleHandler
.level=ALL
.level=INFO
java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$-7s [%3$s] %5$s %6$s%n
java.util.logging.ConsoleHandler.level=ALL
java.util.logging.ConsoleHandler.level=INFO
java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
jdk.event.security.level=INFO
org.junit.jupiter.engine.execution.ConditionEvaluator.level=OFF

4
netty-handler-codec-compression/src/test/resources/logging.properties
View file

@ -1,7 +1,7 @@
handlers=java.util.logging.ConsoleHandler
.level=ALL
.level=INFO
java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$-7s [%3$s] %5$s %6$s%n
java.util.logging.ConsoleHandler.level=ALL
java.util.logging.ConsoleHandler.level=INFO
java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
jdk.event.security.level=INFO
org.junit.jupiter.engine.execution.ConditionEvaluator.level=OFF

4
netty-handler-codec-http/src/test/resources/logging.properties
View file

@ -1,7 +1,7 @@
handlers=java.util.logging.ConsoleHandler
.level=ALL
.level=INFO
java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$-7s [%3$s] %5$s %6$s%n
java.util.logging.ConsoleHandler.level=ALL
java.util.logging.ConsoleHandler.level=INFO
java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
jdk.event.security.level=INFO
org.junit.jupiter.engine.execution.ConditionEvaluator.level=OFF

4
netty-handler-codec-http2/src/test/resources/logging.properties
View file

@ -1,7 +1,7 @@
handlers=java.util.logging.ConsoleHandler
.level=ALL
.level=INFO
java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$-7s [%3$s] %5$s %6$s%n
java.util.logging.ConsoleHandler.level=ALL
java.util.logging.ConsoleHandler.level=INFO
java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
jdk.event.security.level=INFO
org.junit.jupiter.engine.execution.ConditionEvaluator.level=OFF

4
netty-handler-codec-http3/src/test/resources/logging.properties
View file

@ -1,7 +1,7 @@
handlers=java.util.logging.ConsoleHandler
.level=ALL
.level=INFO
java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$-7s [%3$s] %5$s %6$s%n
java.util.logging.ConsoleHandler.level=ALL
java.util.logging.ConsoleHandler.level=INFO
java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
jdk.event.security.level=INFO
org.junit.jupiter.engine.execution.ConditionEvaluator.level=OFF

4
netty-handler-codec-quic/src/test/resources/logging.properties
View file

@ -1,7 +1,7 @@
handlers=java.util.logging.ConsoleHandler
.level=ALL
.level=INFO
java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$-7s [%3$s] %5$s %6$s%n
java.util.logging.ConsoleHandler.level=ALL
java.util.logging.ConsoleHandler.level=INFO
java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
jdk.event.security.level=INFO
org.junit.jupiter.engine.execution.ConditionEvaluator.level=OFF

4
netty-handler-codec-rtsp/src/test/resources/logging.properties
View file

@ -1,7 +1,7 @@
handlers=java.util.logging.ConsoleHandler
.level=ALL
.level=INFO
java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$-7s [%3$s] %5$s %6$s%n
java.util.logging.ConsoleHandler.level=ALL
java.util.logging.ConsoleHandler.level=INFO
java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
jdk.event.security.level=INFO
org.junit.jupiter.engine.execution.ConditionEvaluator.level=OFF

4
netty-handler-codec-spdy/src/test/resources/logging.properties
View file

@ -1,7 +1,7 @@
handlers=java.util.logging.ConsoleHandler
.level=ALL
.level=INFO
java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$-7s [%3$s] %5$s %6$s%n
java.util.logging.ConsoleHandler.level=ALL
java.util.logging.ConsoleHandler.level=INFO
java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
jdk.event.security.level=INFO
org.junit.jupiter.engine.execution.ConditionEvaluator.level=OFF

4
netty-handler-ssl/src/test/resources/logging.properties
View file

@ -1,7 +1,7 @@
handlers=java.util.logging.ConsoleHandler
.level=ALL
.level=INFO
java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$-7s [%3$s] %5$s %6$s%n
java.util.logging.ConsoleHandler.level=ALL
java.util.logging.ConsoleHandler.level=INFO
java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
jdk.event.security.level=INFO
org.junit.jupiter.engine.execution.ConditionEvaluator.level=OFF

4
netty-handler/src/test/resources/logging.properties
View file

@ -1,7 +1,7 @@
handlers=java.util.logging.ConsoleHandler
.level=ALL
.level=INFO
java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$-7s [%3$s] %5$s %6$s%n
java.util.logging.ConsoleHandler.level=ALL
java.util.logging.ConsoleHandler.level=INFO
java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
jdk.event.security.level=INFO
org.junit.jupiter.engine.execution.ConditionEvaluator.level=OFF

4
netty-jctools/src/test/resources/logging.properties
View file

@ -1,7 +1,7 @@
handlers=java.util.logging.ConsoleHandler
.level=ALL
.level=INFO
java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$-7s [%3$s] %5$s %6$s%n
java.util.logging.ConsoleHandler.level=ALL
java.util.logging.ConsoleHandler.level=INFO
java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
jdk.event.security.level=INFO
org.junit.jupiter.engine.execution.ConditionEvaluator.level=OFF

4
netty-resolver-dns/src/test/resources/logging.properties
View file

@ -1,7 +1,7 @@
handlers=java.util.logging.ConsoleHandler
.level=ALL
.level=INFO
java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$-7s [%3$s] %5$s %6$s%n
java.util.logging.ConsoleHandler.level=ALL
java.util.logging.ConsoleHandler.level=INFO
java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
jdk.event.security.level=INFO
org.junit.jupiter.engine.execution.ConditionEvaluator.level=OFF

4
netty-resolver/src/test/resources/logging.properties
View file

@ -1,7 +1,7 @@
handlers=java.util.logging.ConsoleHandler
.level=ALL
.level=INFO
java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$-7s [%3$s] %5$s %6$s%n
java.util.logging.ConsoleHandler.level=ALL
java.util.logging.ConsoleHandler.level=INFO
java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
jdk.event.security.level=INFO
org.junit.jupiter.engine.execution.ConditionEvaluator.level=OFF

BIN
netty-util/src/test/data/NativeLibraryLoader/1/META-INF/native/libtest1.so Normal file
View file

Binary file not shown.

BIN
netty-util/src/test/data/NativeLibraryLoader/1/META-INF/native/libtest2.so Normal file
View file

Binary file not shown.

BIN
netty-util/src/test/data/NativeLibraryLoader/1/META-INF/native/libtest3.so Normal file
View file

Binary file not shown.

BIN
netty-util/src/test/data/NativeLibraryLoader/2/META-INF/native/libtest1.so Normal file
View file

Binary file not shown.

BIN
netty-util/src/test/data/NativeLibraryLoader/2/META-INF/native/libtest3.so Normal file
View file

Binary file not shown.

4
netty-util/src/test/resources/logging.properties
View file

@ -1,7 +1,7 @@
handlers=java.util.logging.ConsoleHandler
.level=ALL
.level=INFO
java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$-7s [%3$s] %5$s %6$s%n
java.util.logging.ConsoleHandler.level=ALL
java.util.logging.ConsoleHandler.level=INFO
java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
jdk.event.security.level=INFO
org.junit.jupiter.engine.execution.ConditionEvaluator.level=OFF

23
settings.gradle
View file

@ -15,13 +15,16 @@ pluginManagement {
dependencyResolutionManagement {
versionCatalogs {
libs {
version('gradle', '8.5')
version('brotli4j', '1.16.0')
library('bouncycastle', 'org.bouncycastle', 'bcpkix-jdk18on').version('1.77')
library('conscrypt', 'org.conscrypt', 'conscrypt-openjdk-uber').version('2.5.2')
library('lz4', 'org.lz4', 'lz4-java').version('1.8.0')
library('lzf', 'com.ning', 'compress-lzf').version('1.1.2')
library('zstd', 'com.github.luben', 'zstd-jni').version('1.5.5-11')
version('gradle', '8.7')
version('bouncycastle', '1.78.1')
version('brotli4j', '1.17.0')
version('lz4', '1.8.0')
version('lzf', '1.1.2')
version('zstd', '1.5.6-5')
library('bouncycastle', 'org.bouncycastle', 'bcpkix-jdk18on').versionRef('bouncycastle')
library('lz4', 'org.lz4', 'lz4-java').versionRef('lz4')
library('lzf', 'com.ning', 'compress-lzf').versionRef('lzf')
library('zstd', 'com.github.luben', 'zstd-jni').versionRef('zstd')
library('brotli4j', 'com.aayushatharva.brotli4j', 'brotli4j').versionRef('brotli4j')
library('brotli4j-native-linux-x8664', 'com.aayushatharva.brotli4j', 'native-linux-x86_64').versionRef('brotli4j')
library('brotli4j-native-linux-aarch64', 'com.aayushatharva.brotli4j', 'native-linux-aarch64').versionRef('brotli4j')
@ -31,7 +34,7 @@ dependencyResolutionManagement {
library('brotli4j-native-windows-x8664', 'com.aayushatharva.brotli4j', 'native-windows-x86_64').versionRef('brotli4j')
}
testLibs {
version('junit', '5.10.1')
version('junit', '5.10.2')
library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit')
library('junit-jupiter-params', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junit')
library('junit-jupiter-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit')
@ -43,8 +46,8 @@ dependencyResolutionManagement {
library('assertj', 'org.assertj', 'assertj-core').version('3.22.0')
library('testlibs', 'com.google.guava', 'guava-testlib').version('33.0.0-jre')
library('lincheck', 'org.jetbrains.kotlinx', 'lincheck-jvm').version('2.23')
library('asm-commons', 'org.ow2.asm', 'asm-commons').version('9.6')
library('asm-util', 'org.ow2.asm', 'asm-util').version('9.6')
library('asm-commons', 'org.ow2.asm', 'asm-commons').version('9.7')
library('asm-util', 'org.ow2.asm', 'asm-util').version('9.7')
library('gson', 'com.google.code.gson', 'gson').version('2.10.1')
library('reflections', 'org.reflections', 'reflections').version('0.10.2')
library('amazonCorrettoCrypt', 'software.amazon.cryptools', 'AmazonCorrettoCryptoProvider').version('2.3.2')