Update java version support

Although the newer versions are marketed as simple versions, scons will
see them as dotted versions: 9.0, 10.0.  Add some comments to this in
test code - the RMI test skip ought to work as long as they stay dotted
versions (since 10.0 >= 1.8); that code does run the test for a simple
version like '6'.

Signed-off-by: Mats Wichmann <mats@linux.com>

2 files changed, 8 insertions, 0 deletions

diff --git a/test/Java/RMIC.py b/test/Java/RMIC.py
index b29a466..19e799e 100644
--- a/test/Java/RMIC.py
+++ b/test/Java/RMIC.py
@@ -108,6 +108,10 @@ if java_version.count('.') == 1:
 # If it's 1.8 or higher, we skip the further RMIC test
 # because we'll get warnings about the deprecated API...
 # it's just not state-of-the-art anymore.
+# Recent java versions (9 and greater) are back to being
+# marketed as a simple version, but java_where_javac() will
+# still return a dotted version, like 10.0. If this changes,
+# will need to rework this rule.
 # Note, how we allow simple version strings like "5" and
 # "6" to successfully pass this test.
 if curver < (1, 8):
diff --git a/test/Repository/RMIC.py b/test/Repository/RMIC.py
index e08c716..433890f 100644
--- a/test/Repository/RMIC.py
+++ b/test/Repository/RMIC.py
@@ -51,6 +51,10 @@ if java_version.count('.') == 1:
 # If it's 1.8 or higher, we skip the further RMIC test
 # because we'll get warnings about the deprecated API...
 # it's just not state-of-the-art anymore.
+# Recent java versions (9 and greater) are back to being
+# marketed as a simple version, but java_where_javac() will
+# still return a dotted version, like 10.0. If this changes,
+# will need to rework this rule.
 # Note, how we allow simple version strings like "5" and
 # "6" to successfully pass this test.
 if curver >= (1, 8):