GEODE-6569: geode-all-bom shouldn't make a jar

leeqiang250 · Mar 28, 2019 · 5725c34 · 5725c34
1 parent 252889c
commit 5725c34
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/boms/geode-all-bom/build.gradle b/boms/geode-all-bom/build.gradle
@@ -17,12 +17,12 @@
 
 plugins {
   id 'geode-dependency-constraints'
-  id 'java'
   id 'maven-publish'
 }
 
 apply from: "${project.projectDir}/../../gradle/publish.gradle"
 
+jar.enabled = false
 
 publishing {
   publications {

diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
@@ -291,8 +291,12 @@ def cp = {
 
   // then add all the dependencies of the dependent jars
   def depJars = configurations.archives.dependencies.collect {
-    it.dependencyProject.findAll { !(it.name.contains('geode-web') || it.name.contains('geode-pulse')) }
-      .collect { it.configurations.runtimeClasspath.collect { it.getName() }.findAll { !(
+    it.dependencyProject.findAll {
+      !(it.name.contains('geode-web') ||
+        it.name.contains('geode-pulse'))
+    }.collect { it.configurations.runtimeClasspath.collect { it.getName() }.findAll { !(
+        it.contains('geode-all-bom') ||
+
         // exclude mx4j, once the deprecated code is deleted we can remove these entirely
         it.contains('commons-digester') ||
         it.contains('commons-modeler') ||
@@ -341,7 +345,9 @@ task configureGfshDepsJar(dependsOn: configurations.gfshDependencies.dependencie
   }
   doLast {
     def classpath = configureDepsJar.outputs.files.singleFile.text + ' ' +
-        configurations.gfshDependencies.collect { it.getName() }.flatten().join(' ')
+        configurations.gfshDependencies.collect { it.getName() }.findAll {
+          !it.contains('geode-all-bom')
+        }.flatten().unique().join(' ')
     output.write(classpath)
   }
 }

diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -897,7 +897,6 @@ lib/commons-validator-1.6.jar
 lib/fastutil-8.2.2.jar
 lib/findbugs-annotations-1.3.9-1.jar
 lib/geo-0.7.1.jar
-lib/geode-all-bom-0.0.0.jar
 lib/geode-common-0.0.0.jar
 lib/geode-connectors-0.0.0.jar
 lib/geode-core-0.0.0.jar

diff --git a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -13,7 +13,6 @@ commons-math3-3.2.jar
 commons-validator-1.6.jar
 fastutil-8.2.2.jar
 geo-0.7.1.jar
-geode-all-bom-0.0.0.jar
 geode-common-0.0.0.jar
 geode-connectors-0.0.0.jar
 geode-core-0.0.0.jar

diff --git a/geode-protobuf-messages/build.gradle b/geode-protobuf-messages/build.gradle
@@ -31,9 +31,9 @@ apply plugin: 'idea'
 apply from: "${project.projectDir}/../gradle/publish.gradle"
 
 dependencies {
-  compile(platform(project(':boms:geode-all-bom')))
+  api(platform(project(':boms:geode-all-bom')))
 
-  compile('com.google.protobuf:protobuf-java')
+  api('com.google.protobuf:protobuf-java')
 }
 
 protobuf {