From 26fee6a4478e96c51bf9c94da7f181eb7e717df5 Mon Sep 17 00:00:00 2001 From: Brendan Doyle Date: Thu, 23 Feb 2023 20:54:36 -0800 Subject: [PATCH 1/2] attempt to fix downstream runtime builds --- common/scala/build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/common/scala/build.gradle b/common/scala/build.gradle index 96401b43c97..fbbe74a6092 100644 --- a/common/scala/build.gradle +++ b/common/scala/build.gradle @@ -106,26 +106,26 @@ dependencies { exclude group: "com.azure", module: "azure-core-test" } - api "com.microsoft.azure:azure-cosmosdb" + api "com.microsoft.azure:azure-cosmosdb:2.6.2" constraints { api("com.microsoft.azure:azure-cosmosdb:2.6.2") - implementation("com.fasterxml.jackson.core:jackson-core:2.14.2") { + api("com.fasterxml.jackson.core:jackson-core:2.14.2") { because "cannot upgrade azure-cosmosdb to new major version to remediate vulns w/o breaking change" } } - api "com.sksamuel.elastic4s:elastic4s-http_${gradle.scala.depVersion}" + api "com.sksamuel.elastic4s:elastic4s-http_${gradle.scala.depVersion}:6.7.8" constraints { api("com.sksamuel.elastic4s:elastic4s-http_${gradle.scala.depVersion}:6.7.8") - implementation("org.elasticsearch.client:elasticsearch-rest-client:6.8.23") { + api("org.elasticsearch.client:elasticsearch-rest-client:6.8.23") { because "cannot upgrade elastic4s to remediate vuln without performing major version rest client upgrade" } } //for mongo - api "org.mongodb.scala:mongo-scala-driver_${gradle.scala.depVersion}" + api "org.mongodb.scala:mongo-scala-driver_${gradle.scala.depVersion}:2.7.0" constraints { api("org.mongodb.scala:mongo-scala-driver_${gradle.scala.depVersion}:2.7.0") - implementation("org.mongodb:mongodb-driver-async:3.12.1") { + api("org.mongodb:mongodb-driver-async:3.12.1") { because "cannot upgrade major mongo scala driver to remediate vuln w/o code changes" } } From a15866f9bf86085367aba218b75cf8489347d3c7 Mon Sep 17 00:00:00 2001 From: Brendan Doyle Date: Thu, 23 Feb 2023 21:16:42 -0800 Subject: [PATCH 2/2] fix scoverage resolution --- core/controller/build.gradle | 5 +++++ core/cosmosdb/cache-invalidator/build.gradle | 5 +++++ core/invoker/build.gradle | 6 ++++++ core/monitoring/user-events/build.gradle | 5 +++++ core/scheduler/build.gradle | 5 +++++ core/standalone/build.gradle | 5 +++++ tests/build.gradle | 5 +++++ tools/admin/build.gradle | 5 +++++ 8 files changed, 41 insertions(+) diff --git a/core/controller/build.gradle b/core/controller/build.gradle index 7d5163438fc..eb6ec971841 100644 --- a/core/controller/build.gradle +++ b/core/controller/build.gradle @@ -29,6 +29,11 @@ distDocker.dependsOn ':common:scala:distDocker', 'distTar' project.archivesBaseName = "openwhisk-controller" +scoverage { + scoverageVersion.set("${gradle.scala.scoverageVersion}") + scoverageScalaVersion.set("${gradle.scala.scoverageScalaVersion}") +} + ext.coverageDirs = [ "${buildDir}/classes/scala/scoverage", "${project(':common:scala').buildDir.absolutePath}/classes/scala/scoverage" diff --git a/core/cosmosdb/cache-invalidator/build.gradle b/core/cosmosdb/cache-invalidator/build.gradle index e205c0f8df9..fef96afb699 100644 --- a/core/cosmosdb/cache-invalidator/build.gradle +++ b/core/cosmosdb/cache-invalidator/build.gradle @@ -29,6 +29,11 @@ distDocker.dependsOn ':common:scala:distDocker', 'distTar' project.archivesBaseName = "openwhisk-cache-invalidator-cosmosdb" +scoverage { + scoverageVersion.set("${gradle.scala.scoverageVersion}") + scoverageScalaVersion.set("${gradle.scala.scoverageScalaVersion}") +} + dependencies { implementation "org.scala-lang:scala-library:${gradle.scala.version}" implementation (project(':common:scala')) { diff --git a/core/invoker/build.gradle b/core/invoker/build.gradle index 903245571a9..c97c8a7bd21 100644 --- a/core/invoker/build.gradle +++ b/core/invoker/build.gradle @@ -28,6 +28,12 @@ apply from: '../../gradle/docker.gradle' distDocker.dependsOn ':common:scala:distDocker', 'distTar' project.archivesBaseName = "openwhisk-invoker" + +scoverage { + scoverageVersion.set("${gradle.scala.scoverageVersion}") + scoverageScalaVersion.set("${gradle.scala.scoverageScalaVersion}") +} + ext.coverageDirs = [ "${buildDir}/classes/scala/scoverage", "${project(':common:scala').buildDir.absolutePath}/classes/scala/scoverage" diff --git a/core/monitoring/user-events/build.gradle b/core/monitoring/user-events/build.gradle index 145b704ef2b..f9e81492e93 100644 --- a/core/monitoring/user-events/build.gradle +++ b/core/monitoring/user-events/build.gradle @@ -29,6 +29,11 @@ distDocker.dependsOn ':common:scala:distDocker', 'distTar' project.archivesBaseName = "openwhisk-user-events" +scoverage { + scoverageVersion.set("${gradle.scala.scoverageVersion}") + scoverageScalaVersion.set("${gradle.scala.scoverageScalaVersion}") +} + dependencies { implementation "org.scala-lang:scala-library:${gradle.scala.version}" implementation project(':common:scala') diff --git a/core/scheduler/build.gradle b/core/scheduler/build.gradle index ae5068ce914..b3c14da59e8 100644 --- a/core/scheduler/build.gradle +++ b/core/scheduler/build.gradle @@ -28,6 +28,11 @@ distDocker.dependsOn ':common:scala:distDocker', 'distTar' project.archivesBaseName = "openwhisk-scheduler" +scoverage { + scoverageVersion.set("${gradle.scala.scoverageVersion}") + scoverageScalaVersion.set("${gradle.scala.scoverageScalaVersion}") +} + ext.coverageDirs = [ "${buildDir}/classes/scala/scoverage", "${project(':common:scala').buildDir.absolutePath}/classes/scala/scoverage" diff --git a/core/standalone/build.gradle b/core/standalone/build.gradle index a8f81fd37e3..422c25a71eb 100644 --- a/core/standalone/build.gradle +++ b/core/standalone/build.gradle @@ -32,6 +32,11 @@ distDocker.dependsOn 'bootJar' project.archivesBaseName = "openwhisk-standalone" +scoverage { + scoverageVersion.set("${gradle.scala.scoverageVersion}") + scoverageScalaVersion.set("${gradle.scala.scoverageScalaVersion}") +} + task copySwagger(type: Copy) { def version = "3.6.0" mkdir("$buildDir/tmp/swagger") diff --git a/tests/build.gradle b/tests/build.gradle index c542ff8dab0..45ab3ec2799 100644 --- a/tests/build.gradle +++ b/tests/build.gradle @@ -32,6 +32,11 @@ install.dependsOn ':tools:admin:install' project.archivesBaseName = "openwhisk-tests" +scoverage { + scoverageVersion.set("${gradle.scala.scoverageVersion}") + scoverageScalaVersion.set("${gradle.scala.scoverageScalaVersion}") +} + def leanExcludes = [ '**/MaxActionDurationTests*', 'invokerShoot/**' diff --git a/tools/admin/build.gradle b/tools/admin/build.gradle index 0d2e3a0cc2b..064a5edd592 100644 --- a/tools/admin/build.gradle +++ b/tools/admin/build.gradle @@ -24,6 +24,11 @@ plugins { project.archivesBaseName = "openwhisk-admin-tools" +scoverage { + scoverageVersion.set("${gradle.scala.scoverageVersion}") + scoverageScalaVersion.set("${gradle.scala.scoverageScalaVersion}") +} + jar { enabled = true }