Repository: bigtop Updated Branches: refs/heads/master f73171adc -> e1088c337
BIGTOP-2916: fix deprecated gradle syntax Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/e1088c33 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/e1088c33 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/e1088c33 Branch: refs/heads/master Commit: e1088c3378003fe34edd76f3ffed4fe57cd6d124 Parents: f73171a Author: Olaf Flebbe <[email protected]> Authored: Fri Nov 3 14:42:27 2017 +0100 Committer: Olaf Flebbe <[email protected]> Committed: Fri Nov 3 20:08:13 2017 +0100 ---------------------------------------------------------------------- bigtop-tests/smoke-tests/build.gradle | 2 +- build.gradle | 4 +- gradle/wrapper/gradle-wrapper.properties | 2 +- packages.gradle | 56 +++++++++++++-------------- release.gradle | 6 +-- 5 files changed, 35 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/e1088c33/bigtop-tests/smoke-tests/build.gradle ---------------------------------------------------------------------- diff --git a/bigtop-tests/smoke-tests/build.gradle b/bigtop-tests/smoke-tests/build.gradle index c151be3..7a35326 100644 --- a/bigtop-tests/smoke-tests/build.gradle +++ b/bigtop-tests/smoke-tests/build.gradle @@ -69,7 +69,7 @@ subprojects { environment ("BIGTOP_HOME", BIGTOP_HOME) } - test << { + test.doLast { println("Now testing..."); //todo, add back in 'basic' after BIGTOP-1392 . testLogging { http://git-wip-us.apache.org/repos/asf/bigtop/blob/e1088c33/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index efefacb..1e7bc0e 100644 --- a/build.gradle +++ b/build.gradle @@ -341,7 +341,7 @@ def artifactToInstall = { task "install-${artifact}" (description: "Installs ${artifact} artifact with Maven", group: TESTARTIFACTS_GROUP, dependsOn: installiTest - ) << { + ) doLast { def final PATH = "${TEST_DIR}/$artifact/pom.xml" def final WRAPPER = "mvn clean install -f " + PATH exec { @@ -392,7 +392,7 @@ repos.each { r-> task "configure-nexus"(dependsOn: tasks.findAll { alltask -> alltask.name.startsWith("configure-nexus-")}*.name, description: 'configure build to use a sonatype nexus server.\n' + ' Use -PNEXUS_URL=http://server:8081 to overwrite default server http://localhost:8081\n' + - ' Use -PNEXUS_USERPASS=user:passwd to overwrite default username passwd admin:admin123') << { + ' Use -PNEXUS_USERPASS=user:passwd to overwrite default username passwd admin:admin123') doLast { def m2Dir = System.getProperty("user.home") + "/.m2" mkdir(m2Dir) def writer = new File(m2Dir + "/settings.xml") http://git-wip-us.apache.org/repos/asf/bigtop/blob/e1088c33/gradle/wrapper/gradle-wrapper.properties ---------------------------------------------------------------------- diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0acb6a2..44c5547 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -17,4 +17,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip http://git-wip-us.apache.org/repos/asf/bigtop/blob/e1088c33/packages.gradle ---------------------------------------------------------------------- diff --git a/packages.gradle b/packages.gradle index 966afea..2ca98ec 100644 --- a/packages.gradle +++ b/packages.gradle @@ -58,7 +58,7 @@ def bomTasks = [] def touchTargetFile = { fileName -> // to comply with make build - GFileUtils.touch new File(fileName) + ant.touch(file:fileName,mkdirs:true) } def ifExists = { url -> if (url == null) return @@ -120,13 +120,13 @@ Description: Bigtop """; } -task "packages-help" (description: "All package build related tasks information", group: PACKAGES_GROUP) << { +task "packages-help" (description: "All package build related tasks information", group: PACKAGES_GROUP) doLast { config.bigtop.components.each { label, comp -> println (comp.name + "\n\t[" + tasks.findAll { alltask -> alltask.name.startsWith(comp.name)}*.name.join(", ") + "]") } } -task "bom-json" (description: "List the components of the stack in json format") << { +task "bom-json" (description: "List the components of the stack in json format") doLast { def componentObjects = config.bigtop.components.sort().collect { setDefaults(it.value) [ @@ -163,7 +163,7 @@ task "bom-json" (description: "List the components of the stack in json format") println JsonOutput.prettyPrint(json) } -task "all-components" (description: "List the components of the stack") << { +task "all-components" (description: "List the components of the stack") doLast { println "${project.name} ${config.bigtop.version} stack includes the following components" config.bigtop.components.sort().each { label, comp -> println sprintf ('\t%1$s %2$s', comp.name.padRight(20), comp.version.base.padLeft(15)) @@ -173,7 +173,7 @@ task "all-components" (description: "List the components of the stack") << { def genTasks = { target -> Task t = task "${target}-download" (dependsOn: "${target}_vardefines", description: "Download $target artifacts", - group: PACKAGES_GROUP) << { + group: PACKAGES_GROUP) doLast { def final TARBALL_DST = config.bigtop.components[target].tarball.destination def final DOWNLOAD_DST = config.bigtop.components[target].downloaddst @@ -246,7 +246,7 @@ def genTasks = { target -> } task "${target}-tar" (dependsOn: ["${target}_vardefines", "${target}-download"], description: "Preparing a tarball for $target artifacts", - group: PACKAGES_GROUP) << { + group: PACKAGES_GROUP) doLast { if (new File(config.bigtop.components[target].targettar)?.exists()) { println "\tNothing to do. Exiting..." return @@ -303,7 +303,7 @@ def genTasks = { target -> // Keeping the reference to deb task to be used later for correct sequencing Task tdeb = task "$target-deb"(dependsOn: "${target}-sdeb", description: "Building DEB for $target artifacts", - group: PACKAGES_GROUP) << { + group: PACKAGES_GROUP) doLast { if (new File(config.bigtop.components[target].targetdeb)?.exists()) { println "\tNothing to do. Exiting..." return @@ -355,7 +355,7 @@ def genTasks = { target -> task "$target-sdeb" (dependsOn: ["${target}_vardefines", "${target}-tar"], description: "Building SDEB for $target artifacts", group: PACKAGES_GROUP - ) << { + ) doLast { if (new File(config.bigtop.components[target].targetsdeb)?.exists()) { println "\tNothing to do. Exiting..." return @@ -431,7 +431,7 @@ def genTasks = { target -> // Keeping the reference to task to be used later for correct sequencing Task trpm = task "$target-rpm" (dependsOn: ["${target}-srpm"], description: "Building RPM for $target artifacts", - group: PACKAGES_GROUP) << { + group: PACKAGES_GROUP) doLast { if (new File(config.bigtop.components[target].targetrpm)?.exists()) { println "\tNothing to do. Exiting..." return @@ -475,7 +475,7 @@ def genTasks = { target -> trpm.mustRunAfter "${bomTasks.get(bomTasks.size() - 1)}-rpm".toLowerCase() task "$target-srpm" (dependsOn: ["${target}_vardefines" , "${target}-tar"], description: "Building SRPM for $target artifacts", - group: PACKAGES_GROUP) << { + group: PACKAGES_GROUP) doLast { if (new File(config.bigtop.components[target].targetsrpm)?.exists()) { println "\tNothing to do. Exiting..." return @@ -564,17 +564,17 @@ def genTasks = { target -> def ptype = nativePackaging.pkg task "$target-pkg" (dependsOn: "$target-$ptype", description: "Invoking a native binary packaging target $ptype", - group: PACKAGES_GROUP) << { + group: PACKAGES_GROUP) doLast { } task "$target-spkg" (dependsOn: "$target-s$ptype", description: "Invoking a native binary packaging target s$ptype", - group: PACKAGES_GROUP) << { + group: PACKAGES_GROUP) doLast { } } - task "$target-version" (description: "Show version of $target component", group: PACKAGES_GROUP) << { + task "$target-version" (description: "Show version of $target component", group: PACKAGES_GROUP) doLast { println "Base: ${config.bigtop.components[target].version.base}" } - task "${target}_vardefines" << { + task "${target}_vardefines" doLast { setDefaults(config.bigtop.components[target]) config.bigtop.components[target].package.release = '1' @@ -616,7 +616,7 @@ def genTasks = { target -> task "$target-info" (dependsOn: "${target}_vardefines", description: "Info about $target component build", - group: PACKAGES_GROUP) << { + group: PACKAGES_GROUP) doLast { println "Info for package $target" println " Will download from URL: ${config.bigtop.components[target].downloadurl}" println " To destination file: ${config.bigtop.components[target].downloaddst}" @@ -626,15 +626,15 @@ def genTasks = { target -> println "Version: " + config.bigtop.components[target].version.base //TODO more about stamping } - task "$target-relnotes" (description: "Preparing release notes for $target. No yet implemented!!!", group: PACKAGES_GROUP)<< { + task "$target-relnotes" (description: "Preparing release notes for $target. No yet implemented!!!", group: PACKAGES_GROUP) doLast { } task "$target-clean" (dependsOn: "${target}_vardefines", description: "Removing $target component build and output directories", - group: PACKAGES_GROUP) << { + group: PACKAGES_GROUP) doLast { safeDelete(config.bigtop.components[target].builddir) safeDelete(config.bigtop.components[target].outputdir) } - task "$target-help" (description: "List of available tasks for $target", group: PACKAGES_GROUP) << { + task "$target-help" (description: "List of available tasks for $target", group: PACKAGES_GROUP) doLast { println (target + "\n\t[" + tasks.findAll { alltask -> alltask.name.startsWith(target)}*.name.join(", ") + "]") } @@ -670,42 +670,42 @@ project.afterEvaluate { task "srpm" (dependsOn: tasks.findAll { alltask -> alltask.name.endsWith("-srpm")}*.name, description: "Build all SRPM packages for the stack components", group: PACKAGES_GROUP - ) << { } + ) doLast { } task "rpm" (dependsOn: tasks.findAll { alltask -> alltask.name.endsWith("-rpm")}*.name, description: "Build all RPM packages for the stack", group: PACKAGES_GROUP - ) << { } + ) doLast { } task "sdeb" (dependsOn: tasks.findAll { alltask -> alltask.name.endsWith("-sdeb")}*.name, description: "Build all SDEB packages for the stack components", group: PACKAGES_GROUP - ) << { } + ) doLast { } task "deb" (dependsOn: tasks.findAll { alltask -> alltask.name.endsWith("-deb")}*.name, description: "Build all DEB packages for the stack components", group: PACKAGES_GROUP - ) << { } + ) doLast { } task "pkgs" (dependsOn: tasks.findAll { alltask -> alltask.name.endsWith("-pkg")}*.name, description: "Build all native packages for the stack components", group: PACKAGES_GROUP - ) << { } + ) doLast { } task allclean (dependsOn: [clean, tasks.findAll { alltask -> alltask.name.endsWith("-clean")}*.name], description: "Removing $BUILD_DIR, $OUTPUT_DIR, and $DIST_DIR.\n\t\t" + "Cleaning all components' build and output directories.", - group: PACKAGES_GROUP) << { + group: PACKAGES_GROUP) doLast { safeDelete(BUILD_DIR) safeDelete(OUTPUT_DIR) safeDelete(DIST_DIR) } task realclean (dependsOn: allclean, description: "Removing $BUILD_DIR, $OUTPUT_DIR, $DIST_DIR, and $DL_DIR", - group: PACKAGES_GROUP) << { + group: PACKAGES_GROUP) doLast { delete (DL_DIR) } } task "apt" ( description: "Creating APT repository", - group: PACKAGES_GROUP) << { + group: PACKAGES_GROUP) doLast { delete ( "$OUTPUT_DIR/apt") mkdir ("$OUTPUT_DIR/apt/conf") @@ -724,7 +724,7 @@ task "apt" ( task "yum" ( description: "Creating YUM repository", - group: PACKAGES_GROUP) << { + group: PACKAGES_GROUP) doLast { delete ( "$OUTPUT_DIR/repodata") exec { workingDir BUILD_DIR @@ -735,5 +735,5 @@ task "yum" ( if (nativePackaging) { task "repo" (dependsOn: nativePackaging.repo, description: "Invoking a native repository target ${nativePackaging.repo}", - group: PACKAGES_GROUP) << { } + group: PACKAGES_GROUP) doLast { } } http://git-wip-us.apache.org/repos/asf/bigtop/blob/e1088c33/release.gradle ---------------------------------------------------------------------- diff --git a/release.gradle b/release.gradle index bbeb3ca..5a4954d 100644 --- a/release.gradle +++ b/release.gradle @@ -53,15 +53,15 @@ task deployTestExecutors (type: Exec, dependsOn: [deployTop]) { standardInput System.in } task deployAll (dependsOn: [deployTestExecutors, deployTestArtifacts, - deployITest, deployTop]) << { + deployITest, deployTop]) doLast { println "Done!" } task dorelease(description: 'Convenient wrapper for existing release tasks', - dependsOn: [dosite, deployAll]) << { + dependsOn: [dosite, deployAll]) doLast { } -task setversion << { +task setversion doLast { assert project.hasProperty('nextversion') FileTree fTree = fileTree(dir: projectDir, exclude: ['dl', 'build'],
