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 0aad6d4 [GOBBLIN-1293] Upgrades to Gradle 5.6.4
0aad6d4 is described below
commit 0aad6d42b68caffadd0981559131d5eb8acae814
Author: William Lo <[email protected]>
AuthorDate: Thu Dec 3 23:33:04 2020 -0800
[GOBBLIN-1293] Upgrades to Gradle 5.6.4
Closes #3159 from Will-Lo/upgrade-to-gradle-5
---
README.md | 15 +------------
build.gradle | 11 ++++-----
.../gobblin-metrics-base/build.gradle | 3 ++-
.../gobblin-elasticsearch-deps/build.gradle | 3 ++-
gobblin-modules/gobblin-http/build.gradle | 3 ++-
gobblin-modules/gobblin-orc-dep/build.gradle | 3 ++-
gobblin-rest-service/gobblin-rest-api/build.gradle | 4 +++-
.../gobblin-rest-server/build.gradle | 3 ++-
gobblin-restli/client.gradle | 3 ++-
gobblin-runtime/build.gradle | 3 ++-
gobblin-test-utils/build.gradle | 3 ++-
gobblin-yarn/build.gradle | 3 ++-
gradle/scripts/defaultBuildProperties.gradle | 6 +++--
gradle/scripts/globalDependencies.gradle | 5 ++++-
gradle/scripts/idesSetup.gradle | 4 ++--
gradle/scripts/javadoc.gradle | 25 ++++++++++-----------
gradle/scripts/utilities.gradle | 26 ++++++++++++----------
gradle/wrapper/gradle-wrapper.properties | 2 +-
18 files changed, 63 insertions(+), 62 deletions(-)
diff --git a/README.md b/README.md
index 4535193..9291e72 100644
--- a/README.md
+++ b/README.md
@@ -13,24 +13,11 @@ Apache Gobblin handles the common routine tasks required
for all data ingestion
Gobblin ingests data from different data sources in the same execution
framework, and manages metadata of different sources all in one place. This,
combined with other features such as auto scalability, fault tolerance, data
quality assurance, extensibility, and the ability of handling data model
evolution, makes Gobblin an easy-to-use, self-serving, and efficient data
ingestion framework.
# Requirements
-* Java >= 1.8
-* gradle-wrapper.jar version 2.13
+* Java >= 1.8
If building the distribution with tests turned on:
* Maven version 3.5.3
-# Instructions to download gradle wrapper
-Run the following command for downloading the gradle-wrapper.jar from Gobblin
git repository to gradle/wrapper directory.
-
-wget --no-check-certificate -P gradle/wrapper
https://github.com/apache/incubator-gobblin/raw/0.12.0/gradle/wrapper/gradle-wrapper.jar
-(or)
-curl --insecure -L
https://github.com/apache/incubator-gobblin/raw/0.12.0/gradle/wrapper/gradle-wrapper.jar
> gradle/wrapper/gradle-wrapper.jar
-
-Alternatively, you can download it manually from:
-https://github.com/apache/incubator-gobblin/blob/0.12.0/gradle/wrapper/gradle-wrapper.jar
-
-Make sure that you download it to gradle/wrapper directory.
-
# Instructions to run Apache RAT (Release Audit Tool)
1. Extract the archive file to your local directory.
2. Download gradle-wrapper.jar (version 2.13) and place it in the
gradle/wrapper folder. See 'Instructions to download gradle wrapper' above.
diff --git a/build.gradle b/build.gradle
index 3b4b101..7b0679c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,9 @@ 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'
+ classpath
"gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:0.14.0"
+ classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.+'
}
repositories {
@@ -40,10 +42,7 @@ buildscript {
url "https://plugins.gradle.org/m2/";
}
}
- dependencies {
- classpath
"gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:0.14.0"
- classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.+'
- }
+
}
apply plugin: "com.github.hierynomus.license"
@@ -138,8 +137,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
diff --git a/gobblin-metrics-libs/gobblin-metrics-base/build.gradle
b/gobblin-metrics-libs/gobblin-metrics-base/build.gradle
index bae7ebe..688972f 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'
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-http/build.gradle
b/gobblin-modules/gobblin-http/build.gradle
index 3e113cc..b183fdf 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'
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-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-server/build.gradle
b/gobblin-rest-service/gobblin-rest-server/build.gradle
index 66899d4..0dc2b35 100644
--- a/gobblin-rest-service/gobblin-rest-server/build.gradle
+++ b/gobblin-rest-service/gobblin-rest-server/build.gradle
@@ -69,6 +69,7 @@ test {
workingDir rootProject.rootDir
}
-task compileTest(dependsOn: ['compileTestGeneratedDataTemplateJava',
'compileTestJava']) << {
+task compileTest(dependsOn: ['compileTestGeneratedDataTemplateJava',
'compileTestJava']) {
+ doLast{}
}
diff --git a/gobblin-restli/client.gradle b/gobblin-restli/client.gradle
index ca13aeb..e76120a 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'
}
}
diff --git a/gobblin-runtime/build.gradle b/gobblin-runtime/build.gradle
index 13c883e..2ca134a 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'
diff --git a/gobblin-test-utils/build.gradle b/gobblin-test-utils/build.gradle
index 1346690..7239e45 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'
diff --git a/gobblin-yarn/build.gradle b/gobblin-yarn/build.gradle
index 4215d06..290dab3 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'
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/globalDependencies.gradle
b/gradle/scripts/globalDependencies.gradle
index e4e1bce..0084f1c 100644
--- a/gradle/scripts/globalDependencies.gradle
+++ b/gradle/scripts/globalDependencies.gradle
@@ -69,7 +69,10 @@ subprojects {
}
dependencies {
+ // Gradle 5 compatibility
compileOnly externalDependency.lombok
- testCompile externalDependency.lombok
+ testCompileOnly externalDependency.lombok
+ annotationProcessor externalDependency.lombok
+ testAnnotationProcessor externalDependency.lombok
}
}
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..256d9e6 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.4-bin.zip
