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 084c2ad9d upgrade some dependencies for CVE Patches (part 1) (#5373)
084c2ad9d is described below
commit 084c2ad9dbaf1c86b469eb4730b9eb9e7bc6e095
Author: Brendan Doyle <[email protected]>
AuthorDate: Sat Feb 11 19:15:54 2023 -0800
upgrade some dependencies for CVE Patches (part 1) (#5373)
* upgrade some dependencies
* fix swagger test
* fix swagger tests
* update version tag back
* attempt to fix swagger
* fix swagger again to match OpenAPI 3.0
* suppress deprecated swagger validator class
* revert swagger validator test dependency upgrade
* missed swagger cleanup
---------
Co-authored-by: Brendan Doyle <[email protected]>
---
build.gradle | 2 +-
common/scala/build.gradle | 6 +++---
core/cosmosdb/cache-invalidator/build.gradle | 2 +-
core/invoker/build.gradle | 2 +-
settings.gradle | 2 +-
tests/build.gradle | 8 ++++----
tests/performance/gatling_tests/build.gradle | 6 +++---
tools/dev/build.gradle | 4 ++--
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/build.gradle b/build.gradle
index cebe54c7b..89c5e2893 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,7 @@ subprojects {
scalafmt.configFilePath = gradle.scalafmt.config
group 'org.apache.openwhisk'
- version '1.0.0-SNAPSHOT'
+ version '1.0.1-SNAPSHOT'
pluginManager.withPlugin('scala') {
// Constraint all transitive akka-* dependencies to the one we want to
use to avoid issues.
diff --git a/common/scala/build.gradle b/common/scala/build.gradle
index ba1100099..52fad95cb 100644
--- a/common/scala/build.gradle
+++ b/common/scala/build.gradle
@@ -50,11 +50,11 @@ dependencies {
api
"com.lightbend.akka:akka-stream-alpakka-file_${gradle.scala.depVersion}:1.1.2"
- api "ch.qos.logback:logback-classic:1.2.3"
+ api "ch.qos.logback:logback-classic:1.4.5"
api "org.slf4j:jcl-over-slf4j:1.7.25"
api "org.slf4j:log4j-over-slf4j:1.7.25"
api "commons-codec:commons-codec:1.9"
- api "commons-io:commons-io:2.6"
+ api "commons-io:commons-io:2.11.0"
api "commons-collections:commons-collections:3.2.2"
api "org.apache.kafka:kafka-clients:2.4.0"
api "org.apache.httpcomponents:httpclient:4.5.5"
@@ -99,7 +99,7 @@ dependencies {
exclude group: 'com.fasterxml.jackson.core'
exclude group: 'com.fasterxml.jackson.dataformat'
}
- api "com.amazonaws:aws-java-sdk-cloudfront:1.11.517"
+ api "com.amazonaws:aws-java-sdk-cloudfront:1.12.395"
api ("com.azure:azure-storage-blob:12.7.0") {
exclude group: "com.azure", module: "azure-core-test"
diff --git a/core/cosmosdb/cache-invalidator/build.gradle
b/core/cosmosdb/cache-invalidator/build.gradle
index aeb4a7947..e205c0f8d 100644
--- a/core/cosmosdb/cache-invalidator/build.gradle
+++ b/core/cosmosdb/cache-invalidator/build.gradle
@@ -34,7 +34,7 @@ dependencies {
implementation (project(':common:scala')) {
exclude group: 'com.microsoft.azure', module:'azure-cosmosdb'
}
- implementation "com.microsoft.azure:azure-cosmos:3.5.0"
+ implementation "com.microsoft.azure:azure-cosmos:3.7.6"
implementation
"com.typesafe.akka:akka-stream-kafka_${gradle.scala.depVersion}:${gradle.akka_kafka.version}"
}
diff --git a/core/invoker/build.gradle b/core/invoker/build.gradle
index 27da757ca..903245571 100644
--- a/core/invoker/build.gradle
+++ b/core/invoker/build.gradle
@@ -42,7 +42,7 @@ dependencies {
implementation
("org.apache.curator:curator-recipes:${gradle.curator.version}") {
exclude group: 'org.apache.zookeeper', module:'zookeeper'
}
- implementation ("org.apache.zookeeper:zookeeper:3.4.11") {
+ implementation ("org.apache.zookeeper:zookeeper:3.4.14") {
exclude group: 'org.slf4j'
exclude group: 'log4j'
exclude group: 'jline'
diff --git a/settings.gradle b/settings.gradle
index 4326e8574..aa57293d1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -78,5 +78,5 @@ gradle.ext.akka_kafka = [version : '2.0.2']
gradle.ext.akka_http = [version : '10.2.4']
gradle.ext.akka_management = [version : '1.0.5']
-gradle.ext.curator = [version : '4.0.0']
+gradle.ext.curator = [version : '4.3.0']
gradle.ext.kube_client = [version: '4.10.3']
diff --git a/tests/build.gradle b/tests/build.gradle
index 3c4393257..c688bc7de 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -212,10 +212,10 @@ task testUnit(type: Test) {
dependencies {
implementation "org.scala-lang:scala-library:${gradle.scala.version}"
implementation "org.apache.commons:commons-lang3:3.3.2"
- implementation "org.apache.httpcomponents:httpclient:4.5.2:tests"
+ implementation "org.apache.httpcomponents:httpclient:4.5.14:tests"
implementation "org.apache.httpcomponents:httpmime:4.3.6"
implementation "junit:junit:4.11"
- implementation "io.rest-assured:rest-assured:4.0.0"
+ 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"
@@ -232,8 +232,8 @@ dependencies {
implementation
"io.fabric8:kubernetes-server-mock:${gradle.kube_client.version}"
implementation "org.rogach:scallop_${gradle.scala.depVersion}:3.3.2"
- implementation "com.amazonaws:aws-java-sdk-s3:1.11.295"
- implementation "com.microsoft.azure:azure-cosmos:3.5.0"
+ 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:mongodb:1.17.1'
diff --git a/tests/performance/gatling_tests/build.gradle
b/tests/performance/gatling_tests/build.gradle
index 260077618..619656066 100644
--- a/tests/performance/gatling_tests/build.gradle
+++ b/tests/performance/gatling_tests/build.gradle
@@ -16,7 +16,7 @@
*/
plugins {
- id 'com.github.lkishalmi.gatling' version '3.2.1'
+ id 'io.gatling.gradle' version '3.9.0'
id 'eclipse'
id 'scala'
}
@@ -29,8 +29,8 @@ sourceSets {
}
dependencies {
- gatling "io.spray:spray-json_${gradle.scala.depVersion}:1.3.4"
- gatling "commons-io:commons-io:2.6"
+ gatling "io.spray:spray-json_${gradle.scala.depVersion}:1.3.6"
+ gatling "commons-io:commons-io:2.11.0"
}
task buildArtifacts(type:Exec) {
diff --git a/tools/dev/build.gradle b/tools/dev/build.gradle
index 94722d2e5..3d5b26117 100644
--- a/tools/dev/build.gradle
+++ b/tools/dev/build.gradle
@@ -26,8 +26,8 @@ repositories {
def owHome = project.projectDir.parentFile.parentFile
dependencies {
- implementation "org.codehaus.groovy:groovy-all:2.4.14"
- implementation "org.apache.commons:commons-io:1.3.2"
+ implementation "org.codehaus.groovy:groovy-all:3.0.14"
+ implementation "commons-io:commons-io:2.11.0"
implementation "org.apache.commons:commons-lang3:3.8.1"
}
