This is an automated email from the ASF dual-hosted git repository.
seonghyun 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 f29981a2f Bumping to gradle 6 (#5276)
f29981a2f is described below
commit f29981a2f9961765067340f5ce15a6a616ef9b31
Author: Seonghyun Oh <seonghyu...@gmail.com>
AuthorDate: Fri Jul 29 01:01:59 2022 +0900
Bumping to gradle 6 (#5276)
* Use implementation instead of compile
* Fix com.lihaoyi:fastparse dependency version conflicts
* Bump to gradle 6.9.1
* Bump to scoverage 7.0.0
* Add dependsOn 'compileScoverageScala'
---
build.gradle | 10 +--
common/scala/build.gradle | 98 ++++++++++-----------
core/controller/build.gradle | 14 +--
.../openwhisk/core/loadBalancer/LeanBalancer.scala | 1 -
core/cosmosdb/cache-invalidator/build.gradle | 8 +-
core/invoker/build.gradle | 10 +--
core/monitoring/user-events/build.gradle | 24 ++---
core/scheduler/build.gradle | 12 ++-
core/standalone/build.gradle | 24 ++---
gradle/wrapper/gradle-wrapper.jar | Bin 55616 -> 59203 bytes
gradle/wrapper/gradle-wrapper.properties | 2 +-
gradlew | 39 ++++----
gradlew.bat | 29 ++----
settings.gradle | 12 +++
tests/build.gradle | 68 +++++++-------
tests/dat/actions/src/java/sleep/build.gradle | 2 +-
tools/admin/build.gradle | 6 +-
tools/dev/build.gradle | 6 +-
tools/travis/distDocker.sh | 1 +
19 files changed, 181 insertions(+), 185 deletions(-)
diff --git a/build.gradle b/build.gradle
index 522862591..a0a49e8a7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,15 +25,7 @@ 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)
+ id "org.scoverage" version "7.0.0" apply false
}
subprojects {
diff --git a/common/scala/build.gradle b/common/scala/build.gradle
index ccdfc8a56..ba1100099 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,79 @@ 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.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}"
+ 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 b0864542b..7d5163438 100644
--- a/core/controller/build.gradle
+++ b/core/controller/build.gradle
@@ -36,12 +36,14 @@ ext.coverageDirs = [
distDockerCoverage.dependsOn ':common:scala:scoverageClasses',
'scoverageClasses'
dependencies {
- compile "org.scala-lang:scala-library:${gradle.scala.version}"
- 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')
+ implementation "org.scala-lang:scala-library:${gradle.scala.version}"
+ implementation project(':common:scala')
+ implementation project(':core:invoker')
+ implementation project(':core:scheduler')
+
+ 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/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 dac40c2ff..4016d0c55 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/cosmosdb/cache-invalidator/build.gradle
b/core/cosmosdb/cache-invalidator/build.gradle
index 33d61e19c..aeb4a7947 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 06560f0ba..27da757ca 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 a458c8eb4..f5a4ae130 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 2ed6a19e0..02c4d2be2 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 {
@@ -44,7 +43,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'
}
}
@@ -55,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}"
@@ -63,10 +62,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 a1f0a45ce..ef4baae8d 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/gradle/wrapper/gradle-wrapper.jar
b/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf01..e708b1c02 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and
b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties
b/gradle/wrapper/gradle-wrapper.properties
index 643b8fac6..c441f287c 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-5.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 08282de82..4f906e0c8 100755
--- a/gradlew
+++ b/gradlew
@@ -7,7 +7,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
@@ -44,7 +44,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to
pass JVM options to this script.
-DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
@@ -82,6 +82,7 @@ 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
@@ -125,10 +126,11 @@ if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\"
\"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+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
@@ -154,19 +156,19 @@ if $cygwin ; then
else
eval `echo args$i`="\"$arg\""
fi
- i=$((i+1))
+ i=`expr $i + 1`
done
case $i in
- (0) set -- ;;
- (1) set -- "$args0" ;;
- (2) set -- "$args0" "$args1" ;;
- (3) set -- "$args0" "$args1" "$args2" ;;
- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5"
"$args6" ;;
- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5"
"$args6" "$args7" ;;
- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5"
"$args6" "$args7" "$args8" ;;
+ 0) set -- ;;
+ 1) set -- "$args0" ;;
+ 2) set -- "$args0" "$args1" ;;
+ 3) set -- "$args0" "$args1" "$args2" ;;
+ 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5"
"$args6" ;;
+ 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5"
"$args6" "$args7" ;;
+ 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5"
"$args6" "$args7" "$args8" ;;
esac
fi
@@ -175,14 +177,9 @@ save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ;
done
echo " "
}
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and
substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
"\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\""
org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-# by default we should be in the correct project dir, but when run from Finder
on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
- cd "$(dirname "$0")"
-fi
-
exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index b1d7f4e0b..107acd32c 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -5,7 +5,7 @@
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
-@rem http://www.apache.org/licenses/LICENSE-2.0
+@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@@ -29,15 +29,18 @@ 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=-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 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
diff --git a/settings.gradle b/settings.gradle
index 430b2b9b5..4326e8574 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -15,6 +15,18 @@
* limitations under the License.
*/
+plugins {
+ id "com.gradle.enterprise" version "3.10.2"
+}
+
+gradleEnterprise {
+ buildScan {
+ termsOfServiceUrl = 'https://gradle.com/terms-of-service'
+ termsOfServiceAgree = 'yes'
+ publishAlwaysIf(System.getenv('CI') != null)
+ }
+}
+
include 'common:scala'
include 'core:controller'
diff --git a/tests/build.gradle b/tests/build.gradle
index 1111f30a9..3c4393257 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -210,38 +210,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'
}
@@ -317,7 +319,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
diff --git a/tests/dat/actions/src/java/sleep/build.gradle
b/tests/dat/actions/src/java/sleep/build.gradle
index c6df5f6e9..7c718ff90 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 0ce02f882..0d2e3a0cc 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 e3b82c84a..94722d2e5 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) {
diff --git a/tools/travis/distDocker.sh b/tools/travis/distDocker.sh
index a6022fd45..a859beca2 100755
--- a/tools/travis/distDocker.sh
+++ b/tools/travis/distDocker.sh
@@ -25,6 +25,7 @@ SCRIPTDIR=$(cd $(dirname "$0") && pwd)
ROOTDIR="$SCRIPTDIR/../.."
cd $ROOTDIR
+TERM=dumb ./gradlew clean # Run a clean step before build
TERM=dumb ./gradlew distDocker -PdockerImagePrefix=testing $GRADLE_PROJS_SKIP
TERM=dumb ./gradlew :core:controller:distDockerCoverage
-PdockerImagePrefix=testing
