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 94043db Make Scala dependency version configurable. (#4740)
94043db is described below
commit 94043db6d6f7f4afa1e6892be87c5a2cb7760e15
Author: Markus Thömmes <markusthoem...@me.com>
AuthorDate: Thu Nov 21 17:23:09 2019 +0100
Make Scala dependency version configurable. (#4740)
---
common/scala/build.gradle | 92 +++++++++++-----------
core/controller/build.gradle | 6 +-
core/cosmosdb/cache-invalidator/build.gradle | 2 +-
core/invoker/build.gradle | 2 +-
core/monitoring/user-events/build.gradle | 18 ++---
core/standalone/build.gradle | 10 +--
settings.gradle | 1 +
tests/build.gradle | 32 ++++----
.../unicode.tests/src/java/unicode/build.gradle | 2 +-
tests/performance/gatling_tests/build.gradle | 2 +-
tools/admin/build.gradle | 2 +-
tools/dev/build.gradle | 4 +-
12 files changed, 87 insertions(+), 86 deletions(-)
diff --git a/common/scala/build.gradle b/common/scala/build.gradle
index 3d1389c..de8b541 100644
--- a/common/scala/build.gradle
+++ b/common/scala/build.gradle
@@ -32,76 +32,76 @@ repositories {
dependencies {
compile "org.scala-lang:scala-library:${gradle.scala.version}"
- compile ('com.github.pureconfig:pureconfig_2.12:0.9.0') {
+ compile
("com.github.pureconfig:pureconfig_${gradle.scala.depVersion}:0.9.0") {
exclude group: 'org.scala-lang', module: 'scala-compiler'
exclude group: 'org.scala-lang', module: 'scala-reflect'
}
- compile 'io.spray:spray-json_2.12:1.3.5'
- compile 'com.lihaoyi:fastparse_2.12:2.1.3'
-
- compile "com.typesafe.akka:akka-actor_2.12:${gradle.akka.version}"
- compile "com.typesafe.akka:akka-stream_2.12:${gradle.akka.version}"
- compile "com.typesafe.akka:akka-slf4j_2.12:${gradle.akka.version}"
-
- compile "com.typesafe.akka:akka-http-core_2.12:${gradle.akka_http.version}"
- compile
"com.typesafe.akka:akka-http-spray-json_2.12:${gradle.akka_http.version}"
-
- compile 'com.lightbend.akka:akka-stream-alpakka-file_2.12:0.15'
-
- compile 'ch.qos.logback:logback-classic:1.2.3'
- compile 'org.slf4j:jcl-over-slf4j:1.7.25'
- compile 'org.slf4j:log4j-over-slf4j:1.7.25'
- compile 'commons-codec:commons-codec:1.9'
- compile 'commons-io:commons-io:2.6'
- compile 'commons-collections:commons-collections:3.2.2'
- compile 'org.apache.kafka:kafka-clients:2.0.0'
- compile ('org.apache.httpcomponents:httpclient:4.5.5')
- compile ('com.fasterxml.uuid:java-uuid-generator:3.1.3')
- compile 'com.github.ben-manes.caffeine:caffeine:2.6.2'
- compile 'com.google.code.findbugs:jsr305:3.0.2'
+ compile "io.spray:spray-json_${gradle.scala.depVersion}:1.3.5"
+ compile "com.lihaoyi:fastparse_${gradle.scala.depVersion}:2.1.3"
+
+ compile
"com.typesafe.akka:akka-actor_${gradle.scala.depVersion}:${gradle.akka.version}"
+ compile
"com.typesafe.akka:akka-stream_${gradle.scala.depVersion}:${gradle.akka.version}"
+ compile
"com.typesafe.akka:akka-slf4j_${gradle.scala.depVersion}:${gradle.akka.version}"
+
+ compile
"com.typesafe.akka:akka-http-core_${gradle.scala.depVersion}:${gradle.akka_http.version}"
+ compile
"com.typesafe.akka:akka-http-spray-json_${gradle.scala.depVersion}:${gradle.akka_http.version}"
+
+ compile
"com.lightbend.akka:akka-stream-alpakka-file_${gradle.scala.depVersion}:0.15"
+
+ compile "ch.qos.logback:logback-classic:1.2.3"
+ compile "org.slf4j:jcl-over-slf4j:1.7.25"
+ compile "org.slf4j:log4j-over-slf4j:1.7.25"
+ compile "commons-codec:commons-codec:1.9"
+ compile "commons-io:commons-io:2.6"
+ compile "commons-collections:commons-collections:3.2.2"
+ compile "org.apache.kafka:kafka-clients:2.0.0"
+ compile "org.apache.httpcomponents:httpclient:4.5.5"
+ compile "com.fasterxml.uuid:java-uuid-generator:3.1.3"
+ compile "com.github.ben-manes.caffeine:caffeine:2.6.2"
+ compile "com.google.code.findbugs:jsr305:3.0.2"
compile "io.fabric8:kubernetes-client:${gradle.kube_client.version}"
- compile ('io.kamon:kamon-core_2.12:1.1.3') {
+ compile ("io.kamon:kamon-core_${gradle.scala.depVersion}:1.1.3") {
exclude group: 'com.lihaoyi'
}
- compile 'io.kamon:kamon-statsd_2.12:1.0.0'
- compile ('io.kamon:kamon-system-metrics_2.12:1.0.0') {
+ compile "io.kamon:kamon-statsd_${gradle.scala.depVersion}:1.0.0"
+ compile ("io.kamon:kamon-system-metrics_${gradle.scala.depVersion}:1.0.0")
{
exclude group: 'io.kamon', module: 'sigar-loader'
}
- compile ('io.kamon:kamon-prometheus_2.12:1.1.1')
- compile ('io.kamon:kamon-datadog_2.12:1.0.0')
+ compile "io.kamon:kamon-prometheus_${gradle.scala.depVersion}:1.1.1"
+ compile "io.kamon:kamon-datadog_${gradle.scala.depVersion}:1.0.0"
//for mesos
- compile 'com.adobe.api.platform.runtime:mesos-actor:0.0.17'
+ compile "com.adobe.api.platform.runtime:mesos-actor:0.0.17"
//tracing support
- compile 'io.opentracing:opentracing-api:0.31.0'
- compile 'io.opentracing:opentracing-util:0.31.0'
- compile ('io.opentracing.brave:brave-opentracing:0.31.0'){
+ compile "io.opentracing:opentracing-api:0.31.0"
+ compile "io.opentracing:opentracing-util:0.31.0"
+ compile ("io.opentracing.brave:brave-opentracing:0.31.0") {
exclude group: 'io.zipkin.brave', module:'brave-tests'
}
- compile 'io.zipkin.reporter2:zipkin-sender-okhttp3:2.6.1'
- compile 'io.zipkin.reporter2:zipkin-reporter:2.6.1'
+ compile "io.zipkin.reporter2:zipkin-sender-okhttp3:2.6.1"
+ compile "io.zipkin.reporter2:zipkin-reporter:2.6.1"
- compile 'io.reactivex:rxscala_2.12:0.26.5'
- compile 'io.reactivex:rxjava-reactive-streams:1.2.1'
- compile ('com.microsoft.azure:azure-cosmosdb:2.6.2')
+ compile "io.reactivex:rxscala_${gradle.scala.depVersion}:0.26.5"
+ compile "io.reactivex:rxjava-reactive-streams:1.2.1"
+ compile "com.microsoft.azure:azure-cosmosdb:2.6.2"
- compile ('com.lightbend.akka:akka-stream-alpakka-s3_2.12:1.0.1') {
+ compile
("com.lightbend.akka:akka-stream-alpakka-s3_${gradle.scala.depVersion}:1.0.1") {
exclude group: 'org.apache.httpcomponents' //Not used as alpakka uses
akka-http
exclude group: 'com.fasterxml.jackson.core'
exclude group: 'com.fasterxml.jackson.dataformat'
}
- compile ('com.amazonaws:aws-java-sdk-cloudfront:1.11.517')
+ compile "com.amazonaws:aws-java-sdk-cloudfront:1.11.517"
//Following constraints ensure that akka related transitive dependencies
match the
//current version used
constraints {
//akka cluster dependencies being pulled by mesos-actor
- compile "com.typesafe.akka:akka-remote_2.12:${gradle.akka.version}"
- compile "com.typesafe.akka:akka-cluster_2.12:${gradle.akka.version}"
- compile
"com.typesafe.akka:akka-cluster-metrics_2.12:${gradle.akka.version}"
- compile
"com.typesafe.akka:akka-cluster-tools_2.12:${gradle.akka.version}"
- compile
"com.typesafe.akka:akka-distributed-data_2.12:${gradle.akka.version}"
+ compile
"com.typesafe.akka:akka-remote_${gradle.scala.depVersion}:${gradle.akka.version}"
+ compile
"com.typesafe.akka:akka-cluster_${gradle.scala.depVersion}:${gradle.akka.version}"
+ compile
"com.typesafe.akka:akka-cluster-metrics_${gradle.scala.depVersion}:${gradle.akka.version}"
+ compile
"com.typesafe.akka:akka-cluster-tools_${gradle.scala.depVersion}:${gradle.akka.version}"
+ compile
"com.typesafe.akka:akka-distributed-data_${gradle.scala.depVersion}:${gradle.akka.version}"
- compile
"com.typesafe.akka:akka-http-xml_2.12:${gradle.akka_http.version}"
+ compile
"com.typesafe.akka:akka-http-xml_${gradle.scala.depVersion}:${gradle.akka_http.version}"
}
}
diff --git a/core/controller/build.gradle b/core/controller/build.gradle
index 3245121..a7d4170 100644
--- a/core/controller/build.gradle
+++ b/core/controller/build.gradle
@@ -39,9 +39,9 @@ repositories {
dependencies {
compile "org.scala-lang:scala-library:${gradle.scala.version}"
- compile
'com.lightbend.akka.management:akka-management-cluster-bootstrap_2.12:0.11.0'
- compile
'com.lightbend.akka.discovery:akka-discovery-kubernetes-api_2.12:0.11.0'
- compile
'com.lightbend.akka.discovery:akka-discovery-marathon-api_2.12:0.11.0'
+ compile
"com.lightbend.akka.management:akka-management-cluster-bootstrap_${gradle.scala.depVersion}:0.11.0"
+ compile
"com.lightbend.akka.discovery:akka-discovery-kubernetes-api_${gradle.scala.depVersion}:0.11.0"
+ compile
"com.lightbend.akka.discovery:akka-discovery-marathon-api_${gradle.scala.depVersion}:0.11.0"
compile project(':common:scala')
compile project(':core:invoker')
}
diff --git a/core/cosmosdb/cache-invalidator/build.gradle
b/core/cosmosdb/cache-invalidator/build.gradle
index 74356fc..a20c054 100644
--- a/core/cosmosdb/cache-invalidator/build.gradle
+++ b/core/cosmosdb/cache-invalidator/build.gradle
@@ -35,7 +35,7 @@ dependencies {
compile "org.scala-lang:scala-library:${gradle.scala.version}"
compile project(':common:scala')
compile "com.microsoft.azure:azure-cosmos:3.3.0"
- compile
"com.typesafe.akka:akka-stream-kafka_2.12:${gradle.akka_kafka.version}"
+ compile
"com.typesafe.akka:akka-stream-kafka_${gradle.scala.depVersion}:${gradle.akka_kafka.version}"
}
tasks.withType(ScalaCompile) {
diff --git a/core/invoker/build.gradle b/core/invoker/build.gradle
index ec96298..72716de 100644
--- a/core/invoker/build.gradle
+++ b/core/invoker/build.gradle
@@ -43,7 +43,7 @@ dependencies {
compile ("org.apache.curator:curator-recipes:${gradle.curator.version}") {
exclude group: 'org.apache.zookeeper', module:'zookeeper'
}
- compile ('org.apache.zookeeper:zookeeper:3.4.11') {
+ compile ("org.apache.zookeeper:zookeeper:3.4.11") {
exclude group: 'org.slf4j'
exclude group: 'log4j'
exclude group: 'jline'
diff --git a/core/monitoring/user-events/build.gradle
b/core/monitoring/user-events/build.gradle
index 14a5363..97f869f 100644
--- a/core/monitoring/user-events/build.gradle
+++ b/core/monitoring/user-events/build.gradle
@@ -34,17 +34,17 @@ dependencies {
compile "org.scala-lang:scala-library:${gradle.scala.version}"
compile project(':common:scala')
- compile
"com.typesafe.akka:akka-stream-kafka_2.12:${gradle.akka_kafka.version}"
+ compile
"com.typesafe.akka:akka-stream-kafka_${gradle.scala.depVersion}:${gradle.akka_kafka.version}"
- compile 'io.prometheus:simpleclient:0.6.0'
- compile 'io.prometheus:simpleclient_common:0.6.0'
+ compile "io.prometheus:simpleclient:0.6.0"
+ compile "io.prometheus:simpleclient_common:0.6.0"
- testCompile 'junit:junit:4.11'
- testCompile 'org.scalatest:scalatest_2.12:3.0.1'
- testCompile
"com.typesafe.akka:akka-stream-kafka-testkit_2.12:${gradle.akka_kafka.version}"
- testCompile "com.typesafe.akka:akka-testkit_2.12:${gradle.akka.version}"
- testCompile
"com.typesafe.akka:akka-stream-testkit_2.12:${gradle.akka.version}"
- testCompile
"com.typesafe.akka:akka-http-testkit_2.12:${gradle.akka_http.version}"
+ testCompile "junit:junit:4.11"
+ testCompile "org.scalatest:scalatest_${gradle.scala.depVersion}:3.0.1"
+ testCompile
"com.typesafe.akka:akka-stream-kafka-testkit_${gradle.scala.depVersion}:${gradle.akka_kafka.version}"
+ testCompile
"com.typesafe.akka:akka-testkit_${gradle.scala.depVersion}:${gradle.akka.version}"
+ testCompile
"com.typesafe.akka:akka-stream-testkit_${gradle.scala.depVersion}:${gradle.akka.version}"
+ testCompile
"com.typesafe.akka:akka-http-testkit_${gradle.scala.depVersion}:${gradle.akka_http.version}"
}
tasks.withType(ScalaCompile) {
diff --git a/core/standalone/build.gradle b/core/standalone/build.gradle
index 3c57c7a..3a23524 100644
--- a/core/standalone/build.gradle
+++ b/core/standalone/build.gradle
@@ -151,15 +151,15 @@ install.dependsOn(bootJar)
dependencies {
compile project(':core:controller')
compile project(':tools:admin')
- compile 'org.rogach:scallop_2.12:3.3.1'
+ compile "org.rogach:scallop_${gradle.scala.depVersion}:3.3.1"
//Tried with 0.16.0 has support for Kafka 0.11.0
https://github.com/embeddedkafka/embedded-kafka/tree/v0.16.0
//But that causes class compatability issue die to use of newer client
version
- compile ("io.github.embeddedkafka:embedded-kafka_2.12:2.1.1")
- compile ("org.scala-lang:scala-reflect:${gradle.scala.version}")
+ compile
"io.github.embeddedkafka:embedded-kafka_${gradle.scala.depVersion}:2.1.1"
+ compile "org.scala-lang:scala-reflect:${gradle.scala.version}"
- testCompile 'junit:junit:4.11'
- testCompile 'org.scalatest:scalatest_2.12:3.0.5'
+ testCompile "junit:junit:4.11"
+ testCompile "org.scalatest:scalatest_${gradle.scala.depVersion}:3.0.5"
}
gradle.projectsEvaluated {
diff --git a/settings.gradle b/settings.gradle
index 3ec6c3d..f5be3c2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -36,6 +36,7 @@ rootProject.name = 'openwhisk'
gradle.ext.scala = [
version: '2.12.10',
+ depVersion: '2.12',
compileFlags: ['-feature', '-unchecked', '-deprecation',
'-Xfatal-warnings', '-Ywarn-unused-import']
]
diff --git a/tests/build.gradle b/tests/build.gradle
index 7a6aae4..d92a7f7 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -188,24 +188,24 @@ task testUnit(type: Test) {
dependencies {
compile "org.scala-lang:scala-library:${gradle.scala.version}"
- compile 'org.apache.commons:commons-lang3:3.3.2'
- compile 'org.apache.httpcomponents:httpclient:4.5.2:tests'
- compile 'org.apache.httpcomponents:httpmime:4.3.6'
- compile 'junit:junit:4.11'
- compile 'io.rest-assured:rest-assured:4.0.0'
- compile 'org.scalatest:scalatest_2.12:3.0.5'
- compile "com.typesafe.akka:akka-testkit_2.12:${gradle.akka.version}"
- compile 'com.google.code.gson:gson:2.3.1'
- compile 'org.scalamock:scalamock-scalatest-support_2.12:3.6.0'
- compile
"com.typesafe.akka:akka-http-testkit_2.12:${gradle.akka_http.version}"
- compile 'com.github.java-json-tools:json-schema-validator:2.2.8'
+ compile "org.apache.commons:commons-lang3:3.3.2"
+ compile "org.apache.httpcomponents:httpclient:4.5.2:tests"
+ compile "org.apache.httpcomponents:httpmime:4.3.6"
+ compile "junit:junit:4.11"
+ compile "io.rest-assured:rest-assured:4.0.0"
+ compile "org.scalatest:scalatest_${gradle.scala.depVersion}:3.0.5"
+ compile
"com.typesafe.akka:akka-testkit_${gradle.scala.depVersion}:${gradle.akka.version}"
+ compile "com.google.code.gson:gson:2.3.1"
+ compile
"org.scalamock:scalamock-scalatest-support_${gradle.scala.depVersion}:3.6.0"
+ compile
"com.typesafe.akka:akka-http-testkit_${gradle.scala.depVersion}:${gradle.akka_http.version}"
+ compile "com.github.java-json-tools:json-schema-validator:2.2.8"
compile "org.mockito:mockito-core:2.27.0"
- compile 'io.opentracing:opentracing-mock:0.31.0'
+ compile "io.opentracing:opentracing-mock:0.31.0"
compile "org.apache.curator:curator-test:${gradle.curator.version}"
- compile 'com.atlassian.oai:swagger-request-validator-core:1.4.5'
- compile
"com.typesafe.akka:akka-stream-kafka-testkit_2.12:${gradle.akka_kafka.version}"
- compile "com.typesafe.akka:akka-stream-testkit_2.12:${gradle.akka.version}"
- compile "com.typesafe.akka:akka-stream-testkit_2.12:${gradle.akka.version}"
+ compile "com.atlassian.oai:swagger-request-validator-core:1.4.5"
+ compile
"com.typesafe.akka:akka-stream-kafka-testkit_${gradle.scala.depVersion}:${gradle.akka_kafka.version}"
+ compile
"com.typesafe.akka:akka-stream-testkit_${gradle.scala.depVersion}:${gradle.akka.version}"
+ compile
"com.typesafe.akka:akka-stream-testkit_${gradle.scala.depVersion}:${gradle.akka.version}"
compile "io.fabric8:kubernetes-server-mock:${gradle.kube_client.version}"
compile "com.amazonaws:aws-java-sdk-s3:1.11.295"
diff --git a/tests/dat/actions/unicode.tests/src/java/unicode/build.gradle
b/tests/dat/actions/unicode.tests/src/java/unicode/build.gradle
index 71833aa..de9718a 100644
--- a/tests/dat/actions/unicode.tests/src/java/unicode/build.gradle
+++ b/tests/dat/actions/unicode.tests/src/java/unicode/build.gradle
@@ -24,5 +24,5 @@ repositories {
}
dependencies {
- compile 'com.google.code.gson:gson:2.6.2'
+ compile "com.google.code.gson:gson:2.6.2"
}
diff --git a/tests/performance/gatling_tests/build.gradle
b/tests/performance/gatling_tests/build.gradle
index 3bf4c9b..92099a1 100644
--- a/tests/performance/gatling_tests/build.gradle
+++ b/tests/performance/gatling_tests/build.gradle
@@ -27,7 +27,7 @@ repositories {
}
dependencies {
- gatling "io.spray:spray-json_2.12:1.3.4"
+ gatling "io.spray:spray-json_${gradle.scala.depVersion}:1.3.4"
gatling "commons-io:commons-io:2.6"
}
diff --git a/tools/admin/build.gradle b/tools/admin/build.gradle
index f72e199..d0e87d0 100644
--- a/tools/admin/build.gradle
+++ b/tools/admin/build.gradle
@@ -48,5 +48,5 @@ bootJar {
dependencies {
compile project(':common:scala')
- compile 'org.rogach:scallop_2.12:3.1.2'
+ compile "org.rogach:scallop_${gradle.scala.depVersion}:3.1.2"
}
diff --git a/tools/dev/build.gradle b/tools/dev/build.gradle
index 745b91f..6184a75 100644
--- a/tools/dev/build.gradle
+++ b/tools/dev/build.gradle
@@ -25,8 +25,8 @@ def owHome = project.projectDir.parentFile.parentFile
dependencies {
compile "org.codehaus.groovy:groovy-all:2.4.14"
- compile 'org.apache.commons:commons-io:1.3.2'
- compile 'org.apache.commons:commons-lang3:3.8.1'
+ compile "org.apache.commons:commons-io:1.3.2"
+ compile "org.apache.commons:commons-lang3:3.8.1"
}
task couchdbViews(type: JavaExec) {
