Fixes failing tests on JDK 11+

Some brittle code tests the messages of exceptions etc. in the tests which have changed in JDK11+

Tested with OpenJDK 11 and OpenJDK 15.

1 files changed, 7 insertions, 1 deletions

diff --git a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java
index 3906f6c2..529683ff 100644
--- a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java
+++ b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java
@@ -83,7 +83,13 @@ public class VelTools66TestCase
         /* the testcase is obsolete in JDK 8, as SystemManager.checkMemberAccess is not anymore called
          * by Class.getMethods() */
 
-        int javaVersion = Integer.parseInt(System.getProperty("java.version").split("\\.")[1]);
+        String [] javaVersionFields = System.getProperty("java.version").split("\\.");
+        int javaVersion = Integer.parseInt(javaVersionFields[0]);
+        if (javaVersion == 1)
+        {
+            javaVersion = Integer.parseInt(javaVersionFields[1]);
+        }
+
         if (javaVersion >= 8)
         {
             return;