Skip to content

Commit 3ec4659

Browse files
metatypesboorlagadda
authored andcommitted
GEODE-6569: geode-all-bom shouldn't make a jar
(cherry-picked from commit 5725c34)
1 parent d9981e5 commit 3ec4659

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

boms/geode-all-bom/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717

1818
plugins {
1919
id 'geode-dependency-constraints'
20-
id 'java'
2120
id 'maven-publish'
2221
}
2322

2423
apply from: "${project.projectDir}/../../gradle/publish.gradle"
2524

25+
jar.enabled = false
2626

2727
publishing {
2828
publications {

geode-assembly/build.gradle

+9-4
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,12 @@ def cp = {
290290

291291
// then add all the dependencies of the dependent jars
292292
def depJars = configurations.archives.dependencies.collect {
293-
it.dependencyProject.findAll { !(it.name.contains('geode-web') || it.name.contains('geode-pulse')) }
294-
.collect { it.configurations.runtimeClasspath.collect { it.getName() }.findAll { !(
293+
it.dependencyProject.findAll {
294+
!(it.name.contains('geode-web') ||
295+
it.name.contains('geode-pulse'))
296+
}.collect { it.configurations.runtimeClasspath.collect { it.getName() }.findAll { !(
297+
it.contains('geode-all-bom') ||
298+
295299
// exclude mx4j, once the deprecated code is deleted we can remove these entirely
296300
it.contains('commons-digester') ||
297301
it.contains('commons-modeler') ||
@@ -343,8 +347,9 @@ task configureGfshDepsJar(dependsOn: configurations.gfshDependencies.dependencie
343347
}
344348
doLast {
345349
def classpath = configureDepsJar.outputs.files.singleFile.text + ' ' +
346-
project(':geode-core').webJar.archiveName + ' ' +
347-
configurations.gfshDependencies.collect { it.getName() }.flatten().join(' ')
350+
configurations.gfshDependencies.collect { it.getName() }.findAll {
351+
!it.contains('geode-all-bom')
352+
}.flatten().unique().join(' ')
348353
output.write(classpath)
349354
}
350355
}

geode-assembly/src/integrationTest/resources/assembly_content.txt

-1
Original file line numberDiff line numberDiff line change
@@ -897,7 +897,6 @@ lib/commons-validator-1.6.jar
897897
lib/fastutil-8.2.2.jar
898898
lib/findbugs-annotations-1.3.9-1.jar
899899
lib/geo-0.7.1.jar
900-
lib/geode-all-bom-0.0.0.jar
901900
lib/geode-common-0.0.0.jar
902901
lib/geode-connectors-0.0.0.jar
903902
lib/geode-core-0.0.0.jar

geode-assembly/src/integrationTest/resources/dependency_classpath.txt

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ commons-math3-3.2.jar
1313
commons-validator-1.6.jar
1414
fastutil-8.2.2.jar
1515
geo-0.7.1.jar
16-
geode-all-bom-0.0.0.jar
1716
geode-common-0.0.0.jar
1817
geode-connectors-0.0.0.jar
1918
geode-core-0.0.0.jar

geode-protobuf-messages/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ apply plugin: 'idea'
3131
apply from: "${project.projectDir}/../gradle/publish.gradle"
3232

3333
dependencies {
34-
compile(platform(project(':boms:geode-all-bom')))
34+
api(platform(project(':boms:geode-all-bom')))
3535

36-
compile('com.google.protobuf:protobuf-java')
36+
api('com.google.protobuf:protobuf-java')
3737
}
3838

3939
protobuf {

0 commit comments

Comments
 (0)