This is an automated email from the ASF dual-hosted git repository.
dgrove 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 6dd737d62 attempt to fix downstream runtime builds (#5384)
6dd737d62 is described below
commit 6dd737d628a9e852c2ff2db55ac510d7661b8528
Author: Brendan Doyle <[email protected]>
AuthorDate: Fri Feb 24 06:27:11 2023 -0800
attempt to fix downstream runtime builds (#5384)
* attempt to fix downstream runtime builds
* fix scoverage resolution
---------
Co-authored-by: Brendan Doyle <[email protected]>
---
common/scala/build.gradle | 12 ++++++------
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 +++++
9 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/common/scala/build.gradle b/common/scala/build.gradle
index 96401b43c..fbbe74a60 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"
}
}
diff --git a/core/controller/build.gradle b/core/controller/build.gradle
index 7d5163438..eb6ec9718 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 e205c0f8d..fef96afb6 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 903245571..c97c8a7bd 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 145b704ef..f9e81492e 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 ae5068ce9..b3c14da59 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 a8f81fd37..422c25a71 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 c542ff8da..45ab3ec27 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 0d2e3a0cc..064a5edd5 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
}
