Skip to content

Commit

Permalink
GEODE-5604: Fix over-zealous fix for adding NOTICE to jar manifest (a…
Browse files Browse the repository at this point in the history
…pache#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 <[email protected]>
Co-authored-by: Patrick Rhomberg <[email protected]>
  • Loading branch information
PurelyApplied and robbadler authored Mar 27, 2019
1 parent fd46a47 commit 2aea7f4
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions gradle/java.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
}
Expand Down

0 comments on commit 2aea7f4

Please sign in to comment.