From 63ef15080b52abc734a87af67bbb3353672955cb Mon Sep 17 00:00:00 2001 From: seonghyun Date: Thu, 7 Jul 2022 10:47:16 +0900 Subject: [PATCH 1/8] Bump graddle --- build.gradle | 8 ---- core/controller/build.gradle | 5 ++- .../core/loadBalancer/LeanBalancer.scala | 1 - core/scheduler/build.gradle | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 55616 -> 58910 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 39 ++++++++---------- gradlew.bat | 8 +++- settings.gradle | 12 ++++++ tools/travis/distDocker.sh | 1 + 10 files changed, 42 insertions(+), 36 deletions(-) diff --git a/build.gradle b/build.gradle index 5228625916d..56a1fcb9e3d 100644 --- a/build.gradle +++ b/build.gradle @@ -25,17 +25,9 @@ buildscript { } plugins { - id "com.gradle.build-scan" version "2.3" id "org.scoverage" version "4.0.1" apply false } - -buildScan { - termsOfServiceUrl = 'https://gradle.com/terms-of-service' - termsOfServiceAgree = 'yes' - publishAlwaysIf(System.getenv('CI') != null) -} - subprojects { apply plugin: 'scalafmt' scalafmt.configFilePath = gradle.scalafmt.config diff --git a/core/controller/build.gradle b/core/controller/build.gradle index b0864542b60..c877035039f 100644 --- a/core/controller/build.gradle +++ b/core/controller/build.gradle @@ -37,11 +37,12 @@ distDockerCoverage.dependsOn ':common:scala:scoverageClasses', 'scoverageClasses dependencies { compile "org.scala-lang:scala-library:${gradle.scala.version}" + compile project(':common:scala') + compile project(':core:invoker') + compile "com.lightbend.akka.management:akka-management-cluster-bootstrap_${gradle.scala.depVersion}:${gradle.akka_management.version}" compile "com.lightbend.akka.discovery:akka-discovery-kubernetes-api_${gradle.scala.depVersion}:${gradle.akka_management.version}" compile "com.lightbend.akka.discovery:akka-discovery-marathon-api_${gradle.scala.depVersion}:${gradle.akka_management.version}" - compile project(':common:scala') - compile project(':core:invoker') } mainClassName = "org.apache.openwhisk.core.controller.Controller" diff --git a/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/LeanBalancer.scala b/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/LeanBalancer.scala index dac40c2ff93..4016d0c5596 100644 --- a/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/LeanBalancer.scala +++ b/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/LeanBalancer.scala @@ -22,7 +22,6 @@ import org.apache.openwhisk.common._ import org.apache.openwhisk.core.WhiskConfig._ import org.apache.openwhisk.core.connector._ import org.apache.openwhisk.core.containerpool.ContainerPoolConfig -import org.apache.openwhisk.core.entity.ControllerInstanceId import org.apache.openwhisk.core.entity._ import org.apache.openwhisk.core.invoker.InvokerProvider import org.apache.openwhisk.core.{ConfigKeys, WhiskConfig} diff --git a/core/scheduler/build.gradle b/core/scheduler/build.gradle index 2ed6a19e031..dbaa1aba2e4 100644 --- a/core/scheduler/build.gradle +++ b/core/scheduler/build.gradle @@ -44,7 +44,7 @@ buildscript { dependencies { // see https://plugins.gradle.org/plugin/com.lightbend.akka.grpc.gradle // for the currently latest version. - classpath 'gradle.plugin.com.lightbend.akka.grpc:akka-grpc-gradle-plugin:0.7.2' + classpath 'com.lightbend.akka.grpc:akka-grpc-gradle-plugin:1.0.0' } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 5c2d1cf016b3885f6930543d57b744ea8c220a1a..62d4c053550b91381bbd28b1afc82d634bf73a8a 100644 GIT binary patch delta 23020 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 delta 19839 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 Date: Sat, 16 Jul 2022 23:42:16 +0900 Subject: [PATCH 2/8] Use implementation instead of compile --- common/scala/build.gradle | 99 ++++++++++--------- core/controller/build.gradle | 13 +-- core/cosmosdb/cache-invalidator/build.gradle | 8 +- core/invoker/build.gradle | 10 +- core/monitoring/user-events/build.gradle | 24 ++--- core/scheduler/build.gradle | 7 +- core/standalone/build.gradle | 24 ++--- tests/build.gradle | 66 +++++++------ tests/dat/actions/src/java/sleep/build.gradle | 2 +- tools/admin/build.gradle | 6 +- tools/dev/build.gradle | 6 +- 11 files changed, 135 insertions(+), 130 deletions(-) diff --git a/common/scala/build.gradle b/common/scala/build.gradle index ccdfc8a567a..f85ca30eae3 100644 --- a/common/scala/build.gradle +++ b/common/scala/build.gradle @@ -20,6 +20,7 @@ plugins { id 'maven' id 'org.scoverage' id 'scala' + id 'java-library' } ext.dockerImageName = 'scala' @@ -28,80 +29,80 @@ apply from: '../../gradle/docker.gradle' project.archivesBaseName = "openwhisk-common" dependencies { - compile "org.scala-lang:scala-library:${gradle.scala.version}" + api "org.scala-lang:scala-library:${gradle.scala.version}" - compile ("com.github.pureconfig:pureconfig_${gradle.scala.depVersion}:0.11.1") { + api ("com.github.pureconfig:pureconfig_${gradle.scala.depVersion}:0.11.1") { exclude group: 'org.scala-lang', module: 'scala-compiler' exclude group: 'org.scala-lang', module: 'scala-reflect' } - 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-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-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}:1.1.2" - - 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.4.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}" + api "io.spray:spray-json_${gradle.scala.depVersion}:1.3.5" + api "com.lihaoyi:fastparse_${gradle.scala.depVersion}:2.1.3" + + api "com.typesafe.akka:akka-actor_${gradle.scala.depVersion}:${gradle.akka.version}" + api "com.typesafe.akka:akka-stream_${gradle.scala.depVersion}:${gradle.akka.version}" + api "com.typesafe.akka:akka-slf4j_${gradle.scala.depVersion}:${gradle.akka.version}" + api "com.typesafe.akka:akka-cluster_${gradle.scala.depVersion}:${gradle.akka.version}" + api "com.typesafe.akka:akka-cluster-metrics_${gradle.scala.depVersion}:${gradle.akka.version}" + api "com.typesafe.akka:akka-cluster-tools_${gradle.scala.depVersion}:${gradle.akka.version}" + api "com.typesafe.akka:akka-distributed-data_${gradle.scala.depVersion}:${gradle.akka.version}" + + api "com.typesafe.akka:akka-http-core_${gradle.scala.depVersion}:${gradle.akka_http.version}" + api "com.typesafe.akka:akka-http-spray-json_${gradle.scala.depVersion}:${gradle.akka_http.version}" + + api "com.lightbend.akka:akka-stream-alpakka-file_${gradle.scala.depVersion}:1.1.2" + + api "ch.qos.logback:logback-classic:1.2.3" + api "org.slf4j:jcl-over-slf4j:1.7.25" + api "org.slf4j:log4j-over-slf4j:1.7.25" + api "commons-codec:commons-codec:1.9" + api "commons-io:commons-io:2.6" + api "commons-collections:commons-collections:3.2.2" + api "org.apache.kafka:kafka-clients:2.4.0" + api "org.apache.httpcomponents:httpclient:4.5.5" + api "com.fasterxml.uuid:java-uuid-generator:3.1.3" + api "com.github.ben-manes.caffeine:caffeine:2.6.2" + api "com.google.code.findbugs:jsr305:3.0.2" + api "io.fabric8:kubernetes-client:${gradle.kube_client.version}" //metrics - compile ("io.kamon:kamon-core_${gradle.scala.depVersion}:2.1.12") { + api ("io.kamon:kamon-core_${gradle.scala.depVersion}:2.1.12") { exclude group: 'com.lihaoyi' } - compile "io.kamon:kamon-statsd_${gradle.scala.depVersion}:2.1.12" - compile ("io.kamon:kamon-system-metrics_${gradle.scala.depVersion}:2.1.12") { + api "io.kamon:kamon-statsd_${gradle.scala.depVersion}:2.1.12" + api ("io.kamon:kamon-system-metrics_${gradle.scala.depVersion}:2.1.12") { exclude group: 'io.kamon', module: 'sigar-loader' } - compile "io.kamon:kamon-prometheus_${gradle.scala.depVersion}:2.1.12" - compile "io.kamon:kamon-datadog_${gradle.scala.depVersion}:2.1.12" + api "io.kamon:kamon-prometheus_${gradle.scala.depVersion}:2.1.12" + api "io.kamon:kamon-datadog_${gradle.scala.depVersion}:2.1.12" // for etcd - compile("com.ibm.etcd:etcd-java:0.0.13") + api "com.ibm.etcd:etcd-java:0.0.13" //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") { + api "io.opentracing:opentracing-api:0.31.0" + api "io.opentracing:opentracing-util:0.31.0" + api ("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" + api "io.zipkin.reporter2:zipkin-sender-okhttp3:2.6.1" + api "io.zipkin.reporter2:zipkin-reporter:2.6.1" - compile "io.reactivex:rxjava:1.3.8" - compile "io.reactivex:rxjava-reactive-streams:1.2.1" - compile "com.microsoft.azure:azure-cosmosdb:2.6.2" + api "io.reactivex:rxjava:1.3.8" + api "io.reactivex:rxjava-reactive-streams:1.2.1" + api "com.microsoft.azure:azure-cosmosdb:2.6.2" - compile "com.sksamuel.elastic4s:elastic4s-http_${gradle.scala.depVersion}:6.7.4" + api "com.sksamuel.elastic4s:elastic4s-http_${gradle.scala.depVersion}:6.7.4" //for mongo - compile "org.mongodb.scala:mongo-scala-driver_${gradle.scala.depVersion}:2.7.0" + api "org.mongodb.scala:mongo-scala-driver_${gradle.scala.depVersion}:2.7.0" - compile ("com.lightbend.akka:akka-stream-alpakka-s3_${gradle.scala.depVersion}:1.1.2") { + api ("com.lightbend.akka:akka-stream-alpakka-s3_${gradle.scala.depVersion}:1.1.2") { 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" + api "com.amazonaws:aws-java-sdk-cloudfront:1.11.517" - compile ("com.azure:azure-storage-blob:12.7.0") { + api ("com.azure:azure-storage-blob:12.7.0") { exclude group: "com.azure", module: "azure-core-test" } } diff --git a/core/controller/build.gradle b/core/controller/build.gradle index c877035039f..7d5163438fc 100644 --- a/core/controller/build.gradle +++ b/core/controller/build.gradle @@ -36,13 +36,14 @@ ext.coverageDirs = [ distDockerCoverage.dependsOn ':common:scala:scoverageClasses', 'scoverageClasses' dependencies { - compile "org.scala-lang:scala-library:${gradle.scala.version}" - compile project(':common:scala') - compile project(':core:invoker') + implementation "org.scala-lang:scala-library:${gradle.scala.version}" + implementation project(':common:scala') + implementation project(':core:invoker') + implementation project(':core:scheduler') - compile "com.lightbend.akka.management:akka-management-cluster-bootstrap_${gradle.scala.depVersion}:${gradle.akka_management.version}" - compile "com.lightbend.akka.discovery:akka-discovery-kubernetes-api_${gradle.scala.depVersion}:${gradle.akka_management.version}" - compile "com.lightbend.akka.discovery:akka-discovery-marathon-api_${gradle.scala.depVersion}:${gradle.akka_management.version}" + implementation "com.lightbend.akka.management:akka-management-cluster-bootstrap_${gradle.scala.depVersion}:${gradle.akka_management.version}" + implementation "com.lightbend.akka.discovery:akka-discovery-kubernetes-api_${gradle.scala.depVersion}:${gradle.akka_management.version}" + implementation "com.lightbend.akka.discovery:akka-discovery-marathon-api_${gradle.scala.depVersion}:${gradle.akka_management.version}" } mainClassName = "org.apache.openwhisk.core.controller.Controller" diff --git a/core/cosmosdb/cache-invalidator/build.gradle b/core/cosmosdb/cache-invalidator/build.gradle index 33d61e19c33..aeb4a7947e2 100644 --- a/core/cosmosdb/cache-invalidator/build.gradle +++ b/core/cosmosdb/cache-invalidator/build.gradle @@ -30,12 +30,12 @@ distDocker.dependsOn ':common:scala:distDocker', 'distTar' project.archivesBaseName = "openwhisk-cache-invalidator-cosmosdb" dependencies { - compile "org.scala-lang:scala-library:${gradle.scala.version}" - compile (project(':common:scala')) { + implementation "org.scala-lang:scala-library:${gradle.scala.version}" + implementation (project(':common:scala')) { exclude group: 'com.microsoft.azure', module:'azure-cosmosdb' } - compile "com.microsoft.azure:azure-cosmos:3.5.0" - compile "com.typesafe.akka:akka-stream-kafka_${gradle.scala.depVersion}:${gradle.akka_kafka.version}" + implementation "com.microsoft.azure:azure-cosmos:3.5.0" + implementation "com.typesafe.akka:akka-stream-kafka_${gradle.scala.depVersion}:${gradle.akka_kafka.version}" } mainClassName = "org.apache.openwhisk.core.database.cosmosdb.cache.Main" diff --git a/core/invoker/build.gradle b/core/invoker/build.gradle index 06560f0ba35..27da757ca56 100644 --- a/core/invoker/build.gradle +++ b/core/invoker/build.gradle @@ -35,14 +35,14 @@ ext.coverageDirs = [ distDockerCoverage.dependsOn ':common:scala:scoverageClasses', 'scoverageClasses' dependencies { - compile "org.scala-lang:scala-library:${gradle.scala.version}" - compile project(':common:scala') - compile project(':core:scheduler') + implementation "org.scala-lang:scala-library:${gradle.scala.version}" + implementation project(':common:scala') + implementation project(':core:scheduler') - compile ("org.apache.curator:curator-recipes:${gradle.curator.version}") { + implementation ("org.apache.curator:curator-recipes:${gradle.curator.version}") { exclude group: 'org.apache.zookeeper', module:'zookeeper' } - compile ("org.apache.zookeeper:zookeeper:3.4.11") { + implementation ("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 a458c8eb462..f5a4ae13057 100644 --- a/core/monitoring/user-events/build.gradle +++ b/core/monitoring/user-events/build.gradle @@ -30,21 +30,21 @@ distDocker.dependsOn ':common:scala:distDocker', 'distTar' project.archivesBaseName = "openwhisk-user-events" dependencies { - compile "org.scala-lang:scala-library:${gradle.scala.version}" - compile project(':common:scala') + implementation "org.scala-lang:scala-library:${gradle.scala.version}" + implementation project(':common:scala') - compile "com.typesafe.akka:akka-stream-kafka_${gradle.scala.depVersion}:${gradle.akka_kafka.version}" + implementation "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" + implementation "io.prometheus:simpleclient:0.6.0" + implementation "io.prometheus:simpleclient_common:0.6.0" - testCompile "junit:junit:4.11" - testCompile "org.scalatest:scalatest_${gradle.scala.depVersion}:3.0.8" - testCompile "io.github.embeddedkafka:embedded-kafka_${gradle.scala.depVersion}:2.4.0" - 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}" + testImplementation "junit:junit:4.11" + testImplementation "org.scalatest:scalatest_${gradle.scala.depVersion}:3.0.8" + testImplementation "io.github.embeddedkafka:embedded-kafka_${gradle.scala.depVersion}:2.4.0" + testImplementation "com.typesafe.akka:akka-stream-kafka-testkit_${gradle.scala.depVersion}:${gradle.akka_kafka.version}" + testImplementation "com.typesafe.akka:akka-testkit_${gradle.scala.depVersion}:${gradle.akka.version}" + testImplementation "com.typesafe.akka:akka-stream-testkit_${gradle.scala.depVersion}:${gradle.akka.version}" + testImplementation "com.typesafe.akka:akka-http-testkit_${gradle.scala.depVersion}:${gradle.akka_http.version}" } mainClassName = "org.apache.openwhisk.core.monitoring.metrics.Main" diff --git a/core/scheduler/build.gradle b/core/scheduler/build.gradle index dbaa1aba2e4..4b0443b1912 100644 --- a/core/scheduler/build.gradle +++ b/core/scheduler/build.gradle @@ -63,10 +63,9 @@ dependencies { resolutionStrategy.force "com.typesafe.akka:akka-parsing_${gradle.scala.depVersion}:${gradle.akka_http.version}" resolutionStrategy.force "com.typesafe.akka:akka-http_${gradle.scala.depVersion}:${gradle.akka_http.version}" } - - compile "org.scala-lang:scala-library:${gradle.scala.version}" - compile "io.altoo:akka-kryo-serialization_${gradle.scala.depVersion}:1.0.0" - compile project(':common:scala') + implementation "org.scala-lang:scala-library:${gradle.scala.version}" + implementation project(':common:scala') + implementation "io.altoo:akka-kryo-serialization_${gradle.scala.depVersion}:1.0.0" } // workaround for akka-grpc diff --git a/core/standalone/build.gradle b/core/standalone/build.gradle index a1f0a45ceba..ef4baae8dcc 100644 --- a/core/standalone/build.gradle +++ b/core/standalone/build.gradle @@ -157,17 +157,19 @@ gitProperties { install.dependsOn(bootJar) dependencies { - compile "org.scala-lang:scala-library:${gradle.scala.version}" - compile project(':core:controller') - compile project(':tools:admin') - compile "org.rogach:scallop_${gradle.scala.depVersion}:3.3.2" - - compile "io.github.embeddedkafka:embedded-kafka_${gradle.scala.depVersion}:2.4.0" - compile "org.scala-lang:scala-reflect:${gradle.scala.version}" - compile "ch.megard:akka-http-cors_${gradle.scala.depVersion}:0.4.2" - - testCompile "junit:junit:4.11" - testCompile "org.scalatest:scalatest_${gradle.scala.depVersion}:3.0.8" + implementation "org.scala-lang:scala-library:${gradle.scala.version}" + implementation project(':common:scala') + implementation project(':core:controller') + implementation project(':core:invoker') + implementation project(':tools:admin') + implementation "org.rogach:scallop_${gradle.scala.depVersion}:3.3.2" + + implementation "io.github.embeddedkafka:embedded-kafka_${gradle.scala.depVersion}:2.4.0" + implementation "org.scala-lang:scala-reflect:${gradle.scala.version}" + implementation "ch.megard:akka-http-cors_${gradle.scala.depVersion}:0.4.2" + + testImplementation "junit:junit:4.11" + testImplementation "org.scalatest:scalatest_${gradle.scala.depVersion}:3.0.8" } gradle.projectsEvaluated { diff --git a/tests/build.gradle b/tests/build.gradle index bb07b3968aa..e98feb0bf3a 100644 --- a/tests/build.gradle +++ b/tests/build.gradle @@ -208,38 +208,40 @@ 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_${gradle.scala.depVersion}:3.0.8" - 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_${gradle.scala.depVersion}:4.4.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 "org.apache.curator:curator-test:${gradle.curator.version}" - compile "com.atlassian.oai:swagger-request-validator-core:1.4.5" - compile "io.github.embeddedkafka:embedded-kafka_${gradle.scala.depVersion}:2.4.0" - 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 "io.fabric8:kubernetes-server-mock:${gradle.kube_client.version}" - - compile "com.amazonaws:aws-java-sdk-s3:1.11.295" - compile 'org.testcontainers:elasticsearch:1.17.1' - compile 'org.testcontainers:mongodb:1.17.1' - - compile project(':common:scala') - compile project(':core:controller') - compile project(':core:scheduler') - compile project(':core:invoker') - compile project(':core:cosmosdb:cache-invalidator') - compile project(':core:monitoring:user-events') - compile project(':tools:admin') + implementation "org.scala-lang:scala-library:${gradle.scala.version}" + implementation "org.apache.commons:commons-lang3:3.3.2" + implementation "org.apache.httpcomponents:httpclient:4.5.2:tests" + implementation "org.apache.httpcomponents:httpmime:4.3.6" + implementation "junit:junit:4.11" + implementation "io.rest-assured:rest-assured:4.0.0" + implementation "org.scalatest:scalatest_${gradle.scala.depVersion}:3.0.8" + implementation "com.typesafe.akka:akka-testkit_${gradle.scala.depVersion}:${gradle.akka.version}" + implementation "com.google.code.gson:gson:2.3.1" + implementation "org.scalamock:scalamock_${gradle.scala.depVersion}:4.4.0" + implementation "com.typesafe.akka:akka-http-testkit_${gradle.scala.depVersion}:${gradle.akka_http.version}" + implementation "com.github.java-json-tools:json-schema-validator:2.2.8" + implementation "org.mockito:mockito-core:2.27.0" + implementation "io.opentracing:opentracing-mock:0.31.0" + implementation "org.apache.curator:curator-test:${gradle.curator.version}" + implementation "com.atlassian.oai:swagger-request-validator-core:1.4.5" + implementation "io.github.embeddedkafka:embedded-kafka_${gradle.scala.depVersion}:2.4.0" + implementation "com.typesafe.akka:akka-stream-kafka-testkit_${gradle.scala.depVersion}:${gradle.akka_kafka.version}" + implementation "com.typesafe.akka:akka-stream-testkit_${gradle.scala.depVersion}:${gradle.akka.version}" + implementation "io.fabric8:kubernetes-server-mock:${gradle.kube_client.version}" + implementation "org.rogach:scallop_${gradle.scala.depVersion}:3.3.2" + + implementation "com.amazonaws:aws-java-sdk-s3:1.11.295" + implementation "com.microsoft.azure:azure-cosmos:3.5.0" + implementation 'org.testcontainers:elasticsearch:1.17.1' + implementation 'org.testcontainers:mongodb:1.17.1' + + implementation project(':common:scala') + implementation project(':core:controller') + implementation project(':core:scheduler') + implementation project(':core:invoker') + implementation project(':core:cosmosdb:cache-invalidator') + implementation project(':core:monitoring:user-events') + implementation project(':tools:admin') swaggerCodegen 'io.swagger:swagger-codegen-cli:2.4.9' } diff --git a/tests/dat/actions/src/java/sleep/build.gradle b/tests/dat/actions/src/java/sleep/build.gradle index c6df5f6e9f9..7c718ff901a 100644 --- a/tests/dat/actions/src/java/sleep/build.gradle +++ b/tests/dat/actions/src/java/sleep/build.gradle @@ -26,5 +26,5 @@ repositories { } dependencies { - compile "com.google.code.gson:gson:2.6.2" + implementation "com.google.code.gson:gson:2.6.2" } diff --git a/tools/admin/build.gradle b/tools/admin/build.gradle index 0ce02f882bc..0d2e3a0cc2b 100644 --- a/tools/admin/build.gradle +++ b/tools/admin/build.gradle @@ -42,7 +42,7 @@ bootJar { } dependencies { - compile "org.scala-lang:scala-library:${gradle.scala.version}" - compile project(':common:scala') - compile "org.rogach:scallop_${gradle.scala.depVersion}:3.3.2" + implementation "org.scala-lang:scala-library:${gradle.scala.version}" + implementation project(':common:scala') + implementation "org.rogach:scallop_${gradle.scala.depVersion}:3.3.2" } diff --git a/tools/dev/build.gradle b/tools/dev/build.gradle index e3b82c84a88..94722d2e515 100644 --- a/tools/dev/build.gradle +++ b/tools/dev/build.gradle @@ -26,9 +26,9 @@ repositories { 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" + implementation "org.codehaus.groovy:groovy-all:2.4.14" + implementation "org.apache.commons:commons-io:1.3.2" + implementation "org.apache.commons:commons-lang3:3.8.1" } task couchdbViews(type: JavaExec) { From 1735bc004a0e18d0bb3ed9d26bb5f07b0d656d93 Mon Sep 17 00:00:00 2001 From: seonghyun Date: Sun, 17 Jul 2022 21:32:55 +0900 Subject: [PATCH 3/8] Bump to gradle 6.5 --- gradle/wrapper/gradle-wrapper.jar | Bin 58910 -> 58702 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 -- gradlew.bat | 4 ---- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 62d4c053550b91381bbd28b1afc82d634bf73a8a..cc4fdc293d0e50b0ad9b65c16e7ddd1db2f6025b 100644 GIT binary patch delta 18406 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 RC3`**IJaad=rFcB?7uiSG#~%~ delta 18673 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 Bgx diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 089bd2b1cf3..9d807824d22 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -17,6 +17,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index fbd7c515832..2fe81a7d95e 100755 --- a/gradlew +++ b/gradlew @@ -82,7 +82,6 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -130,7 +129,6 @@ fi if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath diff --git a/gradlew.bat b/gradlew.bat index 5093609d512..9618d8d9607 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -29,9 +29,6 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @@ -84,7 +81,6 @@ set CMD_LINE_ARGS=%* set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - @rem Execute Gradle "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% From a33d69228a7ad626b4d7c82484f44ebcd2c54000 Mon Sep 17 00:00:00 2001 From: seonghyun Date: Sun, 17 Jul 2022 22:56:15 +0900 Subject: [PATCH 4/8] Remove distDockerCoverage.dependsOn scoverageClasses --- core/controller/build.gradle | 1 - core/invoker/build.gradle | 1 - core/scheduler/build.gradle | 1 - 3 files changed, 3 deletions(-) diff --git a/core/controller/build.gradle b/core/controller/build.gradle index 7d5163438fc..18f03b7f6d4 100644 --- a/core/controller/build.gradle +++ b/core/controller/build.gradle @@ -33,7 +33,6 @@ ext.coverageDirs = [ "${buildDir}/classes/scala/scoverage", "${project(':common:scala').buildDir.absolutePath}/classes/scala/scoverage" ] -distDockerCoverage.dependsOn ':common:scala:scoverageClasses', 'scoverageClasses' dependencies { implementation "org.scala-lang:scala-library:${gradle.scala.version}" diff --git a/core/invoker/build.gradle b/core/invoker/build.gradle index 27da757ca56..0296059139f 100644 --- a/core/invoker/build.gradle +++ b/core/invoker/build.gradle @@ -32,7 +32,6 @@ ext.coverageDirs = [ "${buildDir}/classes/scala/scoverage", "${project(':common:scala').buildDir.absolutePath}/classes/scala/scoverage" ] -distDockerCoverage.dependsOn ':common:scala:scoverageClasses', 'scoverageClasses' dependencies { implementation "org.scala-lang:scala-library:${gradle.scala.version}" diff --git a/core/scheduler/build.gradle b/core/scheduler/build.gradle index 4b0443b1912..e37707b5b84 100644 --- a/core/scheduler/build.gradle +++ b/core/scheduler/build.gradle @@ -32,7 +32,6 @@ ext.coverageDirs = [ "${buildDir}/classes/scala/scoverage", "${project(':common:scala').buildDir.absolutePath}/classes/scala/scoverage" ] -distDockerCoverage.dependsOn ':common:scala:scoverageClasses', 'scoverageClasses' buildscript { repositories { From 1094ac32a9bc8e307f24be628bdaaba0d662e876 Mon Sep 17 00:00:00 2001 From: seonghyun Date: Tue, 19 Jul 2022 02:39:59 +0900 Subject: [PATCH 5/8] Fix com.lihaoyi:fastparse dependency version conflicts --- common/scala/build.gradle | 3 +-- core/scheduler/build.gradle | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/common/scala/build.gradle b/common/scala/build.gradle index f85ca30eae3..ba1100099fe 100644 --- a/common/scala/build.gradle +++ b/common/scala/build.gradle @@ -36,8 +36,7 @@ dependencies { exclude group: 'org.scala-lang', module: 'scala-reflect' } api "io.spray:spray-json_${gradle.scala.depVersion}:1.3.5" - api "com.lihaoyi:fastparse_${gradle.scala.depVersion}:2.1.3" - + api "com.lihaoyi:fastparse_${gradle.scala.depVersion}:2.3.0" api "com.typesafe.akka:akka-actor_${gradle.scala.depVersion}:${gradle.akka.version}" api "com.typesafe.akka:akka-stream_${gradle.scala.depVersion}:${gradle.akka.version}" api "com.typesafe.akka:akka-slf4j_${gradle.scala.depVersion}:${gradle.akka.version}" diff --git a/core/scheduler/build.gradle b/core/scheduler/build.gradle index e37707b5b84..02c4d2be23f 100644 --- a/core/scheduler/build.gradle +++ b/core/scheduler/build.gradle @@ -54,7 +54,7 @@ configurations { dependencies { configurations.all { - resolutionStrategy.force "com.lihaoyi:fastparse_${gradle.scala.depVersion}:2.1.3" + resolutionStrategy.force "com.lihaoyi:fastparse_${gradle.scala.depVersion}:2.3.0" resolutionStrategy.force "com.typesafe.akka:akka-http-core_${gradle.scala.depVersion}:${gradle.akka_http.version}" resolutionStrategy.force "com.typesafe.akka:akka-http_${gradle.scala.depVersion}:${gradle.akka_http.version}" resolutionStrategy.force "com.typesafe.akka:akka-http2-support_${gradle.scala.depVersion}:${gradle.akka_http.version}" From 512dfdd4e6f95e66388250ca63dcee0876d414c4 Mon Sep 17 00:00:00 2001 From: seonghyun Date: Tue, 19 Jul 2022 16:32:10 +0900 Subject: [PATCH 6/8] Bump to gradle 6.9.1 --- gradle/wrapper/gradle-wrapper.jar | Bin 58702 -> 59203 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 ++ gradlew.bat | 25 +++++++---------------- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index cc4fdc293d0e50b0ad9b65c16e7ddd1db2f6025b..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f 100644 GIT binary patch delta 18978 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 delta 18570 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 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -51,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -61,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell From e8ad7e13aad54411ce958579df8c56d3d78c7156 Mon Sep 17 00:00:00 2001 From: seonghyun Date: Wed, 27 Jul 2022 23:22:03 +0900 Subject: [PATCH 7/8] Bump to scoverage 7.0.0 --- build.gradle | 6 +++++- core/controller/build.gradle | 1 + core/invoker/build.gradle | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 56a1fcb9e3d..16e529fa37c 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ buildscript { } plugins { - id "org.scoverage" version "4.0.1" apply false + id "org.scoverage" version "7.0.0" apply false } subprojects { @@ -60,6 +60,10 @@ subprojects { mavenCentral() } + scala { + zincVersion = "1.3.0" + } + tasks.withType(ScalaCompile) { scalaCompileOptions.additionalParameters = gradle.scala.compileFlags scalaCompileOptions.forkOptions.jvmArgs = ["-Xss2m"] diff --git a/core/controller/build.gradle b/core/controller/build.gradle index 18f03b7f6d4..7d5163438fc 100644 --- a/core/controller/build.gradle +++ b/core/controller/build.gradle @@ -33,6 +33,7 @@ ext.coverageDirs = [ "${buildDir}/classes/scala/scoverage", "${project(':common:scala').buildDir.absolutePath}/classes/scala/scoverage" ] +distDockerCoverage.dependsOn ':common:scala:scoverageClasses', 'scoverageClasses' dependencies { implementation "org.scala-lang:scala-library:${gradle.scala.version}" diff --git a/core/invoker/build.gradle b/core/invoker/build.gradle index 0296059139f..27da757ca56 100644 --- a/core/invoker/build.gradle +++ b/core/invoker/build.gradle @@ -32,6 +32,7 @@ ext.coverageDirs = [ "${buildDir}/classes/scala/scoverage", "${project(':common:scala').buildDir.absolutePath}/classes/scala/scoverage" ] +distDockerCoverage.dependsOn ':common:scala:scoverageClasses', 'scoverageClasses' dependencies { implementation "org.scala-lang:scala-library:${gradle.scala.version}" From 65b84bf4dae2bbd75cbaf458230bbb59dac86880 Mon Sep 17 00:00:00 2001 From: seonghyun Date: Thu, 28 Jul 2022 00:46:10 +0900 Subject: [PATCH 8/8] Add dependsOn 'compileScoverageScala' --- build.gradle | 4 ---- tests/build.gradle | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 16e529fa37c..a0a49e8a7d2 100644 --- a/build.gradle +++ b/build.gradle @@ -60,10 +60,6 @@ subprojects { mavenCentral() } - scala { - zincVersion = "1.3.0" - } - tasks.withType(ScalaCompile) { scalaCompileOptions.additionalParameters = gradle.scala.compileFlags scalaCompileOptions.forkOptions.jvmArgs = ["-Xss2m"] diff --git a/tests/build.gradle b/tests/build.gradle index e98feb0bf3a..1638117b26a 100644 --- a/tests/build.gradle +++ b/tests/build.gradle @@ -317,7 +317,9 @@ gradle.projectsEvaluated { projectsWithCoverage.forEach { dependentTasks << it + ':reportScoverage' } + dependentTasks << 'compileScoverageScala' dependsOn(dependentTasks) + //Need to recreate the logic from //https://github.com/scoverage/gradle-scoverage/blob/924bf49a8f981f119d0604b44a782f3f8eecb359/src/main/groovy/org/scoverage/ScoveragePlugin.groovy#L137 //default tasks retrigger the tests. As ours is a multi module integration