[55/61] [abbrv] incubator-geode git commit: GEODE-946: Source and javadoc artifacts from modules have inconsistent locations

[ds...@apache.org]

GEODE-946: Source and javadoc artifacts from modules have inconsistent locations


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/9fff1ebd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/9fff1ebd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/9fff1ebd

Branch: refs/heads/feature/GEODE-831
Commit: 9fff1ebdee253017a935f6c46285dc02a9697cb9
Parents: 4664325
Author: Jens Deppe <jd...@pivotal.io>
Authored: Tue Feb 9 08:40:22 2016 -0800
Committer: Jens Deppe <jd...@pivotal.io>
Committed: Tue Feb 9 16:16:16 2016 -0800

----------------------------------------------------------------------
 gradle/java.gradle | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9fff1ebd/gradle/java.gradle
----------------------------------------------------------------------
diff --git a/gradle/java.gradle b/gradle/java.gradle
index 758420d..06fb766 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -88,6 +88,14 @@ subprojects {
     }
   }
  
+  // This ensures that javadoc and source jars also have any prefix paths stripped and will
+  // be created as libs/foo-sources.jar instead of libs/extensions/foo-sources.jar for example.
+  tasks.all { task ->
+    if (task instanceof Jar) {
+      baseName = sanitizedName()
+    }
+  }
+
   task jarTest (type: Jar, dependsOn: testClasses) {
     description 'Assembles a jar archive of test classes.'
     from sourceSets.test.output
@@ -125,11 +133,6 @@ subprojects {
     compile 'com.google.code.findbugs:jsr305:' + project.'jsr305.version'
     compile 'javax.enterprise:cdi-api:' + project.'cdi-api.version'
   }
-
-  jar {
-    baseName = sanitizedName()
-  }
-
 }