Repository: geode Updated Branches: refs/heads/release/1.2.0 00a066b6b -> 40fdc5d33
Revert "Revert "GEODE-3139 remove current artifacts from classpath of backward-compatibility tests"" This reverts commit 9f55eb12551488ca77cfb2a11283cf8f33657938. Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/40fdc5d3 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/40fdc5d3 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/40fdc5d3 Branch: refs/heads/release/1.2.0 Commit: 40fdc5d336b085063d45e12a0227fb247c2e51fc Parents: 00a066b Author: Bruce Schuchardt <bschucha...@pivotal.io> Authored: Wed Jul 5 08:30:32 2017 -0700 Committer: Bruce Schuchardt <bschucha...@pivotal.io> Committed: Wed Jul 5 08:30:32 2017 -0700 ---------------------------------------------------------------------- .../geode/test/dunit/cache/internal/JUnit3CacheTestCase.java | 2 +- .../geode/test/dunit/cache/internal/JUnit4CacheTestCase.java | 2 +- .../java/org/apache/geode/test/dunit/standalone/ChildVM.java | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/40fdc5d3/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit3CacheTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit3CacheTestCase.java b/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit3CacheTestCase.java index 917361f..73d4042 100644 --- a/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit3CacheTestCase.java +++ b/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit3CacheTestCase.java @@ -101,7 +101,7 @@ public abstract class JUnit3CacheTestCase extends JUnit3DistributedTestCase * * @since GemFire 6.5 */ - public final InternalClientCache getClientCache(final ClientCacheFactory factory) { + public final ClientCache getClientCache(final ClientCacheFactory factory) { return delegate.getClientCache(factory); } http://git-wip-us.apache.org/repos/asf/geode/blob/40fdc5d3/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java b/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java index 8629749..bf77be3 100644 --- a/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java +++ b/geode-core/src/test/java/org/apache/geode/test/dunit/cache/internal/JUnit4CacheTestCase.java @@ -290,7 +290,7 @@ public abstract class JUnit4CacheTestCase extends JUnit4DistributedTestCase * * @since GemFire 6.5 */ - public final InternalClientCache getClientCache(final ClientCacheFactory factory) { + public final ClientCache getClientCache(final ClientCacheFactory factory) { synchronized (JUnit4CacheTestCase.class) { final GemFireCacheImpl gemFireCache = GemFireCacheImpl.getInstance(); if (gemFireCache != null && !gemFireCache.isClosed() http://git-wip-us.apache.org/repos/asf/geode/blob/40fdc5d3/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ChildVM.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ChildVM.java b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ChildVM.java index 634e09f..d54f3d0 100644 --- a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ChildVM.java +++ b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ChildVM.java @@ -17,6 +17,7 @@ package org.apache.geode.test.dunit.standalone; import java.rmi.Naming; import org.apache.geode.internal.OSProcess; +import org.apache.geode.internal.Version; import org.apache.geode.internal.logging.LogService; import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; @@ -48,7 +49,8 @@ public class ChildVM { int pid = OSProcess.getId(); logger.info("VM" + vmNum + " is launching" + (pid > 0 ? " with PID " + pid : "")); if (!VersionManager.isCurrentVersion(geodeVersion)) { - logger.info("This VM is using Geode version {}", geodeVersion); + logger.info("This VM is using Geode version {}. Version.CURRENT is {}", geodeVersion, + Version.CURRENT); } MasterRemote holder = (MasterRemote) Naming .lookup("//localhost:" + namingPort + "/" + DUnitLauncher.MASTER_PARAM);
