Skip to content

Commit 846a58c

Browse files
GEODE-5530: Add geode-core project to distributedTestRuntimeOnly (apache#2322)
* AnalyzeSerializablesJUnitTest should be an integrationTest
1 parent 7299dd8 commit 846a58c

File tree

9 files changed

+50
-41
lines changed

9 files changed

+50
-41
lines changed

geode-assembly/build.gradle

+3-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,9 @@ dependencies {
122122

123123

124124
upgradeTestCompile project(':geode-core')
125-
upgradeTestCompile project(":geode-dunit")
125+
upgradeTestCompile (project(":geode-dunit")) {
126+
exclude module: 'geode-core'
127+
}
126128
// TODO refactor out common test framework
127129
upgradeTestCompile sourceSets.distributedTest.output
128130
upgradeTestCompile sourceSets.test.output

geode-core/build.gradle

+6-2
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,9 @@ dependencies {
158158
testRuntime 'com.pholser:junit-quickcheck-generators:' + project.'junit-quickcheck.version'
159159

160160

161-
integrationTestCompile project(":geode-dunit")
161+
integrationTestCompile (project(":geode-dunit")) {
162+
exclude module: 'geode-core'
163+
}
162164
integrationTestCompile project(':geode-concurrency-test')
163165
integrationTestCompile 'redis.clients:jedis:' + project.'jedis.version'
164166
integrationTestCompile 'org.apache.bcel:bcel:' + project.'bcel.version'
@@ -178,7 +180,9 @@ dependencies {
178180
distributedTestRuntime 'org.apache.derby:derby:' + project.'derby.version'
179181

180182

181-
upgradeTestCompile project(":geode-dunit")
183+
upgradeTestCompile (project(":geode-dunit")) {
184+
exclude module: 'geode-core'
185+
}
182186

183187

184188
performanceTestCompile project(":geode-junit")

geode-cq/build.gradle

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,7 @@ dependencies {
2323

2424
integrationTestCompile project(":geode-dunit")
2525

26-
upgradeTestCompile project(":geode-dunit")
26+
upgradeTestCompile (project(":geode-dunit")) {
27+
exclude module: 'geode-core'
28+
}
2729
}

geode-dunit/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717

1818
dependencies {
19-
compileOnly project(':geode-core')
19+
compile project(':geode-core')
2020
//compileOnly files("${System.getProperty('java.home')}/../lib/tools.jar")
2121

2222
compile project(':geode-junit')

geode-lucene/build.gradle

+22-20
Original file line numberDiff line numberDiff line change
@@ -16,36 +16,38 @@
1616
*/
1717

1818
dependencies {
19-
compile project(':geode-core')
20-
compile project(':geode-common')
21-
compile 'org.apache.lucene:lucene-analyzers-common:' + project.'lucene.version'
22-
compile ('org.apache.lucene:lucene-queryparser:' + project.'lucene.version') {
23-
exclude module: 'lucene-sandbox'
24-
}
19+
compile project(':geode-core')
20+
compile project(':geode-common')
21+
compile 'org.apache.lucene:lucene-analyzers-common:' + project.'lucene.version'
22+
compile ('org.apache.lucene:lucene-queryparser:' + project.'lucene.version') {
23+
exclude module: 'lucene-sandbox'
24+
}
2525

26-
runtime 'org.apache.lucene:lucene-analyzers-phonetic:' + project.'lucene.version'
26+
runtime 'org.apache.lucene:lucene-analyzers-phonetic:' + project.'lucene.version'
2727

28-
testCompile project(':geode-junit')
29-
testCompile project(':geode-lucene/geode-lucene-test')
30-
testCompile 'org.apache.lucene:lucene-test-framework:' + project.'lucene.version'
31-
testCompile 'com.pholser:junit-quickcheck-generators:' + project.'junit-quickcheck.version'
28+
testCompile project(':geode-junit')
29+
testCompile project(':geode-lucene/geode-lucene-test')
30+
testCompile 'org.apache.lucene:lucene-test-framework:' + project.'lucene.version'
31+
testCompile 'com.pholser:junit-quickcheck-generators:' + project.'junit-quickcheck.version'
3232

3333

34-
integrationTestCompile project(":geode-dunit")
35-
integrationTestCompile project(':geode-lucene/geode-lucene-test')
36-
integrationTestCompile 'org.apache.lucene:lucene-analyzers-phonetic:' + project.'lucene.version'
37-
integrationTestCompile 'pl.pragmatists:JUnitParams:' + project.'JUnitParams.version'
34+
integrationTestCompile project(":geode-dunit")
35+
integrationTestCompile project(':geode-lucene/geode-lucene-test')
36+
integrationTestCompile 'org.apache.lucene:lucene-analyzers-phonetic:' + project.'lucene.version'
37+
integrationTestCompile 'pl.pragmatists:JUnitParams:' + project.'JUnitParams.version'
3838

3939

40-
distributedTestCompile project(':geode-lucene/geode-lucene-test')
41-
distributedTestCompile 'pl.pragmatists:JUnitParams:' + project.'JUnitParams.version'
40+
distributedTestCompile project(':geode-lucene/geode-lucene-test')
41+
distributedTestCompile 'pl.pragmatists:JUnitParams:' + project.'JUnitParams.version'
4242

4343

44-
upgradeTestCompile project(":geode-dunit")
44+
upgradeTestCompile (project(":geode-dunit")) {
45+
exclude module: 'geode-core'
46+
}
4547

4648

47-
performanceTestCompile project(":geode-junit")
48-
performanceTestCompile project(':geode-lucene/geode-lucene-test')
49+
performanceTestCompile project(":geode-junit")
50+
performanceTestCompile project(':geode-lucene/geode-lucene-test')
4951
}
5052

5153
//The lucene integration tests don't have any issues that requiring forking

geode-protobuf/build.gradle

+9-9
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@
1616
*/
1717

1818
dependencies {
19-
compileOnly project(':geode-core')
20-
compile project(':geode-protobuf-messages')
21-
compile 'com.google.protobuf:protobuf-java:' + project.'protobuf-java.version'
19+
compileOnly project(':geode-core')
20+
compile project(':geode-protobuf-messages')
21+
compile 'com.google.protobuf:protobuf-java:' + project.'protobuf-java.version'
2222

2323

24-
testCompile project(':geode-core')
25-
testCompile project(':geode-junit')
26-
testCompile project(":geode-protobuf/geode-protobuf-test")
24+
testCompile project(':geode-core')
25+
testCompile project(':geode-junit')
26+
testCompile project(":geode-protobuf/geode-protobuf-test")
2727

2828

29-
integrationTestCompile project(":geode-dunit")
30-
integrationTestCompile project(":geode-protobuf/geode-protobuf-test")
29+
integrationTestCompile project(":geode-dunit")
30+
integrationTestCompile project(":geode-protobuf/geode-protobuf-test")
3131

32-
distributedTestCompile project(":geode-protobuf/geode-protobuf-test")
32+
distributedTestCompile project(":geode-protobuf/geode-protobuf-test")
3333
}

geode-wan/build.gradle

+3-5
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,14 @@
1818
dependencies {
1919
compileOnly project(':geode-core')
2020

21-
2221
testCompile project(':geode-core')
2322
testCompile project(':geode-junit')
2423

25-
2624
integrationTestCompile project(":geode-junit")
2725

28-
2926
distributedTestCompile 'pl.pragmatists:JUnitParams:' + project.'JUnitParams.version'
3027

31-
32-
upgradeTestCompile project(":geode-dunit")
28+
upgradeTestCompile (project(":geode-dunit")) {
29+
exclude module: 'geode-core'
30+
}
3331
}

geode-web/build.gradle

+3-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,9 @@ dependencies {
7272
exclude module: 'spring-aop'
7373
}
7474

75-
76-
upgradeTestCompile project(":geode-dunit")
75+
upgradeTestCompile (project(":geode-dunit")) {
76+
exclude module: 'geode-core'
77+
}
7778
}
7879

7980
//Remove the gradle output directories from the eclipse classpath. These

0 commit comments

Comments
 (0)