You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by je...@apache.org on 2018/08/15 17:01:00 UTC
[geode] branch develop updated: GEODE-5530: Add geode-core project
to distributedTestRuntimeOnly (#2322)
This is an automated email from the ASF dual-hosted git repository.
jensdeppe 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 846a58c GEODE-5530: Add geode-core project to distributedTestRuntimeOnly (#2322)
846a58c is described below
commit 846a58cb02914c2b18c357ff556df285eb78981c
Author: Jens Deppe <jd...@pivotal.io>
AuthorDate: Wed Aug 15 10:00:55 2018 -0700
GEODE-5530: Add geode-core project to distributedTestRuntimeOnly (#2322)
* AnalyzeSerializablesJUnitTest should be an integrationTest
---
geode-assembly/build.gradle | 4 ++-
geode-core/build.gradle | 8 +++--
.../AnalyzeSerializablesJUnitTest.java | 0
geode-cq/build.gradle | 4 ++-
geode-dunit/build.gradle | 2 +-
geode-lucene/build.gradle | 42 +++++++++++-----------
geode-protobuf/build.gradle | 18 +++++-----
geode-wan/build.gradle | 8 ++---
geode-web/build.gradle | 5 +--
9 files changed, 50 insertions(+), 41 deletions(-)
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 84b2aa7..40e42a6 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -122,7 +122,9 @@ dependencies {
upgradeTestCompile project(':geode-core')
- upgradeTestCompile project(":geode-dunit")
+ upgradeTestCompile (project(":geode-dunit")) {
+ exclude module: 'geode-core'
+ }
// TODO refactor out common test framework
upgradeTestCompile sourceSets.distributedTest.output
upgradeTestCompile sourceSets.test.output
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index 5ce12fb..27beed4 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -158,7 +158,9 @@ dependencies {
testRuntime 'com.pholser:junit-quickcheck-generators:' + project.'junit-quickcheck.version'
- integrationTestCompile project(":geode-dunit")
+ integrationTestCompile (project(":geode-dunit")) {
+ exclude module: 'geode-core'
+ }
integrationTestCompile project(':geode-concurrency-test')
integrationTestCompile 'redis.clients:jedis:' + project.'jedis.version'
integrationTestCompile 'org.apache.bcel:bcel:' + project.'bcel.version'
@@ -178,7 +180,9 @@ dependencies {
distributedTestRuntime 'org.apache.derby:derby:' + project.'derby.version'
- upgradeTestCompile project(":geode-dunit")
+ upgradeTestCompile (project(":geode-dunit")) {
+ exclude module: 'geode-core'
+ }
performanceTestCompile project(":geode-junit")
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
similarity index 100%
rename from geode-core/src/distributedTest/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
rename to geode-core/src/integrationTest/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
diff --git a/geode-cq/build.gradle b/geode-cq/build.gradle
index 9d0b77b..dd4c128 100644
--- a/geode-cq/build.gradle
+++ b/geode-cq/build.gradle
@@ -23,5 +23,7 @@ dependencies {
integrationTestCompile project(":geode-dunit")
- upgradeTestCompile project(":geode-dunit")
+ upgradeTestCompile (project(":geode-dunit")) {
+ exclude module: 'geode-core'
+ }
}
diff --git a/geode-dunit/build.gradle b/geode-dunit/build.gradle
index 9900487..c89be8c 100755
--- a/geode-dunit/build.gradle
+++ b/geode-dunit/build.gradle
@@ -16,7 +16,7 @@
*/
dependencies {
- compileOnly project(':geode-core')
+ compile project(':geode-core')
//compileOnly files("${System.getProperty('java.home')}/../lib/tools.jar")
compile project(':geode-junit')
diff --git a/geode-lucene/build.gradle b/geode-lucene/build.gradle
index cdab867..6d943cd 100644
--- a/geode-lucene/build.gradle
+++ b/geode-lucene/build.gradle
@@ -16,36 +16,38 @@
*/
dependencies {
- compile project(':geode-core')
- compile project(':geode-common')
- compile 'org.apache.lucene:lucene-analyzers-common:' + project.'lucene.version'
- compile ('org.apache.lucene:lucene-queryparser:' + project.'lucene.version') {
- exclude module: 'lucene-sandbox'
- }
+ compile project(':geode-core')
+ compile project(':geode-common')
+ compile 'org.apache.lucene:lucene-analyzers-common:' + project.'lucene.version'
+ compile ('org.apache.lucene:lucene-queryparser:' + project.'lucene.version') {
+ exclude module: 'lucene-sandbox'
+ }
- runtime 'org.apache.lucene:lucene-analyzers-phonetic:' + project.'lucene.version'
+ runtime 'org.apache.lucene:lucene-analyzers-phonetic:' + project.'lucene.version'
- testCompile project(':geode-junit')
- testCompile project(':geode-lucene/geode-lucene-test')
- testCompile 'org.apache.lucene:lucene-test-framework:' + project.'lucene.version'
- testCompile 'com.pholser:junit-quickcheck-generators:' + project.'junit-quickcheck.version'
+ testCompile project(':geode-junit')
+ testCompile project(':geode-lucene/geode-lucene-test')
+ testCompile 'org.apache.lucene:lucene-test-framework:' + project.'lucene.version'
+ testCompile 'com.pholser:junit-quickcheck-generators:' + project.'junit-quickcheck.version'
- integrationTestCompile project(":geode-dunit")
- integrationTestCompile project(':geode-lucene/geode-lucene-test')
- integrationTestCompile 'org.apache.lucene:lucene-analyzers-phonetic:' + project.'lucene.version'
- integrationTestCompile 'pl.pragmatists:JUnitParams:' + project.'JUnitParams.version'
+ integrationTestCompile project(":geode-dunit")
+ integrationTestCompile project(':geode-lucene/geode-lucene-test')
+ integrationTestCompile 'org.apache.lucene:lucene-analyzers-phonetic:' + project.'lucene.version'
+ integrationTestCompile 'pl.pragmatists:JUnitParams:' + project.'JUnitParams.version'
- distributedTestCompile project(':geode-lucene/geode-lucene-test')
- distributedTestCompile 'pl.pragmatists:JUnitParams:' + project.'JUnitParams.version'
+ distributedTestCompile project(':geode-lucene/geode-lucene-test')
+ distributedTestCompile 'pl.pragmatists:JUnitParams:' + project.'JUnitParams.version'
- upgradeTestCompile project(":geode-dunit")
+ upgradeTestCompile (project(":geode-dunit")) {
+ exclude module: 'geode-core'
+ }
- performanceTestCompile project(":geode-junit")
- performanceTestCompile project(':geode-lucene/geode-lucene-test')
+ performanceTestCompile project(":geode-junit")
+ performanceTestCompile project(':geode-lucene/geode-lucene-test')
}
//The lucene integration tests don't have any issues that requiring forking
diff --git a/geode-protobuf/build.gradle b/geode-protobuf/build.gradle
index d319b97..73be98a 100644
--- a/geode-protobuf/build.gradle
+++ b/geode-protobuf/build.gradle
@@ -16,18 +16,18 @@
*/
dependencies {
- compileOnly project(':geode-core')
- compile project(':geode-protobuf-messages')
- compile 'com.google.protobuf:protobuf-java:' + project.'protobuf-java.version'
+ compileOnly project(':geode-core')
+ compile project(':geode-protobuf-messages')
+ compile 'com.google.protobuf:protobuf-java:' + project.'protobuf-java.version'
- testCompile project(':geode-core')
- testCompile project(':geode-junit')
- testCompile project(":geode-protobuf/geode-protobuf-test")
+ testCompile project(':geode-core')
+ testCompile project(':geode-junit')
+ testCompile project(":geode-protobuf/geode-protobuf-test")
- integrationTestCompile project(":geode-dunit")
- integrationTestCompile project(":geode-protobuf/geode-protobuf-test")
+ integrationTestCompile project(":geode-dunit")
+ integrationTestCompile project(":geode-protobuf/geode-protobuf-test")
- distributedTestCompile project(":geode-protobuf/geode-protobuf-test")
+ distributedTestCompile project(":geode-protobuf/geode-protobuf-test")
}
diff --git a/geode-wan/build.gradle b/geode-wan/build.gradle
index 1d325ff..c7e20a3 100644
--- a/geode-wan/build.gradle
+++ b/geode-wan/build.gradle
@@ -18,16 +18,14 @@
dependencies {
compileOnly project(':geode-core')
-
testCompile project(':geode-core')
testCompile project(':geode-junit')
-
integrationTestCompile project(":geode-junit")
-
distributedTestCompile 'pl.pragmatists:JUnitParams:' + project.'JUnitParams.version'
-
- upgradeTestCompile project(":geode-dunit")
+ upgradeTestCompile (project(":geode-dunit")) {
+ exclude module: 'geode-core'
+ }
}
diff --git a/geode-web/build.gradle b/geode-web/build.gradle
index abd35be..3935613 100755
--- a/geode-web/build.gradle
+++ b/geode-web/build.gradle
@@ -72,8 +72,9 @@ dependencies {
exclude module: 'spring-aop'
}
-
- upgradeTestCompile project(":geode-dunit")
+ upgradeTestCompile (project(":geode-dunit")) {
+ exclude module: 'geode-core'
+ }
}
//Remove the gradle output directories from the eclipse classpath. These