This is an automated email from the ASF dual-hosted git repository.
bdoyle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new f0e281e35 dependency updates for cve patches (part 2) (#5379)
f0e281e35 is described below
commit f0e281e35f90930983fbbbd0da2da3f4b32b4d72
Author: Brendan Doyle <[email protected]>
AuthorDate: Thu Feb 16 15:48:48 2023 -0800
dependency updates for cve patches (part 2) (#5379)
* dependency updates for cve patches
* revert mongodb driver with breaking deprecation
* revert kafka client upgrade
* revert kube client upgrade for now
* remove cve comment
---------
Co-authored-by: Brendan Doyle <[email protected]>
---
common/scala/build.gradle | 9 +++++++++
settings.gradle | 2 ++
tests/build.gradle | 6 +++---
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/common/scala/build.gradle b/common/scala/build.gradle
index ee64ab89b..b937ccf4c 100644
--- a/common/scala/build.gradle
+++ b/common/scala/build.gradle
@@ -104,6 +104,15 @@ dependencies {
api ("com.azure:azure-storage-blob:12.7.0") {
exclude group: "com.azure", module: "azure-core-test"
}
+
+ compile "io.netty:netty-buffer:${gradle.netty.version}"
+ compile "io.netty:netty-handler:${gradle.netty.version}"
+ compile "io.netty:netty-handler-proxy:${gradle.netty.version}"
+ compile "io.netty:netty-codec-socks:${gradle.netty.version}"
+ compile "io.netty:netty-codec-http:${gradle.netty.version}"
+ compile "io.netty:netty-codec-http2:${gradle.netty.version}"
+ compile "io.netty:netty-transport-native-epoll:${gradle.netty.version}"
+ compile
"io.netty:netty-transport-native-unix-common:${gradle.netty.version}"
}
configurations {
diff --git a/settings.gradle b/settings.gradle
index aa57293d1..70a3fd0eb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -80,3 +80,5 @@ gradle.ext.akka_management = [version : '1.0.5']
gradle.ext.curator = [version : '4.3.0']
gradle.ext.kube_client = [version: '4.10.3']
+
+gradle.ext.netty = [version : '4.1.87.Final']
diff --git a/tests/build.gradle b/tests/build.gradle
index c688bc7de..116f148a1 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -218,7 +218,7 @@ dependencies {
implementation "io.rest-assured:rest-assured:4.5.1"
implementation "org.scalatest:scalatest_${gradle.scala.depVersion}:3.0.8"
implementation
"com.typesafe.akka:akka-testkit_${gradle.scala.depVersion}:${gradle.akka.version}"
- implementation "com.google.code.gson:gson:2.3.1"
+ implementation "com.google.code.gson:gson:2.10.1"
implementation "org.scalamock:scalamock_${gradle.scala.depVersion}:4.4.0"
implementation
"com.typesafe.akka:akka-http-testkit_${gradle.scala.depVersion}:${gradle.akka_http.version}"
implementation "com.github.java-json-tools:json-schema-validator:2.2.8"
@@ -234,7 +234,7 @@ dependencies {
implementation "com.amazonaws:aws-java-sdk-s3:1.12.395"
implementation "com.microsoft.azure:azure-cosmos:3.7.6"
- implementation 'org.testcontainers:elasticsearch:1.17.1'
+ implementation 'org.testcontainers:elasticsearch:1.17.6'
implementation 'org.testcontainers:mongodb:1.17.1'
implementation project(':common:scala')
@@ -245,7 +245,7 @@ dependencies {
implementation project(':core:monitoring:user-events')
implementation project(':tools:admin')
- swaggerCodegen 'io.swagger:swagger-codegen-cli:2.4.9'
+ swaggerCodegen 'io.swagger:swagger-codegen-cli:2.4.29'
}
def keystorePath = new File(sourceSets.test.scala.outputDir, 'keystore')