[geode] branch develop updated: GEODE-6611: Audit geode-all-bom plugin inclusions

[rh...@apache.org]

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

rhoughton 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 20b4fbb  GEODE-6611: Audit geode-all-bom plugin inclusions
20b4fbb is described below

commit 20b4fbbc457397d252c91b54f756d5dd0d65486d
Author: Robert Houghton <rh...@pivotal.io>
AuthorDate: Wed Apr 10 09:58:00 2019 -0700

    GEODE-6611: Audit geode-all-bom plugin inclusions
    
    Only include plugins used in the project. In this case, our `java`
    plugin, not the rest
    
    Authored-by: Robert Houghton <rh...@pivotal.io>
---
 boms/geode-all-bom/build.gradle | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/boms/geode-all-bom/build.gradle b/boms/geode-all-bom/build.gradle
index ce91360..d1b38bd 100644
--- a/boms/geode-all-bom/build.gradle
+++ b/boms/geode-all-bom/build.gradle
@@ -19,10 +19,9 @@ plugins {
   id 'maven-publish'
 }
 
-apply from: "${rootDir}/${scriptDir}/standard-subproject-configuration.gradle"
+apply from: "${rootDir}/${scriptDir}/java.gradle"
 apply plugin: 'geode-dependency-constraints'
-
-apply from: "${project.projectDir}/../../gradle/publish.gradle"
+apply from: "${rootDir}/${scriptDir}/publish.gradle"
 
 jar.enabled = false
 
@@ -50,8 +49,8 @@ publishing {
                 && !project(':boms').allprojects.contains(p)) {
               def geodeDependency =
                   thisNode.dependencyManagement.dependencies*.appendNode('dependency')
-               geodeDependency*.appendNode('groupId')*.setValue('org.apache.geode')
-               geodeDependency*.appendNode('artifactId')*.setValue((p.findProperty('artifactName') ?: p.name))
+               geodeDependency*.appendNode('groupId')*.setValue(p.group)
+               geodeDependency*.appendNode('artifactId')*.setValue(p.name)
                geodeDependency*.appendNode('version')*.setValue(p.version.toString())
             }
           }