[incubator-openwhisk] branch master updated: Update to Gradle 4.10.2 (#4111)

[csantanapr]

This is an automated email from the ASF dual-hosted git repository.

csantanapr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new a790bb8  Update to Gradle 4.10.2 (#4111)
a790bb8 is described below

commit a790bb89958d49d63be7e69ba62a1cb7f7e8d646
Author: Chetan Mehrotra <chet...@apache.org>
AuthorDate: Fri Nov 30 03:18:47 2018 +0530

    Update to Gradle 4.10.2 (#4111)
---
 build.gradle                                       |  4 +---
 gradle/wrapper/gradle-wrapper.properties           |  2 +-
 .../org/apache/openwhisk/GradleWorkaround.scala    | 23 ++++++++++++++++++++++
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 47069ef..2f1e076 100644
--- a/build.gradle
+++ b/build.gradle
@@ -87,9 +87,7 @@ subprojects {
                 enabled false
             }
 
-            configurations.archives.with {
-                artifacts.remove artifacts.find { it.archiveTask.is distZip }
-            }
+            configurations.archives.artifacts.removeAll {it.file =~ 'zip'}
         }
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties 
b/gradle/wrapper/gradle-wrapper.properties
index 0178d89..8b0d452 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,6 +3,6 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/tests/src/main/scala/org/apache/openwhisk/GradleWorkaround.scala 
b/tests/src/main/scala/org/apache/openwhisk/GradleWorkaround.scala
new file mode 100644
index 0000000..e798f11
--- /dev/null
+++ b/tests/src/main/scala/org/apache/openwhisk/GradleWorkaround.scala
@@ -0,0 +1,23 @@
+/*
+ * 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.openwhisk
+
+/**
+ *  This class is a workaround for https://github.com/gradle/gradle/issues/6849
+ */
+class GradleWorkaround {}