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]>

Author: bdoyle0182

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.

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"

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}"
 }
 

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'

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']

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'
 

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) {

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"
 }