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/04/03 23:01:00 UTC
[geode] branch develop updated: GEODE-4972: Move VersionManager to
geode-old-versions module (#1703)
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 31b51bd GEODE-4972: Move VersionManager to geode-old-versions module (#1703)
31b51bd is described below
commit 31b51bddb66f7605bbe70b30b648b3d78a797604
Author: Jens Deppe <jd...@pivotal.io>
AuthorDate: Tue Apr 3 16:00:55 2018 -0700
GEODE-4972: Move VersionManager to geode-old-versions module (#1703)
- This will facilitate other modules being able to use VersionManager;
specifically geode-junit.
---
extensions/geode-modules-tomcat8/build.gradle | 1 +
geode-core/build.gradle | 3 ++-
geode-old-client-support/build.gradle | 1 +
geode-old-versions/build.gradle | 4 ++++
.../java/org/apache/geode/test/dunit/standalone/VersionManager.java | 4 +---
.../apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java | 3 +--
geode-protobuf/build.gradle | 1 +
geode-web/build.gradle | 1 +
8 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/extensions/geode-modules-tomcat8/build.gradle b/extensions/geode-modules-tomcat8/build.gradle
index e26123f..b60e458 100644
--- a/extensions/geode-modules-tomcat8/build.gradle
+++ b/extensions/geode-modules-tomcat8/build.gradle
@@ -41,6 +41,7 @@ dependencies {
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)
eclipse.classpath.file {
whenMerged { classpath ->
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index 426840f..3adeebb 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -131,7 +131,8 @@ dependencies {
jcaCompile sourceSets.main.output
testCompile project(':geode-junit')
- testCompile project(':geode-old-versions')
+
+ testCompile files(project(':geode-old-versions').sourceSets.main.output)
// Test Dependencies
// External
diff --git a/geode-old-client-support/build.gradle b/geode-old-client-support/build.gradle
index ebbb949..f5d967a 100644
--- a/geode-old-client-support/build.gradle
+++ b/geode-old-client-support/build.gradle
@@ -22,4 +22,5 @@ dependencies {
testCompile project(':geode-junit')
testCompile files(project(':geode-core').sourceSets.test.output)
+ testCompile files(project(':geode-old-versions').sourceSets.main.output)
}
diff --git a/geode-old-versions/build.gradle b/geode-old-versions/build.gradle
index 1618f6e..c394630 100644
--- a/geode-old-versions/build.gradle
+++ b/geode-old-versions/build.gradle
@@ -20,6 +20,10 @@ disableMavenPublishing()
project.ext.installs = new Properties();
+dependencies {
+ testCompile project(":geode-junit")
+}
+
def addOldVersion(def source, def geodeVersion, def downloadInstall) {
sourceSets.create(source, {
compileClasspath += configurations.provided
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManager.java b/geode-old-versions/src/main/java/org/apache/geode/test/dunit/standalone/VersionManager.java
similarity index 98%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManager.java
rename to geode-old-versions/src/main/java/org/apache/geode/test/dunit/standalone/VersionManager.java
index f13718b..a601bfd 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManager.java
+++ b/geode-old-versions/src/main/java/org/apache/geode/test/dunit/standalone/VersionManager.java
@@ -26,15 +26,13 @@ import java.util.Optional;
import java.util.Properties;
import java.util.function.BiConsumer;
-import org.apache.geode.test.dunit.Host;
-
/**
* VersionManager loads the class-paths for all of the releases of Geode configured for
* backward-compatibility testing in the geode-core build.gradle file.
* <p>
* Tests may use these versions in launching VMs to run older clients or servers.
*
- * @see Host#getVM(String, int)
+ * see Host.getVM(String, int)
*/
public class VersionManager {
public static final String CURRENT_VERSION = "000";
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java b/geode-old-versions/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java
similarity index 94%
rename from geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java
rename to geode-old-versions/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java
index 94027e6..b01d570 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java
+++ b/geode-old-versions/src/test/java/org/apache/geode/test/dunit/standalone/VersionManagerJUnitTest.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.test.dunit.standalone;
-import static org.apache.geode.internal.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.junit.Assert;
@@ -45,6 +44,6 @@ public class VersionManagerJUnitTest {
@Test
public void managerIsAbleToFindVersions() throws Exception {
VersionManager instance = VersionManager.getInstance();
- assertTrue(instance.getVersionsWithoutCurrent().size() > 0);
+ Assert.assertTrue(instance.getVersionsWithoutCurrent().size() > 0);
}
}
diff --git a/geode-protobuf/build.gradle b/geode-protobuf/build.gradle
index c1eed05..52f67bf 100644
--- a/geode-protobuf/build.gradle
+++ b/geode-protobuf/build.gradle
@@ -27,4 +27,5 @@ dependencies {
testCompile 'org.powermock:powermock-api-mockito:' + project.'powermock.version'
compile 'com.google.protobuf:protobuf-java:' + project.'protobuf-java.version'
+ testCompile files(project(':geode-old-versions').sourceSets.main.output)
}
diff --git a/geode-web/build.gradle b/geode-web/build.gradle
index d6de656..f21d7c8 100755
--- a/geode-web/build.gradle
+++ b/geode-web/build.gradle
@@ -59,6 +59,7 @@ dependencies {
testCompile 'com.pholser:junit-quickcheck-guava:' + project.'junit-quickcheck.version'
testRuntime files(war.destinationDir)
+ testCompile files(project(':geode-old-versions').sourceSets.main.output)
}
//Remove the gradle output directories from the eclipse classpath. These
--
To stop receiving notification emails like this one, please contact
jensdeppe@apache.org.