Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2201.3.x] Update netty version #1146

Closed
wants to merge 4 commits into from
Closed

[2201.3.x] Update netty version #1146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
41d3e6a
[Automated] Update the native jar versions
Bhashinee Jan 12, 2023
d78921a
[Automated] Update the native jar versions
Bhashinee Jan 12, 2023
2b8cd64
Merge branch '2201.3.x' of https://github.com/ballerina-platform/modu…
Bhashinee Oct 13, 2023
0f7859c
Update netty version
Bhashinee Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions ballerina/Ballerina.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
org = "ballerina"
name = "websocket"
version = "2.5.1"
version = "2.5.2"
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.3.0"
[[platform.java11.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "websocket-native"
version = "2.5.1"
path = "../native/build/libs/websocket-native-2.5.1.jar"
version = "2.5.2"
path = "../native/build/libs/websocket-native-2.5.2-SNAPSHOT.jar"

[[platform.java11.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "http-native"
version = "2.5.2"
path = "./lib/http-native-2.5.2.jar"
version = "2.5.4"
path = "./lib/http-native-2.5.4-20231013-152300-784fd78.jar"

[[platform.java11.dependency]]
groupId = "io.ballerina.stdlib"
Expand All @@ -36,51 +36,51 @@ path = "./lib/constraint-native-1.0.1.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.5.1.jar"
path = "../test-utils/build/libs/websocket-test-utils-2.5.2-SNAPSHOT.jar"
scope = "testOnly"
2 changes: 1 addition & 1 deletion ballerina/CompilerPlugin.toml
View file
Open in desktop
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.5.1.jar"
path = "../compiler-plugin/build/libs/websocket-compiler-plugin-2.5.2-SNAPSHOT.jar"
20 changes: 10 additions & 10 deletions ballerina/Dependencies.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "constraint"
version = "1.0.1"
version = "1.0.2"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]
Expand All @@ -47,7 +47,7 @@ modules = [
[[package]]
org = "ballerina"
name = "crypto"
version = "2.3.0"
version = "2.3.2"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "time"}
Expand All @@ -69,7 +69,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "http"
version = "2.5.2"
version = "2.5.4"
dependencies = [
{org = "ballerina", name = "auth"},
{org = "ballerina", name = "cache"},
Expand Down Expand Up @@ -222,7 +222,7 @@ modules = [
[[package]]
org = "ballerina"
name = "log"
version = "2.5.0"
version = "2.5.1"
dependencies = [
{org = "ballerina", name = "io"},
{org = "ballerina", name = "jballerina.java"},
Expand Down Expand Up @@ -261,7 +261,7 @@ modules = [
[[package]]
org = "ballerina"
name = "observe"
version = "1.0.5"
version = "1.0.6"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]
Expand All @@ -278,7 +278,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "regex"
version = "1.3.1"
version = "1.3.2"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "lang.string"}
Expand All @@ -290,7 +290,7 @@ modules = [
[[package]]
org = "ballerina"
name = "task"
version = "2.3.0"
version = "2.3.2"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "time"}
Expand All @@ -311,7 +311,7 @@ modules = [
[[package]]
org = "ballerina"
name = "time"
version = "2.2.3"
version = "2.2.5"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]
Expand All @@ -322,15 +322,15 @@ modules = [
[[package]]
org = "ballerina"
name = "url"
version = "2.2.3"
version = "2.2.4"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]

[[package]]
org = "ballerina"
name = "websocket"
version = "2.5.1"
version = "2.5.2"
dependencies = [
{org = "ballerina", name = "auth"},
{org = "ballerina", name = "constraint"},
Expand Down
5 changes: 5 additions & 0 deletions changelog.md
View file
Open in desktop
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.4.0] - 2022-11-29

### Added
- [Support returning streams from WebSocket services](https://github.com/ballerina-platform/ballerina-standard-library/issues/2909)

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ group=io.ballerina.stdlib
version=2.5.2-SNAPSHOT
ballerinaLangVersion=2201.3.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.3.1
stdlibHttpVersion=2.5.2
stdlibHttpVersion=2.5.4-20231013-152300-784fd78
stdlibRegexVersion=1.3.1
stdlibOsVersion=1.5.0
stdlibTimeVersion=2.2.3
Expand Down
Loading