Skip to content

Commit

Permalink
Merge pull request #1655 from ballerina-platform/update-netty-version
Browse files Browse the repository at this point in the history
Update netty version
  • Loading branch information
TharmiganK authored Nov 13, 2024
2 parents 921edb0 + c42c6df commit 5af47c6
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 40 deletions.
64 changes: 32 additions & 32 deletions ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[package]
org = "ballerina"
name = "grpc"
version = "1.12.1"
distribution = "2201.10.0"
version = "1.13.0"
distribution = "2201.11.0"
authors = ["Ballerina"]
keywords = ["network", "grpc", "protobuf", "server-streaming", "client-streaming", "bidirectional-streaming"]
repository = "https://github.com/ballerina-platform/module-ballerina-grpc"
Expand All @@ -16,15 +16,15 @@ graalvmCompatible = true
[[platform.java17.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "grpc-native"
version = "1.12.1"
path = "../native/build/libs/grpc-native-1.12.1.jar"
version = "1.13.0"
path = "../native/build/libs/grpc-native-1.13.0-SNAPSHOT.jar"

[[platform.java17.dependency]]
path = "../test-utils/build/libs/grpc-test-utils-1.12.1.jar"
path = "../test-utils/build/libs/grpc-test-utils-1.13.0-SNAPSHOT.jar"
scope = "testOnly"

[[platform.java17.dependency]]
path = "./lib/ballerina-cli-2201.10.0.jar"
path = "./lib/ballerina-cli-2201.11.0-20241008-112400-81975006.jar"
scope = "testOnly"

[[platform.java17.dependency]]
Expand All @@ -34,68 +34,68 @@ scope = "testOnly"
[[platform.java17.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "http-native"
version = "2.12.0"
path = "./lib/http-native-2.12.0.jar"
version = "2.13.0"
path = "./lib/http-native-2.13.0-20241113-151000-3feb04b.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-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-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-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-codec-http"
version = "4.1.108.Final"
path = "./lib/netty-codec-http-4.1.108.Final.jar"
version = "4.1.115.Final"
path = "./lib/netty-codec-http-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-handler-proxy"
version = "4.1.108.Final"
path = "./lib/netty-handler-proxy-4.1.108.Final.jar"
version = "4.1.115.Final"
path = "./lib/netty-handler-proxy-4.1.115.Final.jar"

[[platform.java17.dependency]]
groupId = "io.netty"
artifactId = "netty-codec-http2"
version = "4.1.108.Final"
path = "./lib/netty-codec-http2-4.1.108.Final.jar"
version = "4.1.115.Final"
path = "./lib/netty-codec-http2-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 = "commons.pool.wso2"
Expand Down Expand Up @@ -163,11 +163,11 @@ path = "./lib/proto-google-common-protos-1.17.0.jar"
[[platform.java17.dependency]]
groupId = "org.ballerinalang"
artifactId = "formatter-core"
version = "2201.10.0"
path = "./lib/formatter-core-2201.10.0.jar"
version = "2201.11.0-20241008-112400-81975006"
path = "./lib/formatter-core-2201.11.0-20241008-112400-81975006.jar"

[[platform.java17.dependency]]
groupId = "org.ballerinalang"
artifactId = "ballerina-parser"
version = "2201.10.0"
path = "./lib/ballerina-parser-2201.10.0.jar"
version = "2201.11.0-20241008-112400-81975006"
path = "./lib/ballerina-parser-2201.11.0-20241008-112400-81975006.jar"
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 = "grpc-compiler-plugin"
class = "io.ballerina.stdlib.grpc.plugin.GrpcCompilerPlugin"

[[dependency]]
path = "../compiler-plugin/build/libs/grpc-compiler-plugin-1.12.1.jar"
path = "../compiler-plugin/build/libs/grpc-compiler-plugin-1.13.0-SNAPSHOT.jar"
21 changes: 16 additions & 5 deletions ballerina/Dependencies.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

[ballerina]
dependencies-toml-version = "2"
distribution-version = "2201.10.0"
distribution-version = "2201.11.0-20241008-112400-81975006"

[[package]]
org = "ballerina"
Expand Down Expand Up @@ -53,6 +53,16 @@ modules = [
{org = "ballerina", packageName = "crypto", moduleName = "crypto"}
]

[[package]]
org = "ballerina"
name = "data.jsondata"
version = "0.3.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "jballerina.java"},
{org = "ballerina", name = "lang.object"}
]

[[package]]
org = "ballerina"
name = "file"
Expand All @@ -68,7 +78,7 @@ dependencies = [
[[package]]
org = "ballerina"
name = "grpc"
version = "1.12.1"
version = "1.13.0"
dependencies = [
{org = "ballerina", name = "auth"},
{org = "ballerina", name = "crypto"},
Expand All @@ -94,13 +104,14 @@ modules = [
[[package]]
org = "ballerina"
name = "http"
version = "2.12.0"
version = "2.13.0"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "auth"},
{org = "ballerina", name = "cache"},
{org = "ballerina", name = "constraint"},
{org = "ballerina", name = "crypto"},
{org = "ballerina", name = "data.jsondata"},
{org = "ballerina", name = "file"},
{org = "ballerina", name = "io"},
{org = "ballerina", name = "jballerina.java"},
Expand Down Expand Up @@ -263,7 +274,7 @@ modules = [
[[package]]
org = "ballerina"
name = "mime"
version = "2.10.0"
version = "2.10.1"
scope = "testOnly"
dependencies = [
{org = "ballerina", name = "io"},
Expand Down Expand Up @@ -350,7 +361,7 @@ modules = [
[[package]]
org = "ballerina"
name = "time"
version = "2.4.0"
version = "2.5.0"
dependencies = [
{org = "ballerina", name = "jballerina.java"}
]
Expand Down
6 changes: 6 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ This file contains all the notable changes done to the Ballerina gRPC package th
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

### Fixed

- [Address CVE-2024-47535 vulnerability](https://github.com/ballerina-platform/ballerina-library/issues/7358)

## [1.12.1] - 2024-09-26

### Fixed
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ slf4jVersion=1.7.30
protoGoogleCommonsVersion=1.17.0
protobufJavaVersion=3.25.5
jknackHandlebarsVersion=4.0.6
nettyVersion=4.1.108.Final
nettyVersion=4.1.115.Final
nettyTcnativeVersion=2.0.65.Final
picocliVersion=4.0.1
githubSpotbugsVersion=5.0.14
Expand Down Expand Up @@ -48,7 +48,7 @@ stdlibDataJsonDataVersion=0.3.0-20241105-101100-661d11f
stdlibJwtVersion=2.13.0
stdlibOAuth2Version=2.12.0

stdlibHttpVersion=2.13.0-20241106-120000-d375c3b
stdlibHttpVersion=2.13.0-20241113-151000-3feb04b

# Ballerinax Observer
observeVersion=1.3.0
Expand Down

0 comments on commit 5af47c6

Please sign in to comment.