BIGTOP-2808. Handle deletion of symlinks: update gradle

6 files changed, 7 insertions, 62 deletions

diff --git a/bigtop_toolchain/manifests/gradle.pp b/bigtop_toolchain/manifests/gradle.pp
index dcddfbe9..19be947e 100644
--- a/bigtop_toolchain/manifests/gradle.pp
+++ b/bigtop_toolchain/manifests/gradle.pp
@@ -15,7 +15,7 @@
 
 class bigtop_toolchain::gradle {
 
-  $gradle_version = '2.12'
+  $gradle_version = '2.14.1'
   $gradle = "gradle-${gradle_version}"
 
   exec {"/usr/bin/wget http://services.gradle.org/distributions/${gradle}-bin.zip":
diff --git a/build.gradle b/build.gradle
index 0faa91b9..e0f74f3e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ buildscript {
 }
 
 plugins {
-  id "de.undercouch.download" version "2.0.0"
+  id "de.undercouch.download" version "3.2.0"
   id "org.nosphere.apache.rat" version "0.2.0"
 }
 
diff --git a/buildSrc/src/main/groovy/org/apache/bigtop/NullOutputStream.groovy b/buildSrc/src/main/groovy/org/apache/bigtop/NullOutputStream.groovy
deleted file mode 100644
index 0d673bbc..00000000
--- a/buildSrc/src/main/groovy/org/apache/bigtop/NullOutputStream.groovy
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.bigtop
-
-import java.io.OutputStream
-import java.io.IOException
-
-public class NullOutputStream extends OutputStream {
-  @Override
-  public void write(int b) throws IOException {
-  }
-}
diff --git a/buildSrc/src/test/groovy/org/apache/bigtop/TestNullOutputStream.groovy b/buildSrc/src/test/groovy/org/apache/bigtop/TestNullOutputStream.groovy
deleted file mode 100644
index 1e90d5f8..00000000
--- a/buildSrc/src/test/groovy/org/apache/bigtop/TestNullOutputStream.groovy
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.bigtop
-
-import org.junit.Assert
-import org.junit.Test
-
-class TestNullOutputStream {
-
-  @Test
-  void testDevNull () {
-    new Properties().store(new NullOutputStream(), "stuff");
-  }
-}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e44ba6c5..2fd41c7d 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-2.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
diff --git a/packages.gradle b/packages.gradle
index 8576ab12..e93e94f0 100644
--- a/packages.gradle
+++ b/packages.gradle
@@ -89,8 +89,11 @@ def setDefaults = { comp ->
     comp.version.pkg = comp.version.base
   }
 }
+def devNull = new OutputStream() {
+  @Override
+  public void write(int b) {}
+}
 def nativePackaging = {
-  def devNull = new org.apache.bigtop.NullOutputStream()
   def result = exec {
     commandLine "/bin/bash", "-c",
     """dpkg-query -S /bin/sh && exit 1
@@ -182,8 +185,6 @@ def genTasks = { target ->
     def final GIT_USER_NAME = config.bigtop.components[target].git.user ?: config.bigtop.git.user
     def final GIT_ACCESS_TOKEN = config.bigtop.components[target].git.token ?: config.bigtop.git.token
 
-    def devNull = new org.apache.bigtop.NullOutputStream()
-
     if (!DOWNLOAD_URL)
       return