You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by on...@apache.org on 2020/04/01 16:18:56 UTC
[geode] branch support/1.12 updated: GEODE-7937: fix
Tomcat8ClientServerRollingUpgradeTest to get product version correctly
(#4890)
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch support/1.12
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.12 by this push:
new 448050d GEODE-7937: fix Tomcat8ClientServerRollingUpgradeTest to get product version correctly (#4890)
448050d is described below
commit 448050da8c73a42f2e9eae075199d5d3761da111
Author: Owen Nichols <34...@users.noreply.github.com>
AuthorDate: Wed Apr 1 09:18:34 2020 -0700
GEODE-7937: fix Tomcat8ClientServerRollingUpgradeTest to get product version correctly (#4890)
(cherry picked from commit 9a6b225aee6020c86850a9ffc0e6cf07cc5d3d81)
---
.../geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java b/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java
index 33e1da3..ec6c39c 100644
--- a/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java
+++ b/geode-assembly/src/upgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java
@@ -35,8 +35,8 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.internal.GemFireVersion;
import org.apache.geode.internal.UniquePortSupplier;
-import org.apache.geode.internal.serialization.Version;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.management.internal.i18n.CliStrings;
import org.apache.geode.test.junit.categories.BackwardCompatibilityTest;
@@ -324,7 +324,7 @@ public class Tomcat8ClientServerRollingUpgradeTest {
* @return Paths to required jars
*/
private String getClassPathTomcat8AndCurrentModules() {
- String currentVersion = Version.CURRENT.getName();
+ String currentVersion = GemFireVersion.getGemFireVersion();
final String[] requiredClasspathJars = {
"/lib/geode-modules-" + currentVersion + ".jar",