Skip to content

Commit 0e2f984

Browse files
bdoyle0182Brendan Doyle
authored andcommitted
attempt to fix downstream runtime builds (apache#5384)
* attempt to fix downstream runtime builds * fix scoverage resolution --------- Co-authored-by: Brendan Doyle <[email protected]> (cherry picked from commit 6dd737d)
1 parent fc51306 commit 0e2f984

File tree

9 files changed

+47
-6
lines changed

9 files changed

+47
-6
lines changed

common/scala/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,26 +106,26 @@ dependencies {
106106
exclude group: "com.azure", module: "azure-core-test"
107107
}
108108

109-
api "com.microsoft.azure:azure-cosmosdb"
109+
api "com.microsoft.azure:azure-cosmosdb:2.6.2"
110110
constraints {
111111
api("com.microsoft.azure:azure-cosmosdb:2.6.2")
112-
implementation("com.fasterxml.jackson.core:jackson-core:2.14.2") {
112+
api("com.fasterxml.jackson.core:jackson-core:2.14.2") {
113113
because "cannot upgrade azure-cosmosdb to new major version to remediate vulns w/o breaking change"
114114
}
115115
}
116116

117-
api "com.sksamuel.elastic4s:elastic4s-http_${gradle.scala.depVersion}"
117+
api "com.sksamuel.elastic4s:elastic4s-http_${gradle.scala.depVersion}:6.7.8"
118118
constraints {
119119
api("com.sksamuel.elastic4s:elastic4s-http_${gradle.scala.depVersion}:6.7.8")
120-
implementation("org.elasticsearch.client:elasticsearch-rest-client:6.8.23") {
120+
api("org.elasticsearch.client:elasticsearch-rest-client:6.8.23") {
121121
because "cannot upgrade elastic4s to remediate vuln without performing major version rest client upgrade"
122122
}
123123
}
124124
//for mongo
125-
api "org.mongodb.scala:mongo-scala-driver_${gradle.scala.depVersion}"
125+
api "org.mongodb.scala:mongo-scala-driver_${gradle.scala.depVersion}:2.7.0"
126126
constraints {
127127
api("org.mongodb.scala:mongo-scala-driver_${gradle.scala.depVersion}:2.7.0")
128-
implementation("org.mongodb:mongodb-driver-async:3.12.1") {
128+
api("org.mongodb:mongodb-driver-async:3.12.1") {
129129
because "cannot upgrade major mongo scala driver to remediate vuln w/o code changes"
130130
}
131131
}

core/controller/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ distDocker.dependsOn ':common:scala:distDocker', 'distTar'
2929

3030
project.archivesBaseName = "openwhisk-controller"
3131

32+
scoverage {
33+
scoverageVersion.set("${gradle.scala.scoverageVersion}")
34+
scoverageScalaVersion.set("${gradle.scala.scoverageScalaVersion}")
35+
}
36+
3237
ext.coverageDirs = [
3338
"${buildDir}/classes/scala/scoverage",
3439
"${project(':common:scala').buildDir.absolutePath}/classes/scala/scoverage"

core/cosmosdb/cache-invalidator/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ distDocker.dependsOn ':common:scala:distDocker', 'distTar'
2929

3030
project.archivesBaseName = "openwhisk-cache-invalidator-cosmosdb"
3131

32+
scoverage {
33+
scoverageVersion.set("${gradle.scala.scoverageVersion}")
34+
scoverageScalaVersion.set("${gradle.scala.scoverageScalaVersion}")
35+
}
36+
3237
dependencies {
3338
implementation "org.scala-lang:scala-library:${gradle.scala.version}"
3439
implementation (project(':common:scala')) {

core/invoker/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ apply from: '../../gradle/docker.gradle'
2828
distDocker.dependsOn ':common:scala:distDocker', 'distTar'
2929

3030
project.archivesBaseName = "openwhisk-invoker"
31+
32+
scoverage {
33+
scoverageVersion.set("${gradle.scala.scoverageVersion}")
34+
scoverageScalaVersion.set("${gradle.scala.scoverageScalaVersion}")
35+
}
36+
3137
ext.coverageDirs = [
3238
"${buildDir}/classes/scala/scoverage",
3339
"${project(':common:scala').buildDir.absolutePath}/classes/scala/scoverage"

core/monitoring/user-events/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ distDocker.dependsOn ':common:scala:distDocker', 'distTar'
2929

3030
project.archivesBaseName = "openwhisk-user-events"
3131

32+
scoverage {
33+
scoverageVersion.set("${gradle.scala.scoverageVersion}")
34+
scoverageScalaVersion.set("${gradle.scala.scoverageScalaVersion}")
35+
}
36+
3237
dependencies {
3338
implementation "org.scala-lang:scala-library:${gradle.scala.version}"
3439
implementation project(':common:scala')

core/scheduler/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ distDocker.dependsOn ':common:scala:distDocker', 'distTar'
2828

2929
project.archivesBaseName = "openwhisk-scheduler"
3030

31+
scoverage {
32+
scoverageVersion.set("${gradle.scala.scoverageVersion}")
33+
scoverageScalaVersion.set("${gradle.scala.scoverageScalaVersion}")
34+
}
35+
3136
ext.coverageDirs = [
3237
"${buildDir}/classes/scala/scoverage",
3338
"${project(':common:scala').buildDir.absolutePath}/classes/scala/scoverage"

core/standalone/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ distDocker.dependsOn 'bootJar'
3232

3333
project.archivesBaseName = "openwhisk-standalone"
3434

35+
scoverage {
36+
scoverageVersion.set("${gradle.scala.scoverageVersion}")
37+
scoverageScalaVersion.set("${gradle.scala.scoverageScalaVersion}")
38+
}
39+
3540
task copySwagger(type: Copy) {
3641
def version = "3.6.0"
3742
mkdir("$buildDir/tmp/swagger")

tests/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ install.dependsOn ':tools:admin:install'
3232

3333
project.archivesBaseName = "openwhisk-tests"
3434

35+
scoverage {
36+
scoverageVersion.set("${gradle.scala.scoverageVersion}")
37+
scoverageScalaVersion.set("${gradle.scala.scoverageScalaVersion}")
38+
}
39+
3540
def leanExcludes = [
3641
'**/MaxActionDurationTests*',
3742
'invokerShoot/**'

tools/admin/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ plugins {
2424

2525
project.archivesBaseName = "openwhisk-admin-tools"
2626

27+
scoverage {
28+
scoverageVersion.set("${gradle.scala.scoverageVersion}")
29+
scoverageScalaVersion.set("${gradle.scala.scoverageScalaVersion}")
30+
}
31+
2732
jar {
2833
enabled = true
2934
}

0 commit comments

Comments
 (0)