[geode] branch develop updated: GEODE-5604: Fix over-zealous fix for adding NOTICE to jar manifest (#3365)

[pr...@apache.org]

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

prhomberg pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 2aea7f4  GEODE-5604: Fix over-zealous fix for adding NOTICE to jar manifest (#3365)
2aea7f4 is described below

commit 2aea7f4d5733d4ce1301920d6e3be3fb65fb44e4
Author: Patrick Rhomberg <pr...@pivotal.io>
AuthorDate: Wed Mar 27 14:51:47 2019 -0700

    GEODE-5604: Fix over-zealous fix for adding NOTICE to jar manifest (#3365)
    
    Removal of a bad `doLast` around the insertion of the default NOTICE,
    only if the module did not have its own file
    
    Co-authored-by: Robert Houghton <rh...@pivotal.io>
    Co-authored-by: Patrick Rhomberg <pr...@pivotal.io>
---
 gradle/java.gradle | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gradle/java.gradle b/gradle/java.gradle
index 7f663e3..1a7aea3 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -81,10 +81,8 @@ subprojects {
       }
       jar.metaInf {
         from("$rootDir/LICENSE")
-        jar.doLast {
-          if (jar.source.filter({ it.name.contains('NOTICE') }).empty) {
-            from("$rootDir/NOTICE")
-          }
+        if (jar.source.filter({ it.name.contains('NOTICE') }).empty) {
+          from("$rootDir/NOTICE")
         }
       }
     }