From 12d63e7bb1f515bfcba189c0c6e3fb4f957b7530 Mon Sep 17 00:00:00 2001 From: DimuthuMadushan Date: Wed, 13 Nov 2024 20:01:28 +0530 Subject: [PATCH 1/3] Update the netty version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index acca0099..1c0efde1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ githubJohnrengelmanShadowVersion=8.1.1 checkstyleToolVersion=10.12.0 githubSpotbugsVersion=5.0.14 testngVersion=7.6.1 -nettyVersion=4.1.108.Final +nettyVersion=4.1.115.Final underCouchDownloadVersion=5.4.0 researchgateReleaseVersion=2.8.0 slf4jVersion=1.7.30 From 32c7152e12528d307732aa2ecb9f48e76fd054c9 Mon Sep 17 00:00:00 2001 From: DimuthuMadushan Date: Wed, 13 Nov 2024 20:05:03 +0530 Subject: [PATCH 2/3] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 40 +++++++++++++++++------------------ ballerina/CompilerPlugin.toml | 2 +- ballerina/Dependencies.toml | 4 ++-- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 25931284..669c74a5 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,7 +1,7 @@ [package] org = "ballerina" name = "tcp" -version = "1.11.1" +version = "1.11.2" authors = ["Ballerina"] keywords = ["network", "socket", "service", "client"] repository = "https://github.com/ballerina-platform/module-ballerina-tcp" @@ -15,60 +15,60 @@ graalvmCompatible = true [[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "tcp-native" -version = "1.11.1" -path = "../native/build/libs/tcp-native-1.11.1.jar" +version = "1.11.2" +path = "../native/build/libs/tcp-native-1.11.2-SNAPSHOT.jar" [[platform.java17.dependency]] -path = "../test-utils/build/libs/tcp-test-utils-1.11.1.jar" +path = "../test-utils/build/libs/tcp-test-utils-1.11.2-SNAPSHOT.jar" scope = "testOnly" [[platform.java17.dependency]] groupId = "io.netty" artifactId = "netty-handler" -version = "4.1.108.Final" -path = "./lib/netty-handler-4.1.108.Final.jar" +version = "4.1.115.Final" +path = "./lib/netty-handler-4.1.115.Final.jar" [[platform.java17.dependency]] groupId = "io.netty" artifactId = "netty-buffer" -version = "4.1.108.Final" -path = "./lib/netty-buffer-4.1.108.Final.jar" +version = "4.1.115.Final" +path = "./lib/netty-buffer-4.1.115.Final.jar" [[platform.java17.dependency]] groupId = "io.netty" artifactId = "netty-transport" -version = "4.1.108.Final" -path = "./lib/netty-transport-4.1.108.Final.jar" +version = "4.1.115.Final" +path = "./lib/netty-transport-4.1.115.Final.jar" [[platform.java17.dependency]] groupId = "io.netty" artifactId = "netty-common" -version = "4.1.108.Final" -path = "./lib/netty-common-4.1.108.Final.jar" +version = "4.1.115.Final" +path = "./lib/netty-common-4.1.115.Final.jar" [[platform.java17.dependency]] groupId = "io.netty" artifactId = "netty-resolver" -version = "4.1.108.Final" -path = "./lib/netty-resolver-4.1.108.Final.jar" +version = "4.1.115.Final" +path = "./lib/netty-resolver-4.1.115.Final.jar" [[platform.java17.dependency]] groupId = "io.netty" artifactId = "netty-codec" -version = "4.1.108.Final" -path = "./lib/netty-codec-4.1.108.Final.jar" +version = "4.1.115.Final" +path = "./lib/netty-codec-4.1.115.Final.jar" [[platform.java17.dependency]] groupId = "io.netty" artifactId = "netty-transport-native-unix-common" -version = "4.1.108.Final" -path = "./lib/netty-transport-native-unix-common-4.1.108.Final.jar" +version = "4.1.115.Final" +path = "./lib/netty-transport-native-unix-common-4.1.115.Final.jar" [[platform.java17.dependency]] groupId = "io.netty" artifactId = "netty-codec-socks" -version = "4.1.108.Final" -path = "./lib/netty-codec-socks-4.1.108.Final.jar" +version = "4.1.115.Final" +path = "./lib/netty-codec-socks-4.1.115.Final.jar" [[platform.java17.dependency]] groupId = "org.jboss.marshalling" diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml index bba076da..53c4ec7b 100644 --- a/ballerina/CompilerPlugin.toml +++ b/ballerina/CompilerPlugin.toml @@ -3,4 +3,4 @@ id = "tcp-plugin" class = "io.ballerina.stdlib.tcp.compiler.TcpCompilerPlugin" [[dependency]] -path = "../compiler-plugin/build/libs/tcp-compiler-plugin-1.11.1.jar" +path = "../compiler-plugin/build/libs/tcp-compiler-plugin-1.11.2-SNAPSHOT.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index a20f37fa..bc32e19d 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -99,7 +99,7 @@ dependencies = [ [[package]] org = "ballerina" name = "tcp" -version = "1.11.1" +version = "1.11.2" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "io"}, @@ -128,7 +128,7 @@ modules = [ [[package]] org = "ballerina" name = "time" -version = "2.4.0" +version = "2.4.1" dependencies = [ {org = "ballerina", name = "jballerina.java"} ] From 817e6eb2a487e3c85fffed62cb28c53c739ad728 Mon Sep 17 00:00:00 2001 From: DimuthuMadushan Date: Mon, 18 Nov 2024 09:18:21 +0530 Subject: [PATCH 3/3] Update reflection config --- .../tcp-native/reflect-config.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/native/src/main/resources/META-INF/native-image/io.ballerina.stdlib/tcp-native/reflect-config.json b/native/src/main/resources/META-INF/native-image/io.ballerina.stdlib/tcp-native/reflect-config.json index 1db14417..ec66bc5a 100644 --- a/native/src/main/resources/META-INF/native-image/io.ballerina.stdlib/tcp-native/reflect-config.json +++ b/native/src/main/resources/META-INF/native-image/io.ballerina.stdlib/tcp-native/reflect-config.json @@ -136,5 +136,17 @@ { "name":"io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerLimitField", "fields":[{"name":"producerLimit"}] + }, + { + "name": "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueConsumerIndexField", + "fields": [{"name": "consumerIndex"}] + }, + { + "name": "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField", + "fields": [{"name": "producerIndex"}] + }, + { + "name": "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerLimitField", + "fields": [{"name": "producerLimit"}] } ]