You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2016/02/11 01:39:30 UTC

[56/61] [abbrv] incubator-geode git commit: GEODE-948: gemfire-modules-assembly should not publish a jar artifact

GEODE-948: gemfire-modules-assembly should not publish a jar artifact


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

Branch: refs/heads/feature/GEODE-831
Commit: 8af2858470bc7c7b866a865195a4ff95d43189d2
Parents: 9fff1eb
Author: Jens Deppe <jd...@pivotal.io>
Authored: Tue Feb 9 08:39:18 2016 -0800
Committer: Jens Deppe <jd...@pivotal.io>
Committed: Tue Feb 9 16:17:13 2016 -0800

----------------------------------------------------------------------
 extensions/gemfire-modules-assembly/build.gradle |  7 +++++++
 gemfire-assembly/build.gradle                    |  9 +--------
 gradle/utilities.gradle                          | 10 ++++++++++
 3 files changed, 18 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8af28584/extensions/gemfire-modules-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/gemfire-modules-assembly/build.gradle b/extensions/gemfire-modules-assembly/build.gradle
index 270e167..b20ddff 100644
--- a/extensions/gemfire-modules-assembly/build.gradle
+++ b/extensions/gemfire-modules-assembly/build.gradle
@@ -31,6 +31,13 @@ dependencies {
 }
 
 jar.enabled = false
+extraArchive {
+  sources = false
+  javadoc = false
+  tests = false
+}
+
+disableMavenPublishing()
 
 def getJarArtifact(module) {
   project(module).configurations.archives.artifacts.findAll {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8af28584/gemfire-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-assembly/build.gradle b/gemfire-assembly/build.gradle
index c77d909..72e97c5 100755
--- a/gemfire-assembly/build.gradle
+++ b/gemfire-assembly/build.gradle
@@ -26,14 +26,7 @@ extraArchive {
   tests = false
 }
 
-// We are not publishing anything from this project into maven and using two distributions seems
-// to break the nexus plugin.  So we delete the nexus tasks but we have to replace the upload task
-// with an empty task of the same name...argh.
-afterEvaluate {
-  tasks.remove(install)
-  tasks.remove(uploadArchives)
-  task uploadArchives << { }
-}
+disableMavenPublishing()
 
 // Gradle doesn't automatically remove the jar artifact even though we disabled it
 // this causes publishing to fail.  So we nuke all the disabled artifacts from all configurations.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8af28584/gradle/utilities.gradle
----------------------------------------------------------------------
diff --git a/gradle/utilities.gradle b/gradle/utilities.gradle
index 18aef20..6a6df04 100644
--- a/gradle/utilities.gradle
+++ b/gradle/utilities.gradle
@@ -27,5 +27,15 @@ allprojects {
       def parts = project.name.split("/")
       return parts[parts.length - 1];
     }
+
+    disableMavenPublishing = {
+      // Use this closure when a project should not publish anything to maven. It appears that the nexus
+      // upload task still needs to exist, which is why an empty one is created.
+      afterEvaluate {
+        tasks.remove(install)
+        tasks.remove(uploadArchives)
+        task uploadArchives << { }
+      }
+    }
   }
 }