Skip to content

attempt to fix downstream runtime builds #5384

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.

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 2 commits into from
Feb 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions common/scala/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Expand Down
5 changes: 5 additions & 0 deletions core/controller/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 5 additions & 0 deletions core/cosmosdb/cache-invalidator/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')) {
Expand Down
6 changes: 6 additions & 0 deletions core/invoker/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 5 additions & 0 deletions core/monitoring/user-events/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
5 changes: 5 additions & 0 deletions core/scheduler/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 5 additions & 0 deletions core/standalone/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
5 changes: 5 additions & 0 deletions tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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/**'
Expand Down
5 changes: 5 additions & 0 deletions tools/admin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ plugins {

project.archivesBaseName = "openwhisk-admin-tools"

scoverage {
scoverageVersion.set("${gradle.scala.scoverageVersion}")
scoverageScalaVersion.set("${gradle.scala.scoverageScalaVersion}")
}

jar {
enabled = true
}
Expand Down