Commit 3ec4659 1 parent d9981e5 commit 3ec4659 Copy full SHA for 3ec4659
File tree 5 files changed +12
-9
lines changed
src/integrationTest/resources
5 files changed +12
-9
lines changed Original file line number Diff line number Diff line change 17
17
18
18
plugins {
19
19
id ' geode-dependency-constraints'
20
- id ' java'
21
20
id ' maven-publish'
22
21
}
23
22
24
23
apply from : " ${ project.projectDir} /../../gradle/publish.gradle"
25
24
25
+ jar. enabled = false
26
26
27
27
publishing {
28
28
publications {
Original file line number Diff line number Diff line change @@ -290,8 +290,12 @@ def cp = {
290
290
291
291
// then add all the dependencies of the dependent jars
292
292
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
+
295
299
// exclude mx4j, once the deprecated code is deleted we can remove these entirely
296
300
it. contains(' commons-digester' ) ||
297
301
it. contains(' commons-modeler' ) ||
@@ -343,8 +347,9 @@ task configureGfshDepsJar(dependsOn: configurations.gfshDependencies.dependencie
343
347
}
344
348
doLast {
345
349
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(' ' )
348
353
output. write(classpath)
349
354
}
350
355
}
Original file line number Diff line number Diff line change @@ -897,7 +897,6 @@ lib/commons-validator-1.6.jar
897
897
lib/fastutil-8.2.2.jar
898
898
lib/findbugs-annotations-1.3.9-1.jar
899
899
lib/geo-0.7.1.jar
900
- lib/geode-all-bom-0.0.0.jar
901
900
lib/geode-common-0.0.0.jar
902
901
lib/geode-connectors-0.0.0.jar
903
902
lib/geode-core-0.0.0.jar
Original file line number Diff line number Diff line change @@ -13,7 +13,6 @@ commons-math3-3.2.jar
13
13
commons-validator-1.6.jar
14
14
fastutil-8.2.2.jar
15
15
geo-0.7.1.jar
16
- geode-all-bom-0.0.0.jar
17
16
geode-common-0.0.0.jar
18
17
geode-connectors-0.0.0.jar
19
18
geode-core-0.0.0.jar
Original file line number Diff line number Diff line change @@ -31,9 +31,9 @@ apply plugin: 'idea'
31
31
apply from : " ${ project.projectDir} /../gradle/publish.gradle"
32
32
33
33
dependencies {
34
- compile (platform(project(' :boms:geode-all-bom' )))
34
+ api (platform(project(' :boms:geode-all-bom' )))
35
35
36
- compile (' com.google.protobuf:protobuf-java' )
36
+ api (' com.google.protobuf:protobuf-java' )
37
37
}
38
38
39
39
protobuf {
You can’t perform that action at this time.
0 commit comments