Skip to content

Commit

Permalink
Update Libraries to fetch the updated netty patched with CVE-2022-24823
Browse files Browse the repository at this point in the history
… (opensearch-project#230)

* update netty version

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* update netty version

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* update branch to the one in PA to get a green build

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* use the correct branch name

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

* use the correct branch name

Signed-off-by: Kiran Prakash <awskiran@amazon.com>

Signed-off-by: Kiran Prakash <awskiran@amazon.com>
  • Loading branch information
kiranprakash154 authored Sep 15, 2022
1 parent 353455c commit 93c22e7
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ jobs:
- name: Checkout Performance Analyzer
uses: actions/checkout@v2
with:
repository: opensearch-project/performance-analyzer
ref: main
repository: kiranprakash154/performance-analyzer
ref: kp/update-netty-json
path: ./tmp/performance-analyzer
- name: Build PA gradle using the new RCA jar
working-directory: ./tmp/performance-analyzer
Expand Down
11 changes: 7 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ dependencies {
implementation 'org.bouncycastle:bcpkix-jdk15on:1.70'
implementation 'org.xerial:sqlite-jdbc:3.32.3.2'
implementation 'com.google.guava:guava:30.1-jre'
implementation 'com.google.code.gson:gson:2.8.9'
implementation 'com.google.code.gson:gson:2.9.0'
implementation 'org.checkerframework:checker-qual:3.5.0'
implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonDataBindVersion}"
Expand All @@ -333,9 +333,12 @@ dependencies {
implementation group: 'commons-io', name: 'commons-io', version: '2.7'
implementation group: 'com.google.errorprone', name: 'error_prone_annotations', version: '2.9.0'
implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.19.2'
implementation 'io.grpc:grpc-netty:1.44.0'
implementation 'io.grpc:grpc-protobuf:1.44.0'
implementation 'io.grpc:grpc-stub:1.44.0'
implementation 'io.grpc:grpc-netty:1.49.0'
implementation 'io.grpc:grpc-protobuf:1.49.0'
implementation('io.netty:netty-transport-native-unix-common:4.1.79.Final') {
force = 'true'
}
implementation 'io.grpc:grpc-stub:1.49.0'
implementation 'javax.annotation:javax.annotation-api:1.3.2'

// JDK9+ has to run powermock 2+. https://github.com/powermock/powermock/issues/888
Expand Down

0 comments on commit 93c22e7

Please sign in to comment.