Skip to content

upgrade some dependencies for CVE Patches (part 1) #5373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Feb 12, 2023
Merged

upgrade some dependencies for CVE Patches (part 1) #5373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6aa6c2e
upgrade some dependencies
Jan 30, 2023
8dfb6b1
fix swagger test
Jan 30, 2023
4c76627
fix swagger tests
Jan 31, 2023
8a5bd0b
update version tag back
Jan 31, 2023
47920eb
attempt to fix swagger
Jan 31, 2023
351c8ae
fix swagger again to match OpenAPI 3.0
Jan 31, 2023
4278b12
suppress deprecated swagger validator class
Jan 31, 2023
fd1117e
revert swagger validator test dependency upgrade
Feb 2, 2023
12489ed
missed swagger cleanup
Feb 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ subprojects {
scalafmt.configFilePath = gradle.scalafmt.config

group 'org.apache.openwhisk'
version '1.0.0-SNAPSHOT'
version '1.0.1-SNAPSHOT'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this was ever updated properly since the original release.


pluginManager.withPlugin('scala') {
// Constraint all transitive akka-* dependencies to the one we want to use to avoid issues.
Expand Down
6 changes: 3 additions & 3 deletions common/scala/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion core/cosmosdb/cache-invalidator/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}

Expand Down
2 changes: 1 addition & 1 deletion core/invoker/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
8 changes: 4 additions & 4 deletions tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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'

Expand Down
6 changes: 3 additions & 3 deletions tests/performance/gatling_tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand All @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions tools/dev/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down