Skip to content

Commit

Permalink
Merge pull request #40855 from dilanSachi/update-netty-v-1.2.x
Browse files Browse the repository at this point in the history
[1.2.x] Update netty version to fix security vulnerabilities
  • Loading branch information
dilanSachi authored Jun 28, 2023
2 parents 939039f + 08ca0a7 commit e7fac9a
Show file tree
Hide file tree
Showing 6 changed files with 174 additions and 174 deletions.
40 changes: 20 additions & 20 deletions gradle/javaLibsProject.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dependencies {
dist 'org.wso2.carbon:org.wso2.carbon.core:5.1.0'
dist 'org.wso2.securevault:org.wso2.securevault:1.0.0-wso2v2'
dist 'org.wso2.transport.file:org.wso2.transport.local-file-system:6.0.55'
dist 'org.wso2.transport.http:org.wso2.transport.http.netty:6.3.43'
dist 'org.wso2.transport.http:org.wso2.transport.http.netty:6.3.45'
dist 'org.bouncycastle:bcprov-jdk15on:1.69'
dist 'org.bouncycastle:bcpkix-jdk15on:1.61'

Expand All @@ -58,23 +58,23 @@ dependencies {
dist 'com.github.jknack:handlebars:4.3.1'
dist 'com.sun.mail:javax.mail:1.6.2'
dist 'jaxen:jaxen:1.1.6'
dist 'io.netty:netty-buffer:4.1.86.Final'
dist 'io.netty:netty-codec-http2:4.1.86.Final'
dist 'io.netty:netty-codec-http:4.1.86.Final'
dist 'io.netty:netty-codec:4.1.86.Final'
dist 'io.netty:netty-common:4.1.86.Final'
dist 'io.netty:netty-handler-proxy:4.1.86.Final'
dist 'io.netty:netty-handler:4.1.86.Final'
dist 'io.netty:netty-resolver:4.1.86.Final'
dist 'io.netty:netty-transport-native-unix-common:4.1.86.Final'
dist 'io.netty:netty-tcnative-classes:2.0.54.Final'
dist 'io.netty:netty-tcnative-boringssl-static:2.0.54.Final'
dist 'io.netty:netty-tcnative-boringssl-static:2.0.54.Final:windows-x86_64'
dist 'io.netty:netty-tcnative-boringssl-static:2.0.54.Final:linux-aarch_64'
dist 'io.netty:netty-tcnative-boringssl-static:2.0.54.Final:linux-x86_64'
dist 'io.netty:netty-tcnative-boringssl-static:2.0.54.Final:osx-aarch_64'
dist 'io.netty:netty-tcnative-boringssl-static:2.0.54.Final:osx-x86_64'
dist 'io.netty:netty-transport:4.1.86.Final'
dist 'io.netty:netty-buffer:4.1.94.Final'
dist 'io.netty:netty-codec-http2:4.1.94.Final'
dist 'io.netty:netty-codec-http:4.1.94.Final'
dist 'io.netty:netty-codec:4.1.94.Final'
dist 'io.netty:netty-common:4.1.94.Final'
dist 'io.netty:netty-handler-proxy:4.1.94.Final'
dist 'io.netty:netty-handler:4.1.94.Final'
dist 'io.netty:netty-resolver:4.1.94.Final'
dist 'io.netty:netty-transport-native-unix-common:4.1.94.Final'
dist 'io.netty:netty-tcnative-classes:2.0.61.Final'
dist 'io.netty:netty-tcnative-boringssl-static:2.0.61.Final'
dist 'io.netty:netty-tcnative-boringssl-static:2.0.61.Final:windows-x86_64'
dist 'io.netty:netty-tcnative-boringssl-static:2.0.61.Final:linux-aarch_64'
dist 'io.netty:netty-tcnative-boringssl-static:2.0.61.Final:linux-x86_64'
dist 'io.netty:netty-tcnative-boringssl-static:2.0.61.Final:osx-aarch_64'
dist 'io.netty:netty-tcnative-boringssl-static:2.0.61.Final:osx-x86_64'
dist 'io.netty:netty-transport:4.1.94.Final'
dist 'commons-pool.wso2:commons-pool:1.5.6.wso2v1'
dist 'org.wso2.carbon.messaging:org.wso2.carbon.messaging:2.3.7'
dist 'org.wso2.carbon.metrics:org.wso2.carbon.metrics.core:2.3.7'
Expand All @@ -90,8 +90,8 @@ dependencies {
dist 'org.jboss.logging:jboss-logging:3.3.1.Final'
dist 'commons-collections:commons-collections:3.2.2'
dist 'org.apache.geronimo.specs:geronimo-json_1.0_spec:1.0-alpha-1'
dist 'io.netty:netty-transport-native-epoll:4.1.86.Final'
dist 'io.netty:netty-transport-native-kqueue:4.1.86.Final'
dist 'io.netty:netty-transport-native-epoll:4.1.94.Final'
dist 'io.netty:netty-transport-native-kqueue:4.1.94.Final'
dist 'org.apache.ws.commons.axiom:axiom-api:1.2.22'
dist 'org.apache.ws.commons.axiom:axiom-impl:1.2.22'
dist 'commons-codec:commons-codec:1.15'
Expand Down
32 changes: 16 additions & 16 deletions gradle/javaProject.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ dependencies {
implementation 'org.wso2.carbon.messaging:org.wso2.carbon.messaging:2.3.7'
implementation 'org.wso2.orbit.org.antlr:antlr4-runtime:4.5.1.wso2v1'
implementation 'org.yaml:snakeyaml:2.0'
implementation 'org.wso2.transport.http:org.wso2.transport.http.netty:6.3.43'
implementation 'org.wso2.transport.http:org.wso2.transport.http.netty:6.3.45'
implementation 'org.wso2.transport.file:org.wso2.transport.local-file-system:6.0.55'
implementation 'org.wso2.staxon:staxon-core:1.2.0.wso2v2'
implementation 'org.quartz-scheduler:quartz:2.3.2'
Expand All @@ -107,21 +107,21 @@ dependencies {
implementation 'io.ballerina.messaging:broker-core:0.970.5'
implementation 'io.ballerina.messaging:broker-amqp:0.970.5'
implementation 'io.dropwizard.metrics:metrics-core:4.1.7'
implementation 'io.netty:netty-codec:4.1.86.Final'
implementation 'io.netty:netty-buffer:4.1.86.Final'
implementation 'io.netty:netty-common:4.1.86.Final'
implementation 'io.netty:netty-codec-http:4.1.86.Final'
implementation 'io.netty:netty-codec-http2:4.1.86.Final'
implementation 'io.netty:netty-handler:4.1.86.Final'
implementation 'io.netty:netty-transport-native-unix-common:4.1.86.Final'
implementation 'io.netty:netty-tcnative-classes:2.0.54.Final'
implementation 'io.netty:netty-tcnative-boringssl-static:2.0.54.Final'
implementation 'io.netty:netty-tcnative-boringssl-static:2.0.54.Final:windows-x86_64'
implementation 'io.netty:netty-tcnative-boringssl-static:2.0.54.Final:linux-aarch_64'
implementation 'io.netty:netty-tcnative-boringssl-static:2.0.54.Final:linux-x86_64'
implementation 'io.netty:netty-tcnative-boringssl-static:2.0.54.Final:osx-aarch_64'
implementation 'io.netty:netty-tcnative-boringssl-static:2.0.54.Final:osx-x86_64'
implementation 'io.netty:netty-transport:4.1.86.Final'
implementation 'io.netty:netty-codec:4.1.94.Final'
implementation 'io.netty:netty-buffer:4.1.94.Final'
implementation 'io.netty:netty-common:4.1.94.Final'
implementation 'io.netty:netty-codec-http:4.1.94.Final'
implementation 'io.netty:netty-codec-http2:4.1.94.Final'
implementation 'io.netty:netty-handler:4.1.94.Final'
implementation 'io.netty:netty-transport-native-unix-common:4.1.94.Final'
implementation 'io.netty:netty-tcnative-classes:2.0.61.Final'
implementation 'io.netty:netty-tcnative-boringssl-static:2.0.61.Final'
implementation 'io.netty:netty-tcnative-boringssl-static:2.0.61.Final:windows-x86_64'
implementation 'io.netty:netty-tcnative-boringssl-static:2.0.61.Final:linux-aarch_64'
implementation 'io.netty:netty-tcnative-boringssl-static:2.0.61.Final:linux-x86_64'
implementation 'io.netty:netty-tcnative-boringssl-static:2.0.61.Final:osx-aarch_64'
implementation 'io.netty:netty-tcnative-boringssl-static:2.0.61.Final:osx-x86_64'
implementation 'io.netty:netty-transport:4.1.94.Final'
implementation 'io.nats:java-nats-streaming:2.2.1'
implementation 'io.nats:jnats:2.6.0'
implementation 'io.opentracing:opentracing-api:0.33.0'
Expand Down
70 changes: 35 additions & 35 deletions stdlib/grpc/src/main/ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,77 +22,77 @@ target = "java8"
[[platform.libraries]]
artifactId = "org.wso2.transport.http.netty"
version = "6.3.43"
path = "./lib/org.wso2.transport.http.netty-6.3.43.jar"
path = "./lib/org.wso2.transport.http.netty-6.3.45.jar"
groupId = "org.wso2.transport.http"
modules = ["grpc"]

[[platform.libraries]]
artifactId = "netty-common"
version = "4.1.86.Final"
path = "./lib/netty-common-4.1.86.Final.jar"
version = "4.1.94.Final"
path = "./lib/netty-common-4.1.94.Final.jar"
groupId = "io.netty"
modules = ["grpc"]

[[platform.libraries]]
artifactId = "netty-buffer"
version = "4.1.86.Final"
path = "./lib/netty-buffer-4.1.86.Final.jar"
version = "4.1.94.Final"
path = "./lib/netty-buffer-4.1.94.Final.jar"
groupId = "io.netty"
modules = ["grpc"]

[[platform.libraries]]
artifactId = "netty-transport"
version = "4.1.86.Final"
path = "./lib/netty-transport-4.1.86.Final.jar"
version = "4.1.94.Final"
path = "./lib/netty-transport-4.1.94.Final.jar"
groupId = "io.netty"
modules = ["grpc"]

[[platform.libraries]]
artifactId = "netty-resolver"
version = "4.1.86.Final"
path = "./lib/netty-resolver-4.1.86.Final.jar"
version = "4.1.94.Final"
path = "./lib/netty-resolver-4.1.94.Final.jar"
groupId = "io.netty"
modules = ["grpc"]

[[platform.libraries]]
artifactId = "netty-handler"
version = "4.1.86.Final"
path = "./lib/netty-handler-4.1.86.Final.jar"
version = "4.1.94.Final"
path = "./lib/netty-handler-4.1.94.Final.jar"
groupId = "io.netty"
modules = ["grpc"]

[[platform.libraries]]
artifactId = "netty-codec-http"
version = "4.1.86.Final"
path = "./lib/netty-codec-http-4.1.86.Final.jar"
version = "4.1.94.Final"
path = "./lib/netty-codec-http-4.1.94.Final.jar"
groupId = "io.netty"
modules = ["grpc"]

[[platform.libraries]]
artifactId = "netty-codec"
version = "4.1.86.Final"
path = "./lib/netty-codec-4.1.86.Final.jar"
version = "4.1.94.Final"
path = "./lib/netty-codec-4.1.94.Final.jar"
groupId = "io.netty"
modules = ["grpc"]

[[platform.libraries]]
artifactId = "netty-handler-proxy"
version = "4.1.86.Final"
path = "./lib/netty-handler-proxy-4.1.86.Final.jar"
version = "4.1.94.Final"
path = "./lib/netty-handler-proxy-4.1.94.Final.jar"
groupId = "io.netty"
modules = ["grpc"]

[[platform.libraries]]
artifactId = "netty-codec-http2"
version = "4.1.86.Final"
path = "./lib/netty-codec-http2-4.1.86.Final.jar"
version = "4.1.94.Final"
path = "./lib/netty-codec-http2-4.1.94.Final.jar"
groupId = "io.netty"
modules = ["grpc"]

[[platform.libraries]]
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.94.Final"
path = "./lib/netty-transport-native-unix-common-4.1.94.Final.jar"
groupId = "io.netty"
modules = ["grpc"]

Expand Down Expand Up @@ -126,50 +126,50 @@ target = "java8"

[[platform.libraries]]
artifactId = "netty-tcnative-classes"
version = "2.0.54.Final"
path = "./lib/netty-tcnative-classes-2.0.54.Final.jar"
version = "2.0.61.Final"
path = "./lib/netty-tcnative-classes-2.0.61.Final.jar"
groupId = "io.netty"
modules = ["grpc"]

[[platform.libraries]]
artifactId = "netty-tcnative-boringssl-static"
version = "2.0.54.Final"
path = "./lib/netty-tcnative-boringssl-static-2.0.54.Final.jar"
version = "2.0.61.Final"
path = "./lib/netty-tcnative-boringssl-static-2.0.61.Final.jar"
groupId = "io.netty"
modules = ["grpc"]

[[platform.libraries]]
artifactId = "netty-tcnative-boringssl-static::windows-x86_64"
version = "2.0.54.Final"
path = "./lib/netty-tcnative-boringssl-static-2.0.54.Final-windows-x86_64.jar"
version = "2.0.61.Final"
path = "./lib/netty-tcnative-boringssl-static-2.0.61.Final-windows-x86_64.jar"
groupId = "io.netty"
modules = ["grpc"]

[[platform.libraries]]
artifactId = "netty-tcnative-boringssl-static::linux-aarch_64"
version = "2.0.54.Final"
path = "./lib/netty-tcnative-boringssl-static-2.0.54.Final-linux-aarch_64.jar"
version = "2.0.61.Final"
path = "./lib/netty-tcnative-boringssl-static-2.0.61.Final-linux-aarch_64.jar"
groupId = "io.netty"
modules = ["grpc"]

[[platform.libraries]]
artifactId = "netty-tcnative-boringssl-static::linux-x86_64"
version = "2.0.54.Final"
path = "./lib/netty-tcnative-boringssl-static-2.0.54.Final-linux-x86_64.jar"
version = "2.0.61.Final"
path = "./lib/netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar"
groupId = "io.netty"
modules = ["grpc"]

[[platform.libraries]]
artifactId = "netty-tcnative-boringssl-static::osx-aarch_64"
version = "2.0.54.Final"
path = "./lib/netty-tcnative-boringssl-static-2.0.54.Final-osx-aarch_64.jar"
version = "2.0.61.Final"
path = "./lib/netty-tcnative-boringssl-static-2.0.61.Final-osx-aarch_64.jar"
groupId = "io.netty"
modules = ["grpc"]

[[platform.libraries]]
artifactId = "netty-tcnative-boringssl-static::osx-x86_64"
version = "2.0.54.Final"
path = "./lib/netty-tcnative-boringssl-static-2.0.54.Final-osx-x86_64.jar"
version = "2.0.61.Final"
path = "./lib/netty-tcnative-boringssl-static-2.0.61.Final-osx-x86_64.jar"
groupId = "io.netty"
modules = ["grpc"]

Expand Down
Loading

0 comments on commit e7fac9a

Please sign in to comment.