You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gobblin.apache.org by le...@apache.org on 2020/10/22 00:46:16 UTC
[incubator-gobblin] branch master updated: [GOBBLIN-1293] Upgrades
to gradle 5
This is an automated email from the ASF dual-hosted git repository.
lesun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-gobblin.git
The following commit(s) were added to refs/heads/master by this push:
new 9cbbfc1 [GOBBLIN-1293] Upgrades to gradle 5
9cbbfc1 is described below
commit 9cbbfc1354769f2937824686545a6802a8eb58a9
Author: William Lo <wl...@linkedin.com>
AuthorDate: Wed Oct 21 17:45:53 2020 -0700
[GOBBLIN-1293] Upgrades to gradle 5
Closes #3129 from Will-Lo/upgrade-to-gradle-5
---
build.gradle | 17 +-------------
gobblin-api/build.gradle | 6 ++++-
gobblin-audit/build.gradle | 5 +++++
gobblin-aws/build.gradle | 6 +++++
gobblin-binary-management/build.gradle | 5 +++++
gobblin-cluster/build.gradle | 6 +++++
gobblin-compaction/build.gradle | 5 +++++
.../gobblin-config-client/build.gradle | 5 +++++
.../gobblin-config-core/build.gradle | 5 +++++
gobblin-core-base/build.gradle | 6 +++++
gobblin-core/build.gradle | 8 ++++++-
gobblin-data-management/build.gradle | 6 ++++-
gobblin-example/build.gradle | 6 +++++
gobblin-hive-registration/build.gradle | 5 +++++
gobblin-metastore/build.gradle | 5 +++++
.../gobblin-metrics-base/build.gradle | 8 ++++++-
gobblin-metrics-libs/gobblin-metrics/build.gradle | 5 +++++
gobblin-modules/gobblin-avro-json/build.gradle | 5 +++++
gobblin-modules/gobblin-azkaban/build.gradle | 6 +++++
gobblin-modules/gobblin-codecs/build.gradle | 6 ++++-
gobblin-modules/gobblin-compliance/build.gradle | 5 +++++
gobblin-modules/gobblin-couchbase/build.gradle | 6 +++++
.../gobblin-crypto-provider/build.gradle | 6 ++++-
gobblin-modules/gobblin-crypto/build.gradle | 5 +++++
.../gobblin-elasticsearch-deps/build.gradle | 3 ++-
gobblin-modules/gobblin-elasticsearch/build.gradle | 10 +++++++--
gobblin-modules/gobblin-eventhub/build.gradle | 5 +++++
gobblin-modules/gobblin-http/build.gradle | 8 ++++++-
gobblin-modules/gobblin-kafka-08/build.gradle | 6 +++++
gobblin-modules/gobblin-kafka-09/build.gradle | 6 +++++
gobblin-modules/gobblin-kafka-common/build.gradle | 5 +++++
gobblin-modules/gobblin-metadata/build.gradle | 5 +++++
.../gobblin-metrics-graphite/build.gradle | 5 +++++
.../gobblin-metrics-hadoop/build.gradle | 5 +++++
.../gobblin-metrics-influxdb/build.gradle | 6 ++++-
gobblin-modules/gobblin-orc-dep/build.gradle | 3 ++-
gobblin-modules/gobblin-orc/build.gradle | 5 +++++
.../gobblin-parquet-common/build.gradle | 6 ++++-
gobblin-modules/gobblin-service-kafka/build.gradle | 6 ++++-
gobblin-modules/gobblin-sql/build.gradle | 5 +++++
gobblin-modules/gobblin-zuora/build.gradle | 6 +++++
gobblin-modules/google-ingestion/build.gradle | 5 +++++
gobblin-rest-service/gobblin-rest-api/build.gradle | 4 +++-
.../gobblin-rest-client/build.gradle | 6 +++++
.../gobblin-rest-server/build.gradle | 9 ++++++--
gobblin-restli/api.gradle | 5 +++++
gobblin-restli/client.gradle | 9 ++++++--
gobblin-restli/gobblin-restli-utils/build.gradle | 6 ++++-
gobblin-restli/server.gradle | 6 ++++-
gobblin-runtime-hadoop/build.gradle | 6 ++++-
gobblin-runtime/build.gradle | 8 ++++++-
gobblin-salesforce/build.gradle | 5 +++++
gobblin-service/build.gradle | 6 +++++
gobblin-test-harness/build.gradle | 5 +++++
gobblin-test-utils/build.gradle | 10 ++++++---
gobblin-tunnel/build.gradle | 5 +++++
gobblin-utility/build.gradle | 5 +++++
gobblin-yarn/build.gradle | 9 +++++++-
gradle/scripts/computeVersions.gradle | 2 +-
gradle/scripts/defaultBuildProperties.gradle | 6 +++--
gradle/scripts/idesSetup.gradle | 4 ++--
gradle/scripts/javadoc.gradle | 25 ++++++++++-----------
gradle/scripts/utilities.gradle | 26 ++++++++++++----------
gradle/wrapper/gradle-wrapper.properties | 2 +-
64 files changed, 343 insertions(+), 74 deletions(-)
diff --git a/build.gradle b/build.gradle
index 3b4b101..f8132a0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ buildscript {
classpath 'gradle.plugin.org.inferred:gradle-processors:1.1.2'
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:1.0.2'
classpath 'io.spring.gradle:dependency-management-plugin:0.6.0.RELEASE'
- classpath 'me.champeau.gradle:jmh-gradle-plugin:0.4.4'
+ classpath 'me.champeau.gradle:jmh-gradle-plugin:0.4.8'
}
repositories {
@@ -138,21 +138,6 @@ apply from: 'gradle/scripts/javaVersionCheck.gradle'
apply from: 'gradle/scripts/rat.gradle'
apply from: 'gradle/scripts/release.gradle'
-task wrapper(type: Wrapper) { gradleVersion = '2.13' }
-
-/*
- * Hack for upgrading pegasus to version 11.0.0. For some reason, the gradle-plugins in
- * that version fails to bring in "tools.jar" into the classpath. The rest.li team is actively
- * seeking for a clean fix. This part will be removed later when the fix is ready
- */
-allprojects {
- tasks.matching { it.name == 'generateRestModel' }.all {
- doFirst {
- it.codegenClasspath += files("${System.getProperty('java.home')}/../lib/tools.jar")
- }
- }
-}
-
task printVersionName {
doLast {
println project.version
diff --git a/gobblin-api/build.gradle b/gobblin-api/build.gradle
index b083bb7..5324f53 100644
--- a/gobblin-api/build.gradle
+++ b/gobblin-api/build.gradle
@@ -29,7 +29,11 @@ dependencies {
compile externalDependency.reflections
compile externalDependency.typesafeConfig
compile externalDependency.reactivex
-
+ // Modified to work with Gradle 5
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile externalDependency.testng
testCompile externalDependency.mockito
testCompile externalDependency.log4j
diff --git a/gobblin-audit/build.gradle b/gobblin-audit/build.gradle
index 6c8ba34..32a6d29 100644
--- a/gobblin-audit/build.gradle
+++ b/gobblin-audit/build.gradle
@@ -27,6 +27,11 @@ dependencies {
compile externalDependency.avro
compile externalDependency.typesafeConfig
compile externalDependency.reflections
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile externalDependency.testng
testCompile externalDependency.log4j
diff --git a/gobblin-aws/build.gradle b/gobblin-aws/build.gradle
index 0d9717e..1b194fd 100644
--- a/gobblin-aws/build.gradle
+++ b/gobblin-aws/build.gradle
@@ -63,6 +63,12 @@ dependencies {
testCompile project(path: ':gobblin-cluster', configuration: 'tests')
testCompile project(":gobblin-example")
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
+
testCompile externalDependency.testng
testCompile externalDependency.curatorFramework
testCompile externalDependency.curatorTest
diff --git a/gobblin-binary-management/build.gradle b/gobblin-binary-management/build.gradle
index 37d8592..0638a74 100644
--- a/gobblin-binary-management/build.gradle
+++ b/gobblin-binary-management/build.gradle
@@ -32,6 +32,11 @@ dependencies {
compile externalDependency.hiveExec
compile externalDependency.orcMapreduce
compile externalDependency.slf4j
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile externalDependency.hamcrest
testCompile externalDependency.testng
diff --git a/gobblin-cluster/build.gradle b/gobblin-cluster/build.gradle
index 8e92618..e6636c1 100644
--- a/gobblin-cluster/build.gradle
+++ b/gobblin-cluster/build.gradle
@@ -49,6 +49,12 @@ dependencies {
compile externalDependency.findBugsAnnotations
compile externalDependency.helix
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
+
runtimeOnly project(":gobblin-modules:gobblin-service-kafka")
testCompile project(":gobblin-example")
diff --git a/gobblin-compaction/build.gradle b/gobblin-compaction/build.gradle
index d24019f..007bf7e 100644
--- a/gobblin-compaction/build.gradle
+++ b/gobblin-compaction/build.gradle
@@ -53,6 +53,11 @@ dependencies {
runtimeOnly externalDependency.jdo2
runtimeOnly externalDependency.datanucleusCore
runtimeOnly externalDependency.datanucleusRdbms
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile externalDependency.testng
testCompile externalDependency.calciteAvatica
diff --git a/gobblin-config-management/gobblin-config-client/build.gradle b/gobblin-config-management/gobblin-config-client/build.gradle
index 45b70f0..9fbdc80 100644
--- a/gobblin-config-management/gobblin-config-client/build.gradle
+++ b/gobblin-config-management/gobblin-config-client/build.gradle
@@ -24,6 +24,11 @@ dependencies {
compile externalDependency.guava
compile externalDependency.slf4j
compile externalDependency.typesafeConfig
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile externalDependency.testng
testCompile externalDependency.mockito
diff --git a/gobblin-config-management/gobblin-config-core/build.gradle b/gobblin-config-management/gobblin-config-core/build.gradle
index 5ce82ba..c024fcb 100644
--- a/gobblin-config-management/gobblin-config-core/build.gradle
+++ b/gobblin-config-management/gobblin-config-core/build.gradle
@@ -26,6 +26,11 @@ dependencies {
compile externalDependency.commonsLang
compile externalDependency.commonsIo
compile externalDependency.reflections
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile externalDependency.mockito
testCompile externalDependency.testng
diff --git a/gobblin-core-base/build.gradle b/gobblin-core-base/build.gradle
index 4c9b667..020be33 100644
--- a/gobblin-core-base/build.gradle
+++ b/gobblin-core-base/build.gradle
@@ -35,6 +35,12 @@ dependencies {
compile externalDependency.typesafeConfig
compile externalDependency.findBugsAnnotations
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
+
testCompile externalDependency.testng
testCompile externalDependency.mockito
testCompile externalDependency.jmh
diff --git a/gobblin-core/build.gradle b/gobblin-core/build.gradle
index 8ec69c5..93641a5 100644
--- a/gobblin-core/build.gradle
+++ b/gobblin-core/build.gradle
@@ -56,8 +56,14 @@ dependencies {
compile externalDependency.oltu
compile externalDependency.opencsv
compile externalDependency.hadoopHdfs
- runtimeOnly externalDependency.protobuf
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
+
+ runtimeOnly externalDependency.protobuf
testRuntime externalDependency.hadoopAws
testCompile externalDependency.calciteCore
testCompile externalDependency.calciteAvatica
diff --git a/gobblin-data-management/build.gradle b/gobblin-data-management/build.gradle
index d7eb3fc..d211cca 100644
--- a/gobblin-data-management/build.gradle
+++ b/gobblin-data-management/build.gradle
@@ -43,7 +43,11 @@ dependencies {
compile externalDependency.findBugsAnnotations
compile externalDependency.testng
compile externalDependency.junit
-
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile project(":gobblin-test-utils")
testCompile project(path: ":gobblin-metastore", configuration: "testFixtures")
diff --git a/gobblin-example/build.gradle b/gobblin-example/build.gradle
index 01b44d0..b12bd26 100644
--- a/gobblin-example/build.gradle
+++ b/gobblin-example/build.gradle
@@ -41,6 +41,12 @@ dependencies {
compile externalDependency.commonsCli
compile externalDependency.hiveJdbc
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
+
testCompile externalDependency.testng
}
diff --git a/gobblin-hive-registration/build.gradle b/gobblin-hive-registration/build.gradle
index 47d71f0..21e9b43 100644
--- a/gobblin-hive-registration/build.gradle
+++ b/gobblin-hive-registration/build.gradle
@@ -39,6 +39,11 @@ dependencies {
compile externalDependency.commonsPool
compile externalDependency.findBugsAnnotations
compile externalDependency.avroMapredH2
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile externalDependency.testng
testCompile project(":gobblin-binary-management")
diff --git a/gobblin-metastore/build.gradle b/gobblin-metastore/build.gradle
index 2a0e85e..79064ec 100644
--- a/gobblin-metastore/build.gradle
+++ b/gobblin-metastore/build.gradle
@@ -35,6 +35,11 @@ dependencies {
compile externalDependency.flyway
compile externalDependency.commonsConfiguration
compile externalDependency.reflections
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
runtimeOnly externalDependency.mysqlConnector
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/build.gradle b/gobblin-metrics-libs/gobblin-metrics-base/build.gradle
index bae7ebe..344f300 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/build.gradle
+++ b/gobblin-metrics-libs/gobblin-metrics-base/build.gradle
@@ -16,7 +16,8 @@
*/
plugins {
- id "com.commercehub.gradle.plugin.avro-base" version "0.9.0"
+ // Bump up version to 0.9.1 in order for generateAvro task to work with Gradle 5
+ id "com.commercehub.gradle.plugin.avro-base" version "0.9.1"
}
apply plugin: 'java'
@@ -49,6 +50,11 @@ dependencies {
compile externalDependency.typesafeConfig
compile externalDependency.findBugsAnnotations
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile externalDependency.testng
testCompile externalDependency.mockito
}
diff --git a/gobblin-metrics-libs/gobblin-metrics/build.gradle b/gobblin-metrics-libs/gobblin-metrics/build.gradle
index 30279c5..3201143 100644
--- a/gobblin-metrics-libs/gobblin-metrics/build.gradle
+++ b/gobblin-metrics-libs/gobblin-metrics/build.gradle
@@ -33,6 +33,11 @@ dependencies {
compile externalDependency.typesafeConfig
compile externalDependency.findBugsAnnotations
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile externalDependency.testng
testCompile externalDependency.mockito
}
diff --git a/gobblin-modules/gobblin-avro-json/build.gradle b/gobblin-modules/gobblin-avro-json/build.gradle
index 82477cf..1946b52 100644
--- a/gobblin-modules/gobblin-avro-json/build.gradle
+++ b/gobblin-modules/gobblin-avro-json/build.gradle
@@ -29,6 +29,11 @@ dependencies {
compile externalDependency.jacksonCore
compile externalDependency.jacksonMapper
compile externalDependency.slf4j
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile project(":gobblin-test-utils")
testCompile externalDependency.testng
diff --git a/gobblin-modules/gobblin-azkaban/build.gradle b/gobblin-modules/gobblin-azkaban/build.gradle
index 5acc034..925948f 100644
--- a/gobblin-modules/gobblin-azkaban/build.gradle
+++ b/gobblin-modules/gobblin-azkaban/build.gradle
@@ -43,6 +43,12 @@ dependencies {
compile externalDependency.hadoopYarnApi
compile externalDependency.findBugsAnnotations
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
+
testCompile externalDependency.mockito
testCompile externalDependency.powermock
}
diff --git a/gobblin-modules/gobblin-codecs/build.gradle b/gobblin-modules/gobblin-codecs/build.gradle
index 4a7e5fb..4ae943d 100644
--- a/gobblin-modules/gobblin-codecs/build.gradle
+++ b/gobblin-modules/gobblin-codecs/build.gradle
@@ -19,7 +19,11 @@ apply plugin: 'java'
dependencies {
compile project(":gobblin-api")
-
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile externalDependency.testng
}
diff --git a/gobblin-modules/gobblin-compliance/build.gradle b/gobblin-modules/gobblin-compliance/build.gradle
index 706d7e0..e976a39 100644
--- a/gobblin-modules/gobblin-compliance/build.gradle
+++ b/gobblin-modules/gobblin-compliance/build.gradle
@@ -21,6 +21,11 @@ dependencies {
compile project(":gobblin-data-management")
compile externalDependency.azkaban
compile externalDependency.hiveJdbc
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
}
test {
diff --git a/gobblin-modules/gobblin-couchbase/build.gradle b/gobblin-modules/gobblin-couchbase/build.gradle
index ecea62d..0499f57 100644
--- a/gobblin-modules/gobblin-couchbase/build.gradle
+++ b/gobblin-modules/gobblin-couchbase/build.gradle
@@ -38,6 +38,12 @@ dependencies {
compile externalDependency.typesafeConfig
compile externalDependency.findBugsAnnotations
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
+
testCompile project(":gobblin-runtime")
testCompile project(":gobblin-test-utils")
testCompile externalDependency.jsonAssert
diff --git a/gobblin-modules/gobblin-crypto-provider/build.gradle b/gobblin-modules/gobblin-crypto-provider/build.gradle
index 8a6f06a..9b00e40 100644
--- a/gobblin-modules/gobblin-crypto-provider/build.gradle
+++ b/gobblin-modules/gobblin-crypto-provider/build.gradle
@@ -21,7 +21,11 @@ dependencies {
compile project(":gobblin-core-base")
compile project(":gobblin-runtime")
compile project(":gobblin-modules:gobblin-crypto")
-
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile project(":gobblin-test-utils")
testCompile externalDependency.testng
testCompile project(path: ":gobblin-modules:gobblin-crypto", configuration: "tests")
diff --git a/gobblin-modules/gobblin-crypto/build.gradle b/gobblin-modules/gobblin-crypto/build.gradle
index b868c1b..d1b07a6 100644
--- a/gobblin-modules/gobblin-crypto/build.gradle
+++ b/gobblin-modules/gobblin-crypto/build.gradle
@@ -29,6 +29,11 @@ dependencies {
compile externalDependency.bcpgJdk15on
compile externalDependency.bcprovJdk15on
compile externalDependency.slf4j
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile project(":gobblin-core-base") // for EncryptionConfigParser
testCompile project(":gobblin-test-utils")
diff --git a/gobblin-modules/gobblin-elasticsearch-deps/build.gradle b/gobblin-modules/gobblin-elasticsearch-deps/build.gradle
index cc0ae24..1f76e56 100644
--- a/gobblin-modules/gobblin-elasticsearch-deps/build.gradle
+++ b/gobblin-modules/gobblin-elasticsearch-deps/build.gradle
@@ -21,7 +21,8 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
+ // Bump up shadow version to support Gradle 5.x https://github.com/johnrengelman/shadow
+ classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
}
}
diff --git a/gobblin-modules/gobblin-elasticsearch/build.gradle b/gobblin-modules/gobblin-elasticsearch/build.gradle
index f3bc24a..ad82708 100644
--- a/gobblin-modules/gobblin-elasticsearch/build.gradle
+++ b/gobblin-modules/gobblin-elasticsearch/build.gradle
@@ -39,6 +39,12 @@ dependencies {
compile externalDependency.typesafeConfig
compile externalDependency.findBugsAnnotations
+ // Gradle 5 Compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
+
testCompile project(":gobblin-runtime")
testCompile project(":gobblin-test-utils")
testCompile externalDependency.jsonAssert
@@ -54,7 +60,7 @@ task installTestDependencies(type:Exec) {
task uninstallTestDependencies(type: Exec) {
workingDir "${project.rootDir}/gobblin-modules/gobblin-elasticsearch/"
commandLine './scripts/uninstall_test_deps.sh'
-
+
}
test.dependsOn installTestDependencies
@@ -62,7 +68,7 @@ test.finalizedBy uninstallTestDependencies
configurations {
compile {
- transitive = false
+ transitive = false
}
}
diff --git a/gobblin-modules/gobblin-eventhub/build.gradle b/gobblin-modules/gobblin-eventhub/build.gradle
index 9af1daf..1b1850b 100644
--- a/gobblin-modules/gobblin-eventhub/build.gradle
+++ b/gobblin-modules/gobblin-eventhub/build.gradle
@@ -38,6 +38,11 @@ dependencies {
compile externalDependency.findBugsAnnotations
compile externalDependency.eventhub
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile project(":gobblin-runtime")
testCompile project(":gobblin-test-utils")
diff --git a/gobblin-modules/gobblin-http/build.gradle b/gobblin-modules/gobblin-http/build.gradle
index 3e113cc..d370c07 100644
--- a/gobblin-modules/gobblin-http/build.gradle
+++ b/gobblin-modules/gobblin-http/build.gradle
@@ -16,7 +16,8 @@
*/
plugins {
- id "com.commercehub.gradle.plugin.avro-base" version "0.9.0"
+ // Bump up version to 0.9.1 in order for generateAvro task to work with Gradle 5
+ id "com.commercehub.gradle.plugin.avro-base" version "0.9.1"
}
apply plugin: 'java'
@@ -40,6 +41,11 @@ dependencies {
compile externalDependency.pegasus.d2
compile externalDependency.pegasus.restliCommon
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile externalDependency.curatorClient
testCompile externalDependency.curatorTest
diff --git a/gobblin-modules/gobblin-kafka-08/build.gradle b/gobblin-modules/gobblin-kafka-08/build.gradle
index 13b9c2e..2f5c661 100644
--- a/gobblin-modules/gobblin-kafka-08/build.gradle
+++ b/gobblin-modules/gobblin-kafka-08/build.gradle
@@ -49,6 +49,12 @@ dependencies {
compile externalDependency.typesafeConfig
compile externalDependency.findBugsAnnotations
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
+
runtimeOnly externalDependency.confluentAvroSerializer
runtimeOnly externalDependency.confluentJsonSerializer
runtimeOnly externalDependency.confluentSchemaRegistryClient
diff --git a/gobblin-modules/gobblin-kafka-09/build.gradle b/gobblin-modules/gobblin-kafka-09/build.gradle
index e13f4de..bc1b1bf 100644
--- a/gobblin-modules/gobblin-kafka-09/build.gradle
+++ b/gobblin-modules/gobblin-kafka-09/build.gradle
@@ -49,6 +49,12 @@ dependencies {
runtimeOnly externalDependency.confluentSchemaRegistryClient
runtimeOnly externalDependency.protobuf
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
+
testCompile project(":gobblin-service")
testCompile project(":gobblin-modules:gobblin-service-kafka")
testCompile project(path: ":gobblin-runtime", configuration: "tests")
diff --git a/gobblin-modules/gobblin-kafka-common/build.gradle b/gobblin-modules/gobblin-kafka-common/build.gradle
index d92774b..0c8fcec 100644
--- a/gobblin-modules/gobblin-kafka-common/build.gradle
+++ b/gobblin-modules/gobblin-kafka-common/build.gradle
@@ -41,6 +41,11 @@ dependencies {
compile externalDependency.typesafeConfig
compile externalDependency.findBugsAnnotations
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile project(":gobblin-test-utils")
testCompile externalDependency.mockito
diff --git a/gobblin-modules/gobblin-metadata/build.gradle b/gobblin-modules/gobblin-metadata/build.gradle
index e982f93..780162f 100644
--- a/gobblin-modules/gobblin-metadata/build.gradle
+++ b/gobblin-modules/gobblin-metadata/build.gradle
@@ -31,6 +31,11 @@ dependencies {
compile externalDependency.jacksonCore
compile externalDependency.jacksonMapper
compile externalDependency.slf4j
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile project(":gobblin-test-utils")
testCompile externalDependency.testng
diff --git a/gobblin-modules/gobblin-metrics-graphite/build.gradle b/gobblin-modules/gobblin-metrics-graphite/build.gradle
index e7cfc3e..d6ecde8 100644
--- a/gobblin-modules/gobblin-metrics-graphite/build.gradle
+++ b/gobblin-modules/gobblin-metrics-graphite/build.gradle
@@ -38,6 +38,11 @@ dependencies {
compile externalDependency.metricsCore
compile externalDependency.slf4j
compile externalDependency.metricsGraphite
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile externalDependency.testng
testCompile externalDependency.mockito
diff --git a/gobblin-modules/gobblin-metrics-hadoop/build.gradle b/gobblin-modules/gobblin-metrics-hadoop/build.gradle
index 71b1f7d..9ede584 100644
--- a/gobblin-modules/gobblin-metrics-hadoop/build.gradle
+++ b/gobblin-modules/gobblin-metrics-hadoop/build.gradle
@@ -37,6 +37,11 @@ dependencies {
compile externalDependency.guava
compile externalDependency.metricsCore
compile externalDependency.slf4j
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile externalDependency.testng
testCompile externalDependency.mockito
diff --git a/gobblin-modules/gobblin-metrics-influxdb/build.gradle b/gobblin-modules/gobblin-metrics-influxdb/build.gradle
index f603329..b0faf47 100644
--- a/gobblin-modules/gobblin-metrics-influxdb/build.gradle
+++ b/gobblin-modules/gobblin-metrics-influxdb/build.gradle
@@ -38,7 +38,11 @@ dependencies {
compile externalDependency.metricsCore
compile externalDependency.slf4j
compile externalDependency.influxdbJava
-
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile externalDependency.testng
testCompile externalDependency.mockito
}
diff --git a/gobblin-modules/gobblin-orc-dep/build.gradle b/gobblin-modules/gobblin-orc-dep/build.gradle
index a1647b8..d878e13 100644
--- a/gobblin-modules/gobblin-orc-dep/build.gradle
+++ b/gobblin-modules/gobblin-orc-dep/build.gradle
@@ -26,7 +26,8 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
+ // Bump up shadow version to support Gradle 5.x https://github.com/johnrengelman/shadow
+ classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
}
}
diff --git a/gobblin-modules/gobblin-orc/build.gradle b/gobblin-modules/gobblin-orc/build.gradle
index 68f7857..598d59c 100644
--- a/gobblin-modules/gobblin-orc/build.gradle
+++ b/gobblin-modules/gobblin-orc/build.gradle
@@ -28,6 +28,11 @@ dependencies {
compile externalDependency.avro
compile externalDependency.hiveStorageApi
compile externalDependency.orcCore
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile externalDependency.testng
testCompile externalDependency.mockito
diff --git a/gobblin-modules/gobblin-parquet-common/build.gradle b/gobblin-modules/gobblin-parquet-common/build.gradle
index 055eef2..77ba5ec 100644
--- a/gobblin-modules/gobblin-parquet-common/build.gradle
+++ b/gobblin-modules/gobblin-parquet-common/build.gradle
@@ -21,7 +21,11 @@ dependencies {
compile project(":gobblin-core")
compile externalDependency.gson
-
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile externalDependency.testng
testCompile externalDependency.mockito
testCompile externalDependency.mockRunnerJdbc
diff --git a/gobblin-modules/gobblin-service-kafka/build.gradle b/gobblin-modules/gobblin-service-kafka/build.gradle
index be03c5b..7ebc09b 100644
--- a/gobblin-modules/gobblin-service-kafka/build.gradle
+++ b/gobblin-modules/gobblin-service-kafka/build.gradle
@@ -23,7 +23,11 @@ dependencies {
compile externalDependency.avro
compile externalDependency.slf4j
compile externalDependency.typesafeConfig
-
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile externalDependency.testng
}
diff --git a/gobblin-modules/gobblin-sql/build.gradle b/gobblin-modules/gobblin-sql/build.gradle
index 5e33e1b..f94c435 100644
--- a/gobblin-modules/gobblin-sql/build.gradle
+++ b/gobblin-modules/gobblin-sql/build.gradle
@@ -23,6 +23,11 @@ dependencies {
compile externalDependency.calciteCore
compile externalDependency.postgresConnector
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile externalDependency.testng
testCompile externalDependency.mockito
testCompile externalDependency.mockRunnerJdbc
diff --git a/gobblin-modules/gobblin-zuora/build.gradle b/gobblin-modules/gobblin-zuora/build.gradle
index d0f1ba2..416ca2e 100644
--- a/gobblin-modules/gobblin-zuora/build.gradle
+++ b/gobblin-modules/gobblin-zuora/build.gradle
@@ -38,6 +38,12 @@ dependencies {
compile externalDependency.typesafeConfig
compile externalDependency.findBugsAnnotations
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
+
testCompile project(":gobblin-runtime")
testCompile project(":gobblin-test-utils")
testCompile externalDependency.jsonAssert
diff --git a/gobblin-modules/google-ingestion/build.gradle b/gobblin-modules/google-ingestion/build.gradle
index e17e993..660daa6 100644
--- a/gobblin-modules/google-ingestion/build.gradle
+++ b/gobblin-modules/google-ingestion/build.gradle
@@ -33,6 +33,11 @@ dependencies {
compile externalDependency.gson
compile externalDependency.slf4j
compile externalDependency.junit
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile externalDependency.mockito
testCompile externalDependency.testng
diff --git a/gobblin-rest-service/gobblin-rest-api/build.gradle b/gobblin-rest-service/gobblin-rest-api/build.gradle
index 02f26a6..bfb99b1 100644
--- a/gobblin-rest-service/gobblin-rest-api/build.gradle
+++ b/gobblin-rest-service/gobblin-rest-api/build.gradle
@@ -143,6 +143,8 @@ buildscript {
}
}
-task compileTest(dependsOn: ['compileTestGeneratedDataTemplateJava', 'compileTestJava']) << {
+task compileTest(dependsOn: ['compileTestGeneratedDataTemplateJava', 'compileTestJava']){
+ doLast {
+ }
}
diff --git a/gobblin-rest-service/gobblin-rest-client/build.gradle b/gobblin-rest-service/gobblin-rest-client/build.gradle
index aea8d95..9108e0d 100644
--- a/gobblin-rest-service/gobblin-rest-client/build.gradle
+++ b/gobblin-rest-service/gobblin-rest-client/build.gradle
@@ -24,6 +24,12 @@ dependencies {
compile externalDependency.pegasus.r2
compile externalDependency.pegasus.d2
compile externalDependency.guava
+
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
}
// Begin HACK to get around POM being depenendent on the (empty) gobblin-rest-api instead of gobblin-rest-api-rest-client
diff --git a/gobblin-rest-service/gobblin-rest-server/build.gradle b/gobblin-rest-service/gobblin-rest-server/build.gradle
index 66899d4..1c6e0c5 100644
--- a/gobblin-rest-service/gobblin-rest-server/build.gradle
+++ b/gobblin-rest-service/gobblin-rest-server/build.gradle
@@ -34,7 +34,11 @@ dependencies {
compile externalDependency.pegasus.restliNettyStandalone
compile externalDependency.guava
compile externalDependency.javaxInject
-
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile externalDependency.testng
}
@@ -69,6 +73,7 @@ test {
workingDir rootProject.rootDir
}
-task compileTest(dependsOn: ['compileTestGeneratedDataTemplateJava', 'compileTestJava']) << {
+task compileTest(dependsOn: ['compileTestGeneratedDataTemplateJava', 'compileTestJava']) {
+ doLast{}
}
diff --git a/gobblin-restli/api.gradle b/gobblin-restli/api.gradle
index d58c419..481e4f2 100644
--- a/gobblin-restli/api.gradle
+++ b/gobblin-restli/api.gradle
@@ -41,6 +41,11 @@ dependencies {
compile externalDependency.pegasus.restliClient
compile externalDependency.pegasus.restliCommon
compile externalDependency.pegasus.pegasusCommon
+ // Modified to work with Gradle 5
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
}
// Configure sources and javadoc jars for the data template library
diff --git a/gobblin-restli/client.gradle b/gobblin-restli/client.gradle
index 215c17d..7e6764a 100644
--- a/gobblin-restli/client.gradle
+++ b/gobblin-restli/client.gradle
@@ -29,7 +29,8 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.4'
+ // Bump up shadow version to support Gradle 5.x https://github.com/johnrengelman/shadow
+ classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
}
}
@@ -47,7 +48,11 @@ if (file('extraDependencies.gradle').exists()) {
dependencies {
compile project(path: apiProject.path, configuration: 'dataTemplate')
compile project(path: apiProject.path, configuration: 'restClient')
-
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile project(":gobblin-restli:gobblin-restli-utils")
testCompile externalDependency.testng
testCompile externalDependency.mockito
diff --git a/gobblin-restli/gobblin-restli-utils/build.gradle b/gobblin-restli/gobblin-restli-utils/build.gradle
index 0ccd9d9..c97e2f4 100644
--- a/gobblin-restli/gobblin-restli-utils/build.gradle
+++ b/gobblin-restli/gobblin-restli-utils/build.gradle
@@ -22,6 +22,10 @@ dependencies {
compile externalDependency.pegasus.restliCommon
compile externalDependency.pegasus.restliNettyStandalone
compile externalDependency.pegasus.restliGuiceBridge
-
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile externalDependency.testng
}
diff --git a/gobblin-restli/server.gradle b/gobblin-restli/server.gradle
index 1f3bb08..3b01ddf 100644
--- a/gobblin-restli/server.gradle
+++ b/gobblin-restli/server.gradle
@@ -49,7 +49,11 @@ dependencies {
compile externalDependency.pegasus.restliCommon
compile externalDependency.pegasus.restliNettyStandalone
compile externalDependency.pegasus.restliGuiceBridge
-
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile externalDependency.testng
}
diff --git a/gobblin-runtime-hadoop/build.gradle b/gobblin-runtime-hadoop/build.gradle
index f4c9b7d..2fa9018 100644
--- a/gobblin-runtime-hadoop/build.gradle
+++ b/gobblin-runtime-hadoop/build.gradle
@@ -25,7 +25,11 @@ dependencies {
compile externalDependency.hadoopAuth
compile externalDependency.slf4j
compile externalDependency.typesafeConfig
-
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile externalDependency.testng
testCompile externalDependency.mockito
}
diff --git a/gobblin-runtime/build.gradle b/gobblin-runtime/build.gradle
index e6d1785..dbf77af 100644
--- a/gobblin-runtime/build.gradle
+++ b/gobblin-runtime/build.gradle
@@ -15,7 +15,8 @@
* limitations under the License.
*/
plugins {
- id "com.commercehub.gradle.plugin.avro-base" version "0.9.0"
+ // Bump up version to 0.9.1 in order for generateAvro task to work with Gradle 5
+ id "com.commercehub.gradle.plugin.avro-base" version "0.9.1"
}
apply plugin: 'java'
@@ -83,6 +84,11 @@ dependencies {
compile externalDependency.hiveExec
compile externalDependency.parquet
compile externalDependency.kryo
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile project(path: ":gobblin-metastore", configuration: "testFixtures")
testCompile externalDependency.jhyde
diff --git a/gobblin-salesforce/build.gradle b/gobblin-salesforce/build.gradle
index 0e663c4..3c388db 100644
--- a/gobblin-salesforce/build.gradle
+++ b/gobblin-salesforce/build.gradle
@@ -35,6 +35,11 @@ dependencies {
compile externalDependency.httpcore
compile externalDependency.salesforceWsc
compile externalDependency.salesforcePartner
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile externalDependency.testng
}
diff --git a/gobblin-service/build.gradle b/gobblin-service/build.gradle
index d83cc57..a84268a 100644
--- a/gobblin-service/build.gradle
+++ b/gobblin-service/build.gradle
@@ -71,6 +71,12 @@ dependencies {
testCompile project(":gobblin-example")
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
+
// Required for adding Test class into classpath
testCompile project(":gobblin-runtime").sourceSets.test.output
testCompile project(path: ":gobblin-metastore", configuration: "testFixtures")
diff --git a/gobblin-test-harness/build.gradle b/gobblin-test-harness/build.gradle
index 48172d2..57ab215 100644
--- a/gobblin-test-harness/build.gradle
+++ b/gobblin-test-harness/build.gradle
@@ -29,6 +29,11 @@ dependencies {
testCompile externalDependency.jhyde
testCompile externalDependency.testng
testCompile externalDependency.twitterParquet
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
}
configurations { compile { transitive = false } }
diff --git a/gobblin-test-utils/build.gradle b/gobblin-test-utils/build.gradle
index 1346690..8e964b4 100644
--- a/gobblin-test-utils/build.gradle
+++ b/gobblin-test-utils/build.gradle
@@ -16,7 +16,8 @@
*/
plugins {
id "com.google.protobuf" version "0.8.8"
- id "com.commercehub.gradle.plugin.avro-base" version "0.9.0"
+ // Bump up version to 0.9.1 in order for generateAvro task to work with Gradle 5
+ id "com.commercehub.gradle.plugin.avro-base" version "0.9.1"
}
apply plugin: 'java'
@@ -32,8 +33,11 @@ dependencies {
compile externalDependency.typesafeConfig
compile externalDependency.findBugsAnnotations
compile externalDependency.protobuf
-
-
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
testCompile externalDependency.testng
testCompile externalDependency.mockito
}
diff --git a/gobblin-tunnel/build.gradle b/gobblin-tunnel/build.gradle
index 4577011..38ce14b 100644
--- a/gobblin-tunnel/build.gradle
+++ b/gobblin-tunnel/build.gradle
@@ -22,6 +22,11 @@ dependencies {
compile project(":gobblin-utility")
compile externalDependency.slf4j
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
runtimeOnly externalDependency.mysqlConnector
diff --git a/gobblin-utility/build.gradle b/gobblin-utility/build.gradle
index 78f87c5..cd6afb1 100644
--- a/gobblin-utility/build.gradle
+++ b/gobblin-utility/build.gradle
@@ -46,6 +46,11 @@ dependencies {
compile externalDependency.opencsv
compile externalDependency.hadoopHdfs
compile externalDependency.groovy
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
runtimeOnly externalDependency.hadoopCommon
runtimeOnly externalDependency.hadoopClientCore
diff --git a/gobblin-yarn/build.gradle b/gobblin-yarn/build.gradle
index 4215d06..7eee5ed 100644
--- a/gobblin-yarn/build.gradle
+++ b/gobblin-yarn/build.gradle
@@ -16,7 +16,8 @@
*/
plugins {
- id 'com.github.johnrengelman.shadow' version '1.2.4'
+ // Bump up shadow version to support Gradle 5.x https://github.com/johnrengelman/shadow
+ id 'com.github.johnrengelman.shadow' version '5.2.0'
}
apply plugin: 'java'
@@ -57,6 +58,12 @@ dependencies {
compile externalDependency.findBugsAnnotations
compile externalDependency.helix
+ // Gradle 5 compatibility
+ compileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
+
testCompile project(path: ':gobblin-cluster', configuration: 'tests')
testCompile project(":gobblin-example")
diff --git a/gradle/scripts/computeVersions.gradle b/gradle/scripts/computeVersions.gradle
index 10fdf25..f601d4b 100644
--- a/gradle/scripts/computeVersions.gradle
+++ b/gradle/scripts/computeVersions.gradle
@@ -41,7 +41,7 @@ if (!project.hasProperty('version') || project.version == 'unspecified') {
}
if (!project.hasProperty('pegasusVersion')) {
- project.ext.pegasusVersion = '6.0.12'
+ project.ext.pegasusVersion = '25.0.16'
}
if (project.hasProperty('jdkVersion')) {
diff --git a/gradle/scripts/defaultBuildProperties.gradle b/gradle/scripts/defaultBuildProperties.gradle
index f12a1f4..8b1ae17 100644
--- a/gradle/scripts/defaultBuildProperties.gradle
+++ b/gradle/scripts/defaultBuildProperties.gradle
@@ -40,8 +40,10 @@ def BuildProperties BUILD_PROPERTIES = new BuildProperties(project)
.register(new BuildProperty("publishToNexus", false, "Enable publishing of artifacts to Nexus"))
.register(new BuildProperty("salesforceVersion", "42.0.0", "Salesforce dependencies version"))
-task buildProperties(description: 'Lists main properties that can be used to customize the build') << {
- BUILD_PROPERTIES.printHelp();
+task buildProperties(description: 'Lists main properties that can be used to customize the build') {
+ doLast {
+ BUILD_PROPERTIES.printHelp();
+ }
}
// Gobblin build customization
diff --git a/gradle/scripts/idesSetup.gradle b/gradle/scripts/idesSetup.gradle
index fb4928a..b207dcb 100644
--- a/gradle/scripts/idesSetup.gradle
+++ b/gradle/scripts/idesSetup.gradle
@@ -30,8 +30,8 @@ subprojects {
// and "out/test/$MODULE_NAME". Changing it so IDEA and gradle share
// the class output directory.
- outputDir = sourceSets.main.output.classesDir
- testOutputDir = sourceSets.test.output.classesDir
+ outputDir = file(sourceSets.main.output.classesDirs.getSingleFile())
+ testOutputDir = file(sourceSets.test.output.classesDirs.getSingleFile())
}
}
diff --git a/gradle/scripts/javadoc.gradle b/gradle/scripts/javadoc.gradle
index 4efceef..a2be552 100644
--- a/gradle/scripts/javadoc.gradle
+++ b/gradle/scripts/javadoc.gradle
@@ -21,20 +21,19 @@ task javadocTarball(type: Tar) {
compression = Compression.GZIP
extension = 'tgz'
description = "Generates a tar-ball with all javadocs to ${destinationDir}/${archiveName}"
-}
-
-javadocTarball << {
- def indexFile = new File(destinationDir, "index.md")
- def version = rootProject.ext.javadocVersion
- indexFile << """----
-layout: page
-title: Gobblin Javadoc packages ${version}
-permalink: /javadoc/${version}/
-----
+ doLast {
+ def indexFile = new File(destinationDir, "index.md")
+ def version = rootProject.ext.javadocVersion
+ indexFile << """----
+ layout: page
+ title: Gobblin Javadoc packages ${version}
+ permalink: /javadoc/${version}/
+ ----
-"""
- rootProject.ext.javadocPackages.each {
- indexFile << "* [${it}](${it})\n"
+ """
+ rootProject.ext.javadocPackages.each {
+ indexFile << "* [${it}](${it})\n"
+ }
}
}
diff --git a/gradle/scripts/utilities.gradle b/gradle/scripts/utilities.gradle
index a1034a5..5ba068b 100644
--- a/gradle/scripts/utilities.gradle
+++ b/gradle/scripts/utilities.gradle
@@ -26,20 +26,22 @@ def getAllDependentProjectsImpl(project) {
ext.getAllDependentProjects = {getAllDependentProjectsImpl(it)}
-task dotProjectDependencies(description: 'List of gobblin project dependencies in dot format') << {
- println "// ========= Start of project dependency graph ======= "
- println "digraph project_dependencies {"
- subprojects.each { Project project ->
- def project_node_name = project.name.replaceAll("-","_")
- if (project.configurations.findByName("compile") != null) {
- project.configurations.compile.dependencies.each { Dependency dep ->
- if (dep instanceof ProjectDependency) {
- def dep_node_name = dep.dependencyProject.name.replaceAll("-","_")
- println "\t${project_node_name} -> ${dep_node_name};"
+task dotProjectDependencies(description: 'List of gobblin project dependencies in dot format') {
+ doLast {
+ println "// ========= Start of project dependency graph ======= "
+ println "digraph project_dependencies {"
+ subprojects.each { Project project ->
+ def project_node_name = project.name.replaceAll("-", "_")
+ if (project.configurations.findByName("compile") != null) {
+ project.configurations.compile.dependencies.each { Dependency dep ->
+ if (dep instanceof ProjectDependency) {
+ def dep_node_name = dep.dependencyProject.name.replaceAll("-", "_")
+ println "\t${project_node_name} -> ${dep_node_name};"
+ }
}
}
}
+ println "}"
+ println "// ========= End of project dependency graph ======= "
}
- println "}"
- println "// ========= End of project dependency graph ======= "
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d1ff792..46fe8d2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-bin.zip