Default build is JDK-17, prepare up to Java-21 (next LTS); PlatformPropsImpl: Remove static OSXVersion and Version* vars, add JAVA_17 and JAVA_21 flag.

PlatformPropsImpl's static OSXVersion is JOGL specific and will be moved into its GLContextImpl.

PlatformPropsImpl's static Version are not required and eats up memory where it can be used transitionary.

1 files changed, 11 insertions, 3 deletions

diff --git a/src/java/com/jogamp/common/util/VersionUtil.java b/src/java/com/jogamp/common/util/VersionUtil.java
index 1e09034..eee3c4e 100644
--- a/src/java/com/jogamp/common/util/VersionUtil.java
+++ b/src/java/com/jogamp/common/util/VersionUtil.java
@@ -73,9 +73,17 @@ public class VersionUtil {
         sb.append("Platform: Java Version: ").append(Platform.getJavaVersion()).append(" (").append(Platform.getJavaVersionNumber()).append("u").append(PlatformPropsImpl.JAVA_VERSION_UPDATE).append("), VM: ").append(Platform.getJavaVMName());
         sb.append(", Runtime: ").append(Platform.getJavaRuntimeName()).append(Platform.getNewline());
         sb.append("Platform: Java Vendor: ").append(Platform.getJavaVendor()).append(", ").append(Platform.getJavaVendorURL());
-        sb.append(", JavaSE: ").append(PlatformPropsImpl.JAVA_SE);
-        sb.append(", Java9: ").append(PlatformPropsImpl.JAVA_9);
-        sb.append(", Java6: ").append(PlatformPropsImpl.JAVA_6);
+        if( PlatformPropsImpl.JAVA_21 ) {
+            sb.append(", Java21");
+        } else if( PlatformPropsImpl.JAVA_17 ) {
+            sb.append(", Java17");
+        } else if( PlatformPropsImpl.JAVA_9 ) {
+            sb.append(", Java9");
+        } else if( PlatformPropsImpl.JAVA_6 ) {
+            sb.append(", Java6");
+        } else if( PlatformPropsImpl.JAVA_SE ) {
+            sb.append(", JavaSE");
+        }
         sb.append(", dynamicLib: ").append(PlatformPropsImpl.useDynamicLibraries);
         sb.append(", AWT enabled: ").append(Platform.AWT_AVAILABLE);
         sb.append(Platform.getNewline()).append(SEPERATOR);