diff --git a/.gitignore b/.gitignore index d5b5511..21abfe6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ /.classpath /.project /.gradle -**/data **/work **/logs **/.idea diff --git a/gradle/test/junit5.gradle b/gradle/test/junit5.gradle index 6a29c60..d984d4a 100644 --- a/gradle/test/junit5.gradle +++ b/gradle/test/junit5.gradle @@ -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', diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd49..e644113 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e6aba25..b82aa23 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/gradlew.bat b/gradlew.bat index 6689b85..7101f8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -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 diff --git a/netty-buffer/src/test/resources/logging.properties b/netty-buffer/src/test/resources/logging.properties index 3cd7309..fe5f0eb 100644 --- a/netty-buffer/src/test/resources/logging.properties +++ b/netty-buffer/src/test/resources/logging.properties @@ -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 diff --git a/netty-channel-epoll/src/test/resources/logging.properties b/netty-channel-epoll/src/test/resources/logging.properties index 3cd7309..fe5f0eb 100644 --- a/netty-channel-epoll/src/test/resources/logging.properties +++ b/netty-channel-epoll/src/test/resources/logging.properties @@ -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 diff --git a/netty-channel-unix/src/test/resources/logging.properties b/netty-channel-unix/src/test/resources/logging.properties index 3cd7309..fe5f0eb 100644 --- a/netty-channel-unix/src/test/resources/logging.properties +++ b/netty-channel-unix/src/test/resources/logging.properties @@ -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 diff --git a/netty-channel/src/test/resources/logging.properties b/netty-channel/src/test/resources/logging.properties index 3cd7309..fe5f0eb 100644 --- a/netty-channel/src/test/resources/logging.properties +++ b/netty-channel/src/test/resources/logging.properties @@ -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 diff --git a/netty-handler-codec-compression/src/test/resources/logging.properties b/netty-handler-codec-compression/src/test/resources/logging.properties index 3cd7309..fe5f0eb 100644 --- a/netty-handler-codec-compression/src/test/resources/logging.properties +++ b/netty-handler-codec-compression/src/test/resources/logging.properties @@ -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 diff --git a/netty-handler-codec-http/src/test/resources/logging.properties b/netty-handler-codec-http/src/test/resources/logging.properties index 3cd7309..fe5f0eb 100644 --- a/netty-handler-codec-http/src/test/resources/logging.properties +++ b/netty-handler-codec-http/src/test/resources/logging.properties @@ -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 diff --git a/netty-handler-codec-http2/src/test/resources/logging.properties b/netty-handler-codec-http2/src/test/resources/logging.properties index 3cd7309..fe5f0eb 100644 --- a/netty-handler-codec-http2/src/test/resources/logging.properties +++ b/netty-handler-codec-http2/src/test/resources/logging.properties @@ -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 diff --git a/netty-handler-codec-http3/src/test/resources/logging.properties b/netty-handler-codec-http3/src/test/resources/logging.properties index 3cd7309..fe5f0eb 100644 --- a/netty-handler-codec-http3/src/test/resources/logging.properties +++ b/netty-handler-codec-http3/src/test/resources/logging.properties @@ -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 diff --git a/netty-handler-codec-quic/src/test/resources/logging.properties b/netty-handler-codec-quic/src/test/resources/logging.properties index 3cd7309..fe5f0eb 100644 --- a/netty-handler-codec-quic/src/test/resources/logging.properties +++ b/netty-handler-codec-quic/src/test/resources/logging.properties @@ -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 diff --git a/netty-handler-codec-rtsp/src/test/resources/logging.properties b/netty-handler-codec-rtsp/src/test/resources/logging.properties index 3cd7309..fe5f0eb 100644 --- a/netty-handler-codec-rtsp/src/test/resources/logging.properties +++ b/netty-handler-codec-rtsp/src/test/resources/logging.properties @@ -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 diff --git a/netty-handler-codec-spdy/src/test/resources/logging.properties b/netty-handler-codec-spdy/src/test/resources/logging.properties index 3cd7309..fe5f0eb 100644 --- a/netty-handler-codec-spdy/src/test/resources/logging.properties +++ b/netty-handler-codec-spdy/src/test/resources/logging.properties @@ -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 diff --git a/netty-handler-ssl/src/test/resources/logging.properties b/netty-handler-ssl/src/test/resources/logging.properties index 0d14c34..d914d9e 100644 --- a/netty-handler-ssl/src/test/resources/logging.properties +++ b/netty-handler-ssl/src/test/resources/logging.properties @@ -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 diff --git a/netty-handler/src/test/resources/logging.properties b/netty-handler/src/test/resources/logging.properties index 3cd7309..fe5f0eb 100644 --- a/netty-handler/src/test/resources/logging.properties +++ b/netty-handler/src/test/resources/logging.properties @@ -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 diff --git a/netty-jctools/src/test/resources/logging.properties b/netty-jctools/src/test/resources/logging.properties index 3cd7309..fe5f0eb 100644 --- a/netty-jctools/src/test/resources/logging.properties +++ b/netty-jctools/src/test/resources/logging.properties @@ -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 diff --git a/netty-resolver-dns/src/test/resources/logging.properties b/netty-resolver-dns/src/test/resources/logging.properties index 3cd7309..fe5f0eb 100644 --- a/netty-resolver-dns/src/test/resources/logging.properties +++ b/netty-resolver-dns/src/test/resources/logging.properties @@ -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 diff --git a/netty-resolver/src/test/resources/logging.properties b/netty-resolver/src/test/resources/logging.properties index 3cd7309..fe5f0eb 100644 --- a/netty-resolver/src/test/resources/logging.properties +++ b/netty-resolver/src/test/resources/logging.properties @@ -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 diff --git a/netty-util/src/test/data/NativeLibraryLoader/1/META-INF/native/libtest1.so b/netty-util/src/test/data/NativeLibraryLoader/1/META-INF/native/libtest1.so new file mode 100644 index 0000000..02de1f2 Binary files /dev/null and b/netty-util/src/test/data/NativeLibraryLoader/1/META-INF/native/libtest1.so differ diff --git a/netty-util/src/test/data/NativeLibraryLoader/1/META-INF/native/libtest2.so b/netty-util/src/test/data/NativeLibraryLoader/1/META-INF/native/libtest2.so new file mode 100644 index 0000000..02de1f2 Binary files /dev/null and b/netty-util/src/test/data/NativeLibraryLoader/1/META-INF/native/libtest2.so differ diff --git a/netty-util/src/test/data/NativeLibraryLoader/1/META-INF/native/libtest3.so b/netty-util/src/test/data/NativeLibraryLoader/1/META-INF/native/libtest3.so new file mode 100644 index 0000000..02de1f2 Binary files /dev/null and b/netty-util/src/test/data/NativeLibraryLoader/1/META-INF/native/libtest3.so differ diff --git a/netty-util/src/test/data/NativeLibraryLoader/2/META-INF/native/libtest1.so b/netty-util/src/test/data/NativeLibraryLoader/2/META-INF/native/libtest1.so new file mode 100644 index 0000000..2f9f280 Binary files /dev/null and b/netty-util/src/test/data/NativeLibraryLoader/2/META-INF/native/libtest1.so differ diff --git a/netty-util/src/test/data/NativeLibraryLoader/2/META-INF/native/libtest3.so b/netty-util/src/test/data/NativeLibraryLoader/2/META-INF/native/libtest3.so new file mode 100644 index 0000000..02de1f2 Binary files /dev/null and b/netty-util/src/test/data/NativeLibraryLoader/2/META-INF/native/libtest3.so differ diff --git a/netty-util/src/test/resources/logging.properties b/netty-util/src/test/resources/logging.properties index 3cd7309..fe5f0eb 100644 --- a/netty-util/src/test/resources/logging.properties +++ b/netty-util/src/test/resources/logging.properties @@ -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 diff --git a/settings.gradle b/settings.gradle index b810448..10957fe 100644 --- a/settings.gradle +++ b/settings.gradle @@ -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')