Skip to content

Commit

Permalink
Merge pull request #1149 from Bhashinee/2201.4.x
Browse files Browse the repository at this point in the history
[2201.4.x] Update Netty versions
  • Loading branch information
Bhashinee authored Oct 16, 2023
2 parents dfba5fe + 3473676 commit 74dbd10
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 27 deletions.
44 changes: 22 additions & 22 deletions ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
org = "ballerina"
name = "websocket"
version = "2.6.0"
version = "2.6.1"
authors = ["Ballerina"]
keywords = ["ws", "network", "bi-directional", "streaming", "service", "client"]
repository = "https://github.com/ballerina-platform/module-ballerina-websocket"
Expand All @@ -12,14 +12,14 @@ distribution = "2201.4.0"
[[platform.java11.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "websocket-native"
version = "2.6.0"
path = "../native/build/libs/websocket-native-2.6.0.jar"
version = "2.6.1"
path = "../native/build/libs/websocket-native-2.6.1-SNAPSHOT.jar"

[[platform.java11.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "http-native"
version = "2.6.0"
path = "./lib/http-native-2.6.0.jar"
version = "2.6.2"
path = "./lib/http-native-2.6.2-20231013-151500-b205e1d.jar"

[[platform.java11.dependency]]
groupId = "io.ballerina.stdlib"
Expand All @@ -36,51 +36,51 @@ path = "./lib/constraint-native-1.1.0.jar"
[[platform.java11.dependency]]
groupId = "io.netty"
artifactId = "netty-common"
version = "4.1.86.Final"
path = "./lib/netty-common-4.1.86.Final.jar"
version = "4.1.100.Final"
path = "./lib/netty-common-4.1.100.Final.jar"

[[platform.java11.dependency]]
groupId = "io.netty"
artifactId = "netty-buffer"
version = "4.1.86.Final"
path = "./lib/netty-buffer-4.1.86.Final.jar"
version = "4.1.100.Final"
path = "./lib/netty-buffer-4.1.100.Final.jar"

[[platform.java11.dependency]]
groupId = "io.netty"
artifactId = "netty-transport"
version = "4.1.86.Final"
path = "./lib/netty-transport-4.1.86.Final.jar"
version = "4.1.100.Final"
path = "./lib/netty-transport-4.1.100.Final.jar"

[[platform.java11.dependency]]
groupId = "io.netty"
artifactId = "netty-resolver"
version = "4.1.86.Final"
path = "./lib/netty-resolver-4.1.86.Final.jar"
version = "4.1.100.Final"
path = "./lib/netty-resolver-4.1.100.Final.jar"

[[platform.java11.dependency]]
groupId = "io.netty"
artifactId = "netty-handler"
version = "4.1.86.Final"
path = "./lib/netty-handler-4.1.86.Final.jar"
version = "4.1.100.Final"
path = "./lib/netty-handler-4.1.100.Final.jar"

[[platform.java11.dependency]]
groupId = "io.netty"
artifactId = "netty-codec-http"
version = "4.1.86.Final"
path = "./lib/netty-codec-http-4.1.86.Final.jar"
version = "4.1.100.Final"
path = "./lib/netty-codec-http-4.1.100.Final.jar"

[[platform.java11.dependency]]
groupId = "io.netty"
artifactId = "netty-codec"
version = "4.1.86.Final"
path = "./lib/netty-codec-4.1.86.Final.jar"
version = "4.1.100.Final"
path = "./lib/netty-codec-4.1.100.Final.jar"

[[platform.java11.dependency]]
groupId = "io.netty"
artifactId = "netty-handler-proxy"
version = "4.1.86.Final"
path = "./lib/netty-handler-proxy-4.1.86.Final.jar"
version = "4.1.100.Final"
path = "./lib/netty-handler-proxy-4.1.100.Final.jar"

[[platform.java11.dependency]]
path = "../test-utils/build/libs/websocket-test-utils-2.6.0.jar"
path = "../test-utils/build/libs/websocket-test-utils-2.6.1-SNAPSHOT.jar"
scope = "testOnly"
2 changes: 1 addition & 1 deletion ballerina/CompilerPlugin.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ id = "websocket-compiler-plugin"
class = "io.ballerina.stdlib.websocket.plugin.WebSocketCompilerPlugin"

[[dependency]]
path = "../compiler-plugin/build/libs/websocket-compiler-plugin-2.6.0.jar"
path = "../compiler-plugin/build/libs/websocket-compiler-plugin-2.6.1-SNAPSHOT.jar"
5 changes: 5 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]

### Fixed
- [Address netty vulnerability: CVE-2023-4586](https://github.com/ballerina-platform/ballerina-standard-library/issues/4908)

## [2.6.0] - 2023-01-20

### Added
- [Implement dispatching to custom remote functions](https://github.com/ballerina-platform/ballerina-standard-library/issues/3670)

Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
org.gradle.caching=true
group=io.ballerina.stdlib
version=2.6.0
version=2.6.1-SNAPSHOT
ballerinaLangVersion=2201.4.0
ballerinaTomlParserVersion=1.2.2
nettyVersion=4.1.86.Final
nettyVersion=4.1.100.Final
slf4jVersion=1.7.30
puppycrawlCheckstyleVersion=8.18
unirestVersion=1.4.9
Expand All @@ -12,7 +12,7 @@ ballerinaGradlePluginVersion=1.0.0
gsonVersion=2.8.8

stdlibIoVersion=1.4.0
stdlibHttpVersion=2.6.0
stdlibHttpVersion=2.6.2
stdlibRegexVersion=1.3.2
stdlibOsVersion=1.6.0
stdlibTimeVersion=2.2.3
Expand All @@ -24,7 +24,7 @@ stdlibMimeVersion=2.6.0
stdlibCacheVersion=3.4.0
stdlibAuthVersion=2.6.0
stdlibJwtVersion=2.6.0
stdlibOAuth2Version=2.6.0
stdlibOAuth2Version=2.6.1
stdlibConstraintVersion=1.1.0
stdlibUuidVersion=1.4.0
stdlibUrlVersion=2.2.3
Expand Down

0 comments on commit 74dbd10

Please sign in to comment.