Merge pull request #1288 from ballerina-platform/netty-fix

ThisaruGuruge · web-flow · commit 49a702654d91 · 2024-11-26T15:24:05.000+05:30
diff --git 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
@@ -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)
+                description: Ballerina Lang Version (If given ballerina lang build 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:
-            - main
+            - 2201.9.x
         types: [ opened, synchronize, reopened, labeled, unlabeled ]
 
 concurrency:
@@ -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
@@ -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
@@ -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
@@ -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: udp
diff --git 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/stale_check.yml b/.github/workflows/stale_check.yml
diff --git 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-udp'
       runtime_artifacts_url: 'https://api.github.com/repos/ballerina-platform/module-ballerina-udp/actions/artifacts'
diff --git 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/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
@@ -1,7 +1,7 @@
 [package]
 org = "ballerina"
 name = "udp"
-version = "1.10.0"
+version = "1.10.1"
 authors = ["Ballerina"]
 keywords = ["UDP", "datagram", "transport"]
 repository = "https://github.com/ballerina-platform/module-ballerina-udp"
@@ -15,39 +15,39 @@ graalvmCompatible = true
 [[platform.java17.dependency]]
 groupId = "io.ballerina.stdlib"
 artifactId = "udp-native"
-version = "1.10.0"
-path = "../native/build/libs/udp-native-1.10.0.jar"
+version = "1.10.1"
+path = "../native/build/libs/udp-native-1.10.1-SNAPSHOT.jar"
 
 [[platform.java17.dependency]]
-path = "../test-utils/build/libs/udp-test-utils-1.10.0.jar"
+path = "../test-utils/build/libs/udp-test-utils-1.10.1-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"
diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml
@@ -3,4 +3,4 @@ id = "udp-plugin"
 class = "io.ballerina.stdlib.udp.compiler.UdpCompilerPlugin"
 
 [[dependency]]
-path = "../compiler-plugin/build/libs/udp-compiler-plugin-1.10.0.jar"
+path = "../compiler-plugin/build/libs/udp-compiler-plugin-1.10.1-SNAPSHOT.jar"
diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -10,7 +10,7 @@ distribution-version = "2201.9.0"
 [[package]]
 org = "ballerina"
 name = "io"
-version = "1.6.0"
+version = "1.6.1"
 scope = "testOnly"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
@@ -113,7 +113,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "udp"
-version = "1.10.0"
+version = "1.10.1"
 dependencies = [
 	{org = "ballerina", name = "io"},
 	{org = "ballerina", name = "jballerina.java"},
diff --git 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)
+
+## [2201.10.0] - 2024-05-03
+
 ### Changed
 - [Make some of the Java classes proper utility classes](https://github.com/ballerina-platform/ballerina-standard-library/issues/4926)
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,14 +1,14 @@
 org.gradle.caching=true
 group=io.ballerina.stdlib
-version=1.10.0
+version=1.10.1-SNAPSHOT
 ballerinaLangVersion=2201.9.0
 
 puppycrawlCheckstyleVersion=10.12.0
 githubJohnrengelmanShadowVersion=8.1.1
 checkstyleToolVersion=7.8.2
 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
diff --git a/native/src/main/resources/META-INF/native-image/io.ballerina.stdlib/udp-native/reflect-config.json b/native/src/main/resources/META-INF/native-image/io.ballerina.stdlib/udp-native/reflect-config.json
@@ -109,5 +109,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"}]
   }
 ]
