GEODE-3: small java 9 compatibility fixes

Co-authored-by: Owen Nichols <onichols@pivotal.io> * upgrade library to be java9 compatible to fix running tomcat7sessionJUnitTest in java9 * fix InstallerJUnitTest * fix DeprecatedAgentLauncherIntegrationTest (only include -d64 in ProcessWrapper for Solaris machines) * PowerMock needs to ignore more modules in PulseControllerJunitTest in java9
apache · Sep 15, 2018 · 68f81f6 · 68f81f6
1 parent 9c6ae18
commit 68f81f6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/...c/integrationTest/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java b/...c/integrationTest/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.modules.session.installer;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -55,7 +55,7 @@ private void testTransformation(final String name) throws Exception {
         .replaceAll(IOUtils.LINE_SEPARATOR_WINDOWS, "").replaceAll(IOUtils.LINE_SEPARATOR_UNIX, "");
     String actual = output.toString().replaceAll(IOUtils.LINE_SEPARATOR_WINDOWS, "")
         .replaceAll(IOUtils.LINE_SEPARATOR_UNIX, "");
-    assertEquals(expected, actual);
+    assertThat(actual).isEqualToIgnoringWhitespace(expected);
   }
 
 }
diff --git a/geode-core/src/test/java/org/apache/geode/test/process/ProcessWrapper.java b/geode-core/src/test/java/org/apache/geode/test/process/ProcessWrapper.java
@@ -391,7 +391,7 @@ private String[] defineCommand(final String[] jvmArguments, String workingDir)
 
     // -d64 is not a valid option for windows and results in failure
     final int bits = Integer.getInteger("sun.arch.data.model", 0).intValue();
-    if (bits == 64 && !(System.getProperty("os.name").toLowerCase().contains("windows"))) {
+    if (bits == 64 && (System.getProperty("os.name").toLowerCase().contains("solaris"))) {
       argumentList.add("-d64");
     }
 

diff --git a/...tegrationTest/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java b/...tegrationTest/java/org/apache/geode/tools/pulse/controllers/PulseControllerJUnitTest.java
@@ -69,7 +69,7 @@
 @PowerMockRunnerDelegate(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
 @ContextConfiguration("classpath*:mvc-dispatcher-servlet.xml")
-@PowerMockIgnore("javax.management.*")
+@PowerMockIgnore({"javax.management.*", "javax.xml.*", "org.xml.*", "org.w3c.*"})
 public class PulseControllerJUnitTest {
 
   private static final String PRINCIPAL_USER = "test-user";

diff --git a/gradle/dependency-versions.properties b/gradle/dependency-versions.properties
@@ -101,6 +101,6 @@ tempus-fugit.version = 1.1
 # Multiple versions of tomcat are hard-coded in geode-assembly:test
 # at o.a.g.session.tests.TomcatInstall
 tomcat6.version = 6.0.37
-tomcat7.version = 7.0.73
-tomcat8.version = 8.5.9
+tomcat7.version = 7.0.90
+tomcat8.version = 8.5.33
 xercesImpl.version = 2.12.0