From 9dd9d3034555a7b1d43ca3efc6b93641b5753743 Mon Sep 17 00:00:00 2001 From: Thisaru Guruge Date: Tue, 26 Nov 2024 13:23:56 +0530 Subject: [PATCH 1/4] [Automated] Update the native jar versions --- ballerina/Ballerina.toml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 7bd6031a..e1b23c56 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -25,50 +25,50 @@ 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" From c83a01dee4222937b5a87d9f06537c425bbd44fd Mon Sep 17 00:00:00 2001 From: Thisaru Guruge Date: Tue, 26 Nov 2024 13:26:11 +0530 Subject: [PATCH 2/4] Update Netty version --- .github/workflows/build-timestamped-master.yml | 2 +- .github/workflows/build-with-bal-test-graalvm.yml | 2 +- .github/workflows/central-publish.yml | 2 +- .github/workflows/process-load-test-result.yml | 2 +- .github/workflows/publish-release.yml | 2 +- .github/workflows/pull-request.yml | 2 +- .github/workflows/trigger-load-tests.yml | 2 +- .github/workflows/trivy-scan.yml | 2 +- changelog.md | 5 +++++ gradle.properties | 2 +- 10 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml index cc4972eb..d461e638 100644 --- a/.github/workflows/build-timestamped-master.yml +++ b/.github/workflows/build-timestamped-master.yml @@ -14,5 +14,5 @@ jobs: call_workflow: name: Run Build Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/build-timestamp-master-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/build-timestamp-master-template.yml@2201.10.x secrets: inherit diff --git a/.github/workflows/build-with-bal-test-graalvm.yml b/.github/workflows/build-with-bal-test-graalvm.yml index 997c0100..59ddc5d2 100644 --- a/.github/workflows/build-with-bal-test-graalvm.yml +++ b/.github/workflows/build-with-bal-test-graalvm.yml @@ -30,7 +30,7 @@ jobs: call_stdlib_workflow: name: Run StdLib Workflow if: ${{ github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository_owner == 'ballerina-platform') }} - uses: ballerina-platform/ballerina-library/.github/workflows/build-with-bal-test-graalvm-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/build-with-bal-test-graalvm-template.yml@2201.10.x with: lang_tag: ${{ inputs.lang_tag }} lang_version: ${{ inputs.lang_version }} diff --git a/.github/workflows/central-publish.yml b/.github/workflows/central-publish.yml index 11922b55..74c48557 100644 --- a/.github/workflows/central-publish.yml +++ b/.github/workflows/central-publish.yml @@ -15,7 +15,7 @@ jobs: call_workflow: name: Run Central Publish Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/central-publish-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/central-publish-template.yml@2201.10.x secrets: inherit with: environment: ${{ github.event.inputs.environment }} diff --git a/.github/workflows/process-load-test-result.yml b/.github/workflows/process-load-test-result.yml index 3de10e47..805870b4 100644 --- a/.github/workflows/process-load-test-result.yml +++ b/.github/workflows/process-load-test-result.yml @@ -6,7 +6,7 @@ on: jobs: call_stdlib_process_load_test_results_workflow: name: Run StdLib Process Load Test Results Workflow - uses: ballerina-platform/ballerina-library/.github/workflows/process-load-test-results-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/process-load-test-results-template.yml@2201.10.x with: results: ${{ toJson(github.event.client_payload.results) }} secrets: diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index b482c530..25bcafd5 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -9,7 +9,7 @@ jobs: call_workflow: name: Run Release Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/release-package-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/release-package-template.yml@2201.10.x secrets: inherit with: package-name: tcp diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index ecfa72ce..936284e6 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -10,5 +10,5 @@ jobs: call_workflow: name: Run PR Build Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/pull-request-build-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/pull-request-build-template.yml@2201.10.x secrets: inherit diff --git a/.github/workflows/trigger-load-tests.yml b/.github/workflows/trigger-load-tests.yml index 587e2d60..2f69e2ad 100644 --- a/.github/workflows/trigger-load-tests.yml +++ b/.github/workflows/trigger-load-tests.yml @@ -22,7 +22,7 @@ jobs: call_stdlib_trigger_load_test_workflow: name: Run StdLib Load Test Workflow if: ${{ github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository_owner == 'ballerina-platform') }} - uses: ballerina-platform/ballerina-library/.github/workflows/trigger-load-tests-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/trigger-load-tests-template.yml@2201.10.x with: repo_name: 'module-ballerina-tcp' runtime_artifacts_url: 'https://api.github.com/repos/ballerina-platform/module-ballerina-tcp/actions/artifacts' diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index 458aab57..b4cfe21e 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -9,5 +9,5 @@ jobs: call_workflow: name: Run Trivy Scan Workflow if: ${{ github.repository_owner == 'ballerina-platform' }} - uses: ballerina-platform/ballerina-library/.github/workflows/trivy-scan-template.yml@main + uses: ballerina-platform/ballerina-library/.github/workflows/trivy-scan-template.yml@2201.10.x secrets: inherit diff --git a/changelog.md b/changelog.md index 94ab869a..8a5c1772 100644 --- a/changelog.md +++ b/changelog.md @@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] +### Fixed +- [Update netty version](https://github.com/ballerina-platform/ballerina-library/issues/7358) + +## [1.10.1] - 2024-09-28 + ### Fixed - [Address CVE-2024-7254 Protobuf Vulnerability](https://github.com/ballerina-platform/ballerina-library/issues/7013#event-14332816771) diff --git a/gradle.properties b/gradle.properties index 6bba054f..392ebb09 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,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 153d965987789bb751f1f6982f25e980d999d698 Mon Sep 17 00:00:00 2001 From: Thisaru Guruge Date: Tue, 26 Nov 2024 13:36:18 +0530 Subject: [PATCH 3/4] [Automated] Update the native jar versions --- .github/workflows/stale_check.yml | 19 ------------------- ballerina/Ballerina.toml | 8 ++++---- ballerina/CompilerPlugin.toml | 2 +- ballerina/Dependencies.toml | 2 +- gradle.properties | 2 +- 5 files changed, 7 insertions(+), 26 deletions(-) delete mode 100644 .github/workflows/stale_check.yml diff --git a/.github/workflows/stale_check.yml b/.github/workflows/stale_check.yml deleted file mode 100644 index 8763360a..00000000 --- a/.github/workflows/stale_check.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: 'Close stale pull requests' - -on: - schedule: - - cron: '30 19 * * *' - workflow_dispatch: - -jobs: - stale: - runs-on: ubuntu-latest - steps: - - uses: actions/stale@v3 - with: - stale-pr-message: 'This PR has been open for more than 15 days with no activity. This will be closed in 3 days unless the `stale` label is removed or commented.' - close-pr-message: 'Closed PR due to inactivity for more than 18 days.' - days-before-pr-stale: 15 - days-before-pr-close: 3 - days-before-issue-stale: -1 - days-before-issue-close: -1 diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index e1b23c56..b4c403fe 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,7 +1,7 @@ [package] org = "ballerina" name = "tcp" -version = "1.10.1" +version = "1.10.2" authors = ["Ballerina"] keywords = ["network", "socket", "service", "client"] repository = "https://github.com/ballerina-platform/module-ballerina-tcp" @@ -15,11 +15,11 @@ graalvmCompatible = true [[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "tcp-native" -version = "1.10.1" -path = "../native/build/libs/tcp-native-1.10.1.jar" +version = "1.10.2" +path = "../native/build/libs/tcp-native-1.10.2-SNAPSHOT.jar" [[platform.java17.dependency]] -path = "../test-utils/build/libs/tcp-test-utils-1.10.1.jar" +path = "../test-utils/build/libs/tcp-test-utils-1.10.2-SNAPSHOT.jar" scope = "testOnly" [[platform.java17.dependency]] diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml index 94ff1a54..84fce2ab 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.10.1.jar" +path = "../compiler-plugin/build/libs/tcp-compiler-plugin-1.10.2-SNAPSHOT.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index f275ecbf..26a4ab38 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -99,7 +99,7 @@ dependencies = [ [[package]] org = "ballerina" name = "tcp" -version = "1.10.1" +version = "1.10.2" dependencies = [ {org = "ballerina", name = "crypto"}, {org = "ballerina", name = "io"}, diff --git a/gradle.properties b/gradle.properties index 392ebb09..17ba7192 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ org.gradle.caching=true group=io.ballerina.stdlib -version=1.10.1 +version=1.10.2-SNAPSHOT ballerinaLangVersion=2201.9.0 puppycrawlCheckstyleVersion=10.12.0 From dadb0228f1e638eed5fc596e6583d32fcf0dca6b Mon Sep 17 00:00:00 2001 From: Thisaru Guruge Date: Tue, 26 Nov 2024 13:50:01 +0530 Subject: [PATCH 4/4] Enable GraalVM tests --- .github/workflows/build-with-bal-test-graalvm.yml | 6 +++--- .../tcp-native/reflect-config.json | 12 ++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-with-bal-test-graalvm.yml b/.github/workflows/build-with-bal-test-graalvm.yml index 59ddc5d2..942bd0d1 100644 --- a/.github/workflows/build-with-bal-test-graalvm.yml +++ b/.github/workflows/build-with-bal-test-graalvm.yml @@ -6,11 +6,11 @@ on: lang_tag: description: Branch/Release Tag of the Ballerina Lang required: true - default: master + default: 2201.9.x lang_version: description: Ballerina Lang Version (If given ballerina lang buid will be skipped) required: false - default: '' + default: 2201.9.0 native_image_options: description: Default native-image options required: false @@ -19,7 +19,7 @@ on: - cron: '30 18 * * *' pull_request: branches: - - master + - 2201.9.x types: [ opened, synchronize, reopened, labeled, unlabeled ] concurrency: 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"}] } ]