geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [geode] branch develop updated: GEODE-5530: Creates extensions/geode-module-test (#2313)
Date Tue, 14 Aug 2018 17:03:53 GMT
This is an automated email from the ASF dual-hosted git repository.

jbarrett 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 34ce6cd  GEODE-5530: Creates extensions/geode-module-test (#2313)
34ce6cd is described below

commit 34ce6cd36773782a0d4b9a8fab8961b2e1ebd2c2
Author: Jacob Barrett <jbarrett@pivotal.io>
AuthorDate: Tue Aug 14 10:03:48 2018 -0700

    GEODE-5530: Creates extensions/geode-module-test (#2313)
---
 .../build.gradle                                    | 21 +++++++--------------
 .../org/apache/geode/modules/session/Callback.java  |  0
 .../geode/modules/session/CommandServlet.java       |  0
 .../geode/modules/session/EmbeddedTomcat.java       |  0
 .../apache/geode/modules/session/QueryCommand.java  |  0
 .../geode/modules/session/TestSessionsBase.java     |  0
 extensions/geode-modules-tomcat7/build.gradle       |  5 +----
 extensions/geode-modules-tomcat8/build.gradle       | 16 +---------------
 extensions/geode-modules/build.gradle               |  8 +++-----
 settings.gradle                                     |  1 +
 10 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/extensions/geode-modules/build.gradle b/extensions/geode-modules-test/build.gradle
similarity index 61%
copy from extensions/geode-modules/build.gradle
copy to extensions/geode-modules-test/build.gradle
index 67dc91f..3084802 100644
--- a/extensions/geode-modules/build.gradle
+++ b/extensions/geode-modules-test/build.gradle
@@ -15,26 +15,19 @@
  * limitations under the License.
  */
 
-evaluationDependsOn(":geode-core")
-
 dependencies {
-  compile project(':geode-core')
-  
-  compile 'org.slf4j:slf4j-api:' + project.'slf4j-api.version'
-  compile ('org.apache.tomcat:catalina-ha:' + project.'tomcat6.version') {
+  compileOnly ('org.apache.tomcat:catalina-ha:' + project.'tomcat6.version') {
     exclude module: 'annotations-api'
     exclude module: 'coyote'
     exclude module: 'tribes'
   }
-  compile 'org.apache.tomcat:juli:' + project.'tomcat6.version'
-
-  testCompile project(':geode-junit')
 
-  testCompile 'org.apache.bcel:bcel:' + project.'bcel.version'
-
-  integrationTestCompile project(":geode-dunit")
-  integrationTestCompile 'org.httpunit:httpunit:' + project.'httpunit.version'
-  integrationTestCompile 'org.apache.tomcat:coyote:' + project.'tomcat6.version'
+  compile(project(':extensions/geode-modules')) {
+    // Remove everything related to Tomcat 6.x
+    exclude group: 'org.apache.tomcat'
+  }
+  compile project(':geode-junit')
+  compile 'org.httpunit:httpunit:' + project.'httpunit.version'
 }
 
 disableMavenPublishing()
diff --git a/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/Callback.java
b/extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/Callback.java
similarity index 100%
rename from extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/Callback.java
rename to extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/Callback.java
diff --git a/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/CommandServlet.java
b/extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/CommandServlet.java
similarity index 100%
rename from extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/CommandServlet.java
rename to extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/CommandServlet.java
diff --git a/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/EmbeddedTomcat.java
b/extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/EmbeddedTomcat.java
similarity index 100%
rename from extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/EmbeddedTomcat.java
rename to extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/EmbeddedTomcat.java
diff --git a/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/QueryCommand.java
b/extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/QueryCommand.java
similarity index 100%
rename from extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/QueryCommand.java
rename to extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/QueryCommand.java
diff --git a/extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/TestSessionsBase.java
b/extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/TestSessionsBase.java
similarity index 100%
rename from extensions/geode-modules/src/integrationTest/java/org/apache/geode/modules/session/TestSessionsBase.java
rename to extensions/geode-modules-test/src/main/java/org/apache/geode/modules/session/TestSessionsBase.java
diff --git a/extensions/geode-modules-tomcat7/build.gradle b/extensions/geode-modules-tomcat7/build.gradle
index ef79d3f..e1dd8c7 100644
--- a/extensions/geode-modules-tomcat7/build.gradle
+++ b/extensions/geode-modules-tomcat7/build.gradle
@@ -33,10 +33,7 @@ dependencies {
   compile 'org.apache.tomcat:tomcat-juli:' + project.'tomcat7.version'
 
   integrationTestCompile project(":geode-dunit")
-  integrationTestCompile 'org.httpunit:httpunit:' + project.'httpunit.version'
-
-  // TODO fix test dependency on other projects
-  integrationTestCompile files(project(':extensions/geode-modules').sourceSets.integrationTest.output)
+  integrationTestCompile project(":extensions/geode-modules-test")
 
   integrationTestRuntime 'javax.annotation:jsr250-api:' + project.'javax.jsr250-api.version'
   integrationTestRuntime 'javax.ejb:ejb-api:' + project.'javax.ejb-api.version'
diff --git a/extensions/geode-modules-tomcat8/build.gradle b/extensions/geode-modules-tomcat8/build.gradle
index e98a90d..75fd1af 100644
--- a/extensions/geode-modules-tomcat8/build.gradle
+++ b/extensions/geode-modules-tomcat8/build.gradle
@@ -32,21 +32,7 @@ dependencies {
   compile 'org.apache.tomcat:tomcat-juli:' + project.'tomcat8.version'
   compile 'javax.servlet:javax.servlet-api:' + '3.1.0'
 
-  testRuntime 'javax.annotation:jsr250-api:' + project.'javax.jsr250-api.version'
-  testRuntime 'javax.ejb:ejb-api:' + project.'javax.ejb-api.version'
-  testRuntime 'org.eclipse.persistence:javax.persistence:' + project.'javax.persistence-api.version'
-  testCompile 'javax.security.auth.message:javax.security.auth.message-api:' + '1.1'
-
-  testCompile project(path: ':geode-junit')
-  testCompile files(project(':geode-core').sourceSets.test.output)
-  testCompile files(project(':extensions/geode-modules').sourceSets.test.output)
-  testCompile files(project(':geode-old-versions').sourceSets.main.output)
-
-  distributedTestCompile project(":geode-dunit")
-  distributedTestCompile 'org.httpunit:httpunit:' + project.'httpunit.version'
-  // TODO remove shared source dependency
-  distributedTestCompile sourceSets.integrationTest.output
-  distributedTestCompile project(':extensions/geode-modules').sourceSets.integrationTest.output
+  distributedTestCompile project(":extensions/geode-modules-test")
 
   eclipse.classpath.file {
     whenMerged { classpath ->
diff --git a/extensions/geode-modules/build.gradle b/extensions/geode-modules/build.gradle
index 67dc91f..3df7a6e 100644
--- a/extensions/geode-modules/build.gradle
+++ b/extensions/geode-modules/build.gradle
@@ -19,7 +19,6 @@ evaluationDependsOn(":geode-core")
 
 dependencies {
   compile project(':geode-core')
-  
   compile 'org.slf4j:slf4j-api:' + project.'slf4j-api.version'
   compile ('org.apache.tomcat:catalina-ha:' + project.'tomcat6.version') {
     exclude module: 'annotations-api'
@@ -28,13 +27,12 @@ dependencies {
   }
   compile 'org.apache.tomcat:juli:' + project.'tomcat6.version'
 
-  testCompile project(':geode-junit')
-
   testCompile 'org.apache.bcel:bcel:' + project.'bcel.version'
 
   integrationTestCompile project(":geode-dunit")
-  integrationTestCompile 'org.httpunit:httpunit:' + project.'httpunit.version'
-  integrationTestCompile 'org.apache.tomcat:coyote:' + project.'tomcat6.version'
+  integrationTestCompile project(":extensions/geode-modules-test")
+
+  integrationTestRuntime 'org.apache.tomcat:coyote:' + project.'tomcat6.version'
 }
 
 disableMavenPublishing()
diff --git a/settings.gradle b/settings.gradle
index fd6150e..689b452 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -33,6 +33,7 @@ include 'geode-wan'
 include 'geode-cq'
 include 'geode-connectors'
 include 'extensions/geode-modules'
+include 'extensions/geode-modules-test'
 include 'extensions/geode-modules-tomcat7'
 include 'extensions/geode-modules-tomcat8'
 include 'extensions/geode-modules-session-internal'


Mime
View raw message