[geode] branch develop updated: GEODE-5508 Reverts change from GEODE-5492 that broke UTF-8 and manifests

[jb...@apache.org]

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

jbarrett 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 0cc8470  GEODE-5508 Reverts change from GEODE-5492 that broke UTF-8 and manifests
0cc8470 is described below

commit 0cc84703fcfcaa04dbddee296b83ef17170c60a5
Author: Robert Houghton <rh...@pivotal.io>
AuthorDate: Wed Aug 1 10:45:21 2018 -0700

    GEODE-5508 Reverts change from GEODE-5492 that broke UTF-8 and manifests
    
    Invoking 'tasks' within taskGraph.whenReady() does not get all tasks,
    but only the tasks for the current project. Move the whenReady() back
    within a subprojects closure to get correct behavior back
    
    Signed-off-by: Finn Southerland <fs...@pivotal.io>
---
 gradle/java.gradle | 72 ++++++++++++++++++++++++++----------------------------
 1 file changed, 35 insertions(+), 37 deletions(-)

diff --git a/gradle/java.gradle b/gradle/java.gradle
index 64b464d..1f9c1ec 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -30,6 +30,41 @@ subprojects {
     throw new GradleException("Java version 1.8.0_121 or later required, but was " + javaVersion)
   }
 
+  // apply compiler options
+  gradle.taskGraph.whenReady({ graph ->
+    tasks.withType(JavaCompile).each { javac ->
+      javac.configure {
+        sourceCompatibility '1.8'
+        targetCompatibility '1.8'
+        options.encoding = 'UTF-8'
+      }
+      javac.options.incremental = true
+      javac.options.fork = true
+    }
+  })
+
+  // apply default manifest
+  gradle.taskGraph.whenReady({ graph ->
+    tasks.withType(Jar).each { jar ->
+      jar.doFirst {
+        manifest {
+          attributes(
+            "Manifest-Version": "1.0",
+            "Created-By": System.getProperty("user.name"),
+            "Title": rootProject.name,
+            "Version": version,
+            "Organization": productOrg
+          )
+        }
+      }
+      jar.metaInf {
+        from("$rootDir/LICENSE")
+        if (jar.source.filter({ it.name.contains('NOTICE') }).empty) {
+          from("$rootDir/NOTICE")
+        }
+      }
+    }
+  })
 
   configurations {
     testOutput {
@@ -62,41 +97,4 @@ subprojects {
     options.encoding = 'UTF-8'
     classpath += configurations.compileOnly
   }
-
-// apply compiler options
-  gradle.taskGraph.whenReady({ graph ->
-    tasks.withType(JavaCompile).each { javac ->
-      javac.configure {
-        sourceCompatibility '1.8'
-        targetCompatibility '1.8'
-        options.encoding = 'UTF-8'
-      }
-      javac.options.incremental = true
-      javac.options.fork = true
-    }
-  })
 }
-
-// apply default manifest
-gradle.taskGraph.whenReady({ graph ->
-  tasks.withType(Jar).each { jar ->
-    jar.doFirst {
-      manifest {
-        attributes(
-                "Manifest-Version": "1.0",
-                "Created-By": System.getProperty("user.name"),
-                "Title": rootProject.name,
-                "Version": version,
-                "Organization": productOrg
-        )
-      }
-    }
-    jar.metaInf {
-      from("$rootDir/LICENSE")
-      if (jar.source.filter({ it.name.contains('NOTICE') }).empty) {
-        from("$rootDir/NOTICE")
-      }
-    }
-  }
-})
-