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 651b64f [GOBBLIN-1293] Revert " Upgrades to gradle 5"
651b64f is described below
commit 651b64f354575f322c1eeea82d5317ed8d8fc02f
Author: William Lo <[email protected]>
AuthorDate: Fri Oct 23 09:58:50 2020 -0700
[GOBBLIN-1293] Revert " Upgrades to gradle 5"
This reverts commit
9cbbfc1354769f2937824686545a6802a8eb58a9.
Closes #3137 from Will-Lo/revert-gradle-5-upgrade-
due-to-bintray-publish
---
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, 74 insertions(+), 343 deletions(-)
diff --git a/build.gradle b/build.gradle
index f8132a0..3b4b101 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.8'
+ classpath 'me.champeau.gradle:jmh-gradle-plugin:0.4.4'
}
repositories {
@@ -138,6 +138,21 @@ 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 5324f53..b083bb7 100644
--- a/gobblin-api/build.gradle
+++ b/gobblin-api/build.gradle
@@ -29,11 +29,7 @@ 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 32a6d29..6c8ba34 100644
--- a/gobblin-audit/build.gradle
+++ b/gobblin-audit/build.gradle
@@ -27,11 +27,6 @@ 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 1b194fd..0d9717e 100644
--- a/gobblin-aws/build.gradle
+++ b/gobblin-aws/build.gradle
@@ -63,12 +63,6 @@ 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 0638a74..37d8592 100644
--- a/gobblin-binary-management/build.gradle
+++ b/gobblin-binary-management/build.gradle
@@ -32,11 +32,6 @@ 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 e6636c1..8e92618 100644
--- a/gobblin-cluster/build.gradle
+++ b/gobblin-cluster/build.gradle
@@ -49,12 +49,6 @@ 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 007bf7e..d24019f 100644
--- a/gobblin-compaction/build.gradle
+++ b/gobblin-compaction/build.gradle
@@ -53,11 +53,6 @@ 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 9fbdc80..45b70f0 100644
--- a/gobblin-config-management/gobblin-config-client/build.gradle
+++ b/gobblin-config-management/gobblin-config-client/build.gradle
@@ -24,11 +24,6 @@ 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 c024fcb..5ce82ba 100644
--- a/gobblin-config-management/gobblin-config-core/build.gradle
+++ b/gobblin-config-management/gobblin-config-core/build.gradle
@@ -26,11 +26,6 @@ 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 020be33..4c9b667 100644
--- a/gobblin-core-base/build.gradle
+++ b/gobblin-core-base/build.gradle
@@ -35,12 +35,6 @@ 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 93641a5..8ec69c5 100644
--- a/gobblin-core/build.gradle
+++ b/gobblin-core/build.gradle
@@ -56,14 +56,8 @@ dependencies {
compile externalDependency.oltu
compile externalDependency.opencsv
compile externalDependency.hadoopHdfs
-
- // 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 d211cca..d7eb3fc 100644
--- a/gobblin-data-management/build.gradle
+++ b/gobblin-data-management/build.gradle
@@ -43,11 +43,7 @@ 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 b12bd26..01b44d0 100644
--- a/gobblin-example/build.gradle
+++ b/gobblin-example/build.gradle
@@ -41,12 +41,6 @@ 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 21e9b43..47d71f0 100644
--- a/gobblin-hive-registration/build.gradle
+++ b/gobblin-hive-registration/build.gradle
@@ -39,11 +39,6 @@ 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 79064ec..2a0e85e 100644
--- a/gobblin-metastore/build.gradle
+++ b/gobblin-metastore/build.gradle
@@ -35,11 +35,6 @@ 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 344f300..bae7ebe 100644
--- a/gobblin-metrics-libs/gobblin-metrics-base/build.gradle
+++ b/gobblin-metrics-libs/gobblin-metrics-base/build.gradle
@@ -16,8 +16,7 @@
*/
plugins {
- // 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"
+ id "com.commercehub.gradle.plugin.avro-base" version "0.9.0"
}
apply plugin: 'java'
@@ -50,11 +49,6 @@ 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 3201143..30279c5 100644
--- a/gobblin-metrics-libs/gobblin-metrics/build.gradle
+++ b/gobblin-metrics-libs/gobblin-metrics/build.gradle
@@ -33,11 +33,6 @@ 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 1946b52..82477cf 100644
--- a/gobblin-modules/gobblin-avro-json/build.gradle
+++ b/gobblin-modules/gobblin-avro-json/build.gradle
@@ -29,11 +29,6 @@ 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 925948f..5acc034 100644
--- a/gobblin-modules/gobblin-azkaban/build.gradle
+++ b/gobblin-modules/gobblin-azkaban/build.gradle
@@ -43,12 +43,6 @@ 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 4ae943d..4a7e5fb 100644
--- a/gobblin-modules/gobblin-codecs/build.gradle
+++ b/gobblin-modules/gobblin-codecs/build.gradle
@@ -19,11 +19,7 @@ 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 e976a39..706d7e0 100644
--- a/gobblin-modules/gobblin-compliance/build.gradle
+++ b/gobblin-modules/gobblin-compliance/build.gradle
@@ -21,11 +21,6 @@ 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 0499f57..ecea62d 100644
--- a/gobblin-modules/gobblin-couchbase/build.gradle
+++ b/gobblin-modules/gobblin-couchbase/build.gradle
@@ -38,12 +38,6 @@ 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 9b00e40..8a6f06a 100644
--- a/gobblin-modules/gobblin-crypto-provider/build.gradle
+++ b/gobblin-modules/gobblin-crypto-provider/build.gradle
@@ -21,11 +21,7 @@ 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 d1b07a6..b868c1b 100644
--- a/gobblin-modules/gobblin-crypto/build.gradle
+++ b/gobblin-modules/gobblin-crypto/build.gradle
@@ -29,11 +29,6 @@ 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 1f76e56..cc0ae24 100644
--- a/gobblin-modules/gobblin-elasticsearch-deps/build.gradle
+++ b/gobblin-modules/gobblin-elasticsearch-deps/build.gradle
@@ -21,8 +21,7 @@ buildscript {
jcenter()
}
dependencies {
- // Bump up shadow version to support Gradle 5.x
https://github.com/johnrengelman/shadow
- classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
+ classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
}
}
diff --git a/gobblin-modules/gobblin-elasticsearch/build.gradle
b/gobblin-modules/gobblin-elasticsearch/build.gradle
index ad82708..f3bc24a 100644
--- a/gobblin-modules/gobblin-elasticsearch/build.gradle
+++ b/gobblin-modules/gobblin-elasticsearch/build.gradle
@@ -39,12 +39,6 @@ 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
@@ -60,7 +54,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
@@ -68,7 +62,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 1b1850b..9af1daf 100644
--- a/gobblin-modules/gobblin-eventhub/build.gradle
+++ b/gobblin-modules/gobblin-eventhub/build.gradle
@@ -38,11 +38,6 @@ 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 d370c07..3e113cc 100644
--- a/gobblin-modules/gobblin-http/build.gradle
+++ b/gobblin-modules/gobblin-http/build.gradle
@@ -16,8 +16,7 @@
*/
plugins {
- // 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"
+ id "com.commercehub.gradle.plugin.avro-base" version "0.9.0"
}
apply plugin: 'java'
@@ -41,11 +40,6 @@ 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 2f5c661..13b9c2e 100644
--- a/gobblin-modules/gobblin-kafka-08/build.gradle
+++ b/gobblin-modules/gobblin-kafka-08/build.gradle
@@ -49,12 +49,6 @@ 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 bc1b1bf..e13f4de 100644
--- a/gobblin-modules/gobblin-kafka-09/build.gradle
+++ b/gobblin-modules/gobblin-kafka-09/build.gradle
@@ -49,12 +49,6 @@ 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 0c8fcec..d92774b 100644
--- a/gobblin-modules/gobblin-kafka-common/build.gradle
+++ b/gobblin-modules/gobblin-kafka-common/build.gradle
@@ -41,11 +41,6 @@ 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 780162f..e982f93 100644
--- a/gobblin-modules/gobblin-metadata/build.gradle
+++ b/gobblin-modules/gobblin-metadata/build.gradle
@@ -31,11 +31,6 @@ 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 d6ecde8..e7cfc3e 100644
--- a/gobblin-modules/gobblin-metrics-graphite/build.gradle
+++ b/gobblin-modules/gobblin-metrics-graphite/build.gradle
@@ -38,11 +38,6 @@ 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 9ede584..71b1f7d 100644
--- a/gobblin-modules/gobblin-metrics-hadoop/build.gradle
+++ b/gobblin-modules/gobblin-metrics-hadoop/build.gradle
@@ -37,11 +37,6 @@ 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 b0faf47..f603329 100644
--- a/gobblin-modules/gobblin-metrics-influxdb/build.gradle
+++ b/gobblin-modules/gobblin-metrics-influxdb/build.gradle
@@ -38,11 +38,7 @@ 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 d878e13..a1647b8 100644
--- a/gobblin-modules/gobblin-orc-dep/build.gradle
+++ b/gobblin-modules/gobblin-orc-dep/build.gradle
@@ -26,8 +26,7 @@ buildscript {
jcenter()
}
dependencies {
- // Bump up shadow version to support Gradle 5.x
https://github.com/johnrengelman/shadow
- classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
+ classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
}
}
diff --git a/gobblin-modules/gobblin-orc/build.gradle
b/gobblin-modules/gobblin-orc/build.gradle
index 598d59c..68f7857 100644
--- a/gobblin-modules/gobblin-orc/build.gradle
+++ b/gobblin-modules/gobblin-orc/build.gradle
@@ -28,11 +28,6 @@ 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 77ba5ec..055eef2 100644
--- a/gobblin-modules/gobblin-parquet-common/build.gradle
+++ b/gobblin-modules/gobblin-parquet-common/build.gradle
@@ -21,11 +21,7 @@ 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 7ebc09b..be03c5b 100644
--- a/gobblin-modules/gobblin-service-kafka/build.gradle
+++ b/gobblin-modules/gobblin-service-kafka/build.gradle
@@ -23,11 +23,7 @@ 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 f94c435..5e33e1b 100644
--- a/gobblin-modules/gobblin-sql/build.gradle
+++ b/gobblin-modules/gobblin-sql/build.gradle
@@ -23,11 +23,6 @@ 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 416ca2e..d0f1ba2 100644
--- a/gobblin-modules/gobblin-zuora/build.gradle
+++ b/gobblin-modules/gobblin-zuora/build.gradle
@@ -38,12 +38,6 @@ 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 660daa6..e17e993 100644
--- a/gobblin-modules/google-ingestion/build.gradle
+++ b/gobblin-modules/google-ingestion/build.gradle
@@ -33,11 +33,6 @@ 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 bfb99b1..02f26a6 100644
--- a/gobblin-rest-service/gobblin-rest-api/build.gradle
+++ b/gobblin-rest-service/gobblin-rest-api/build.gradle
@@ -143,8 +143,6 @@ buildscript {
}
}
-task compileTest(dependsOn: ['compileTestGeneratedDataTemplateJava',
'compileTestJava']){
- doLast {
- }
+task compileTest(dependsOn: ['compileTestGeneratedDataTemplateJava',
'compileTestJava']) << {
}
diff --git a/gobblin-rest-service/gobblin-rest-client/build.gradle
b/gobblin-rest-service/gobblin-rest-client/build.gradle
index 9108e0d..aea8d95 100644
--- a/gobblin-rest-service/gobblin-rest-client/build.gradle
+++ b/gobblin-rest-service/gobblin-rest-client/build.gradle
@@ -24,12 +24,6 @@ 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 1c6e0c5..66899d4 100644
--- a/gobblin-rest-service/gobblin-rest-server/build.gradle
+++ b/gobblin-rest-service/gobblin-rest-server/build.gradle
@@ -34,11 +34,7 @@ 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
}
@@ -73,7 +69,6 @@ test {
workingDir rootProject.rootDir
}
-task compileTest(dependsOn: ['compileTestGeneratedDataTemplateJava',
'compileTestJava']) {
- doLast{}
+task compileTest(dependsOn: ['compileTestGeneratedDataTemplateJava',
'compileTestJava']) << {
}
diff --git a/gobblin-restli/api.gradle b/gobblin-restli/api.gradle
index 481e4f2..d58c419 100644
--- a/gobblin-restli/api.gradle
+++ b/gobblin-restli/api.gradle
@@ -41,11 +41,6 @@ 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 7e6764a..215c17d 100644
--- a/gobblin-restli/client.gradle
+++ b/gobblin-restli/client.gradle
@@ -29,8 +29,7 @@ buildscript {
jcenter()
}
dependencies {
- // Bump up shadow version to support Gradle 5.x
https://github.com/johnrengelman/shadow
- classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
+ classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.4'
}
}
@@ -48,11 +47,7 @@ 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 c97e2f4..0ccd9d9 100644
--- a/gobblin-restli/gobblin-restli-utils/build.gradle
+++ b/gobblin-restli/gobblin-restli-utils/build.gradle
@@ -22,10 +22,6 @@ 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 3b01ddf..1f3bb08 100644
--- a/gobblin-restli/server.gradle
+++ b/gobblin-restli/server.gradle
@@ -49,11 +49,7 @@ 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 2fa9018..f4c9b7d 100644
--- a/gobblin-runtime-hadoop/build.gradle
+++ b/gobblin-runtime-hadoop/build.gradle
@@ -25,11 +25,7 @@ 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 dbf77af..e6d1785 100644
--- a/gobblin-runtime/build.gradle
+++ b/gobblin-runtime/build.gradle
@@ -15,8 +15,7 @@
* limitations under the License.
*/
plugins {
- // 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"
+ id "com.commercehub.gradle.plugin.avro-base" version "0.9.0"
}
apply plugin: 'java'
@@ -84,11 +83,6 @@ 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 3c388db..0e663c4 100644
--- a/gobblin-salesforce/build.gradle
+++ b/gobblin-salesforce/build.gradle
@@ -35,11 +35,6 @@ 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 a84268a..d83cc57 100644
--- a/gobblin-service/build.gradle
+++ b/gobblin-service/build.gradle
@@ -71,12 +71,6 @@ 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 57ab215..48172d2 100644
--- a/gobblin-test-harness/build.gradle
+++ b/gobblin-test-harness/build.gradle
@@ -29,11 +29,6 @@ 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 8e964b4..1346690 100644
--- a/gobblin-test-utils/build.gradle
+++ b/gobblin-test-utils/build.gradle
@@ -16,8 +16,7 @@
*/
plugins {
id "com.google.protobuf" version "0.8.8"
- // 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"
+ id "com.commercehub.gradle.plugin.avro-base" version "0.9.0"
}
apply plugin: 'java'
@@ -33,11 +32,8 @@ 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 38ce14b..4577011 100644
--- a/gobblin-tunnel/build.gradle
+++ b/gobblin-tunnel/build.gradle
@@ -22,11 +22,6 @@ 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 cd6afb1..78f87c5 100644
--- a/gobblin-utility/build.gradle
+++ b/gobblin-utility/build.gradle
@@ -46,11 +46,6 @@ 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 7eee5ed..4215d06 100644
--- a/gobblin-yarn/build.gradle
+++ b/gobblin-yarn/build.gradle
@@ -16,8 +16,7 @@
*/
plugins {
- // Bump up shadow version to support Gradle 5.x
https://github.com/johnrengelman/shadow
- id 'com.github.johnrengelman.shadow' version '5.2.0'
+ id 'com.github.johnrengelman.shadow' version '1.2.4'
}
apply plugin: 'java'
@@ -58,12 +57,6 @@ 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 f601d4b..10fdf25 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 = '25.0.16'
+ project.ext.pegasusVersion = '6.0.12'
}
if (project.hasProperty('jdkVersion')) {
diff --git a/gradle/scripts/defaultBuildProperties.gradle
b/gradle/scripts/defaultBuildProperties.gradle
index 8b1ae17..f12a1f4 100644
--- a/gradle/scripts/defaultBuildProperties.gradle
+++ b/gradle/scripts/defaultBuildProperties.gradle
@@ -40,10 +40,8 @@ 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') {
- doLast {
- BUILD_PROPERTIES.printHelp();
- }
+task buildProperties(description: 'Lists main properties that can be used to
customize the build') << {
+ BUILD_PROPERTIES.printHelp();
}
// Gobblin build customization
diff --git a/gradle/scripts/idesSetup.gradle b/gradle/scripts/idesSetup.gradle
index b207dcb..fb4928a 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 = file(sourceSets.main.output.classesDirs.getSingleFile())
- testOutputDir = file(sourceSets.test.output.classesDirs.getSingleFile())
+ outputDir = sourceSets.main.output.classesDir
+ testOutputDir = sourceSets.test.output.classesDir
}
}
diff --git a/gradle/scripts/javadoc.gradle b/gradle/scripts/javadoc.gradle
index a2be552..4efceef 100644
--- a/gradle/scripts/javadoc.gradle
+++ b/gradle/scripts/javadoc.gradle
@@ -21,19 +21,20 @@ task javadocTarball(type: Tar) {
compression = Compression.GZIP
extension = 'tgz'
description = "Generates a tar-ball with all javadocs to
${destinationDir}/${archiveName}"
- 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"
- }
+javadocTarball << {
+ 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"
}
}
diff --git a/gradle/scripts/utilities.gradle b/gradle/scripts/utilities.gradle
index 5ba068b..a1034a5 100644
--- a/gradle/scripts/utilities.gradle
+++ b/gradle/scripts/utilities.gradle
@@ -26,22 +26,20 @@ def getAllDependentProjectsImpl(project) {
ext.getAllDependentProjects = {getAllDependentProjectsImpl(it)}
-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};"
- }
+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};"
}
}
}
- 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 46fe8d2..d1ff792 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-5.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
