Skip to content

Commit

Permalink
Merge pull request #1121 from MohamedSabthar/patch-2201.4.x
Browse files Browse the repository at this point in the history
Update Netty Version
  • Loading branch information
MohamedSabthar authored Oct 13, 2023
2 parents c70edbb + 956518d commit 58ba801
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 27 deletions.
40 changes: 20 additions & 20 deletions ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
org = "ballerina"
name = "tcp"
version = "1.6.0"
version = "1.6.1"
authors = ["Ballerina"]
keywords = ["network", "socket", "service", "client"]
repository = "https://github.com/ballerina-platform/module-ballerina-tcp"
Expand All @@ -12,60 +12,60 @@ distribution = "2201.4.0"
[[platform.java11.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "tcp-native"
version = "1.6.0"
path = "../native/build/libs/tcp-native-1.6.0.jar"
version = "1.6.1"
path = "../native/build/libs/tcp-native-1.6.1-SNAPSHOT.jar"

[[platform.java11.dependency]]
path = "../test-utils/build/libs/tcp-test-utils-1.6.0.jar"
path = "../test-utils/build/libs/tcp-test-utils-1.6.1-SNAPSHOT.jar"
scope = "testOnly"

[[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-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-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-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-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-transport-native-unix-common"
version = "4.1.86.Final"
path = "./lib/netty-transport-native-unix-common-4.1.86.Final.jar"
version = "4.1.100.Final"
path = "./lib/netty-transport-native-unix-common-4.1.100.Final.jar"

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

[[platform.java11.dependency]]
groupId = "org.jboss.marshalling"
Expand Down
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 = "tcp-plugin"
class = "io.ballerina.stdlib.tcp.compiler.TcpCompilerPlugin"

[[dependency]]
path = "../compiler-plugin/build/libs/tcp-compiler-plugin-1.6.0.jar"
path = "../compiler-plugin/build/libs/tcp-compiler-plugin-1.6.1-SNAPSHOT.jar"
8 changes: 4 additions & 4 deletions ballerina/Dependencies.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies-toml-version = "2"
[[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 @@ -21,7 +21,7 @@ modules = [
[[package]]
org = "ballerina"
name = "io"
version = "1.4.0"
version = "1.4.1"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
Expand Down Expand Up @@ -63,7 +63,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "tcp"
version = "1.6.0"
version = "1.6.1"
dependencies = [
{org = "ballerina", name = "crypto"},
{org = "ballerina", name = "io"},
Expand All @@ -90,7 +90,7 @@ modules = [
[[package]]
org = "ballerina"
name = "time"
version = "2.2.3"
version = "2.2.5"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]
Expand Down
7 changes: 7 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ 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)

## [1.6.0] - 2023-02-20

## [1.5.0] - 2022-11-29

### Changed
- [API docs updated](https://github.com/ballerina-platform/ballerina-standard-library/issues/3463)

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
org.gradle.caching=true
group=io.ballerina.stdlib
version=1.6.0
version=1.6.1-SNAPSHOT
ballerinaLangVersion=2201.4.0
puppycrawlCheckstyleVersion=8.18
githubJohnrengelmanShadowVersion=5.2.0
checkstyleToolVersion=7.8.2
githubSpotbugsVersion=4.5.1
testngVersion=7.4.0
nettyVersion=4.1.86.Final
nettyVersion=4.1.100.Final
underCouchDownloadVersion=4.0.4
researchgateReleaseVersion=2.8.0
slf4jVersion=1.7.30
Expand Down

0 comments on commit 58ba801

Please sign in to comment.