dependent jogl updated to 2.4.0dev1.7.1

code changed to no longer require Version18 static from Platform

3 files changed, 21 insertions, 6 deletions

diff --git a/pom.xml b/pom.xml
index 1bdecb3..5331554 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@
 	</scm>
 	
 	<properties>
-		<jogamp.version>2.3.2</jogamp.version>
+		<jogamp.version>2.4.0</jogamp.version>
 
 		<!-- NB: Token values for filtering VersionInfo.java. -->
 		<version_base>1.7.1</version_base>
@@ -124,7 +124,20 @@
 		<!-- Deploy to OSS Sonatype repository by default when releasing. -->
 		<releaseProfiles>sonatype-oss-release</releaseProfiles>
 	</properties>
-
+	<repositories>
+          <repository>
+            <id>jogamp-remote</id>
+            <name>jogamp test mirror</name>
+            <url>https://www.jogamp.org/deployment/maven/</url>
+            <layout>default</layout>
+          </repository>
+          <repository>
+            <id>jogamp-java3d-remote</id>
+            <name>jogamp java3d test mirror</name>
+            <url>https://www.jogamp.org/deployment/maven-java3d/</url>
+            <layout>default</layout>
+          </repository>
+    </repositories>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java b/src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java
index 3d60105..9568b2c 100644
--- a/src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java
+++ b/src/main/java/org/jogamp/java3d/Jogl2es2Pipeline.java
@@ -61,6 +61,7 @@ import org.jogamp.vecmath.Vector4f;
 
 import com.jogamp.common.nio.Buffers;
 import com.jogamp.common.os.Platform;
+import com.jogamp.common.util.VersionNumber;
 import com.jogamp.nativewindow.AbstractGraphicsDevice;
 import com.jogamp.nativewindow.AbstractGraphicsScreen;
 import com.jogamp.nativewindow.CapabilitiesChooser;
@@ -7381,8 +7382,8 @@ class Jogl2es2Pipeline extends Jogl2es2DEPPipeline
 				}
 
 				if (Platform.getOSName().equalsIgnoreCase("Windows 10") && //win10
-						(Platform.JAVA_VERSION_NUMBER.compareTo(Platform.Version18) > 0) || // 1.9 or 1.8 > 51 //Version 19 was swapped to version 9 due to JEP 223 in jogl 2.4.0
-						(Platform.JAVA_VERSION_NUMBER.compareTo(Platform.Version18) == 0 && Platform.JAVA_VERSION_UPDATE > 51) && //
+						(Platform.JAVA_VERSION_NUMBER.compareTo(new VersionNumber(1, 8, 0)) > 0) || // 1.9 or 1.8 > 51 //Version 19 was swapped to version 9 due to JEP 223 in jogl 2.4.0
+						(Platform.JAVA_VERSION_NUMBER.compareTo(new VersionNumber(1, 8, 0)) == 0 && Platform.JAVA_VERSION_UPDATE > 51) && //
 								Platform.getJavaVMName().toLowerCase().startsWith("java hotspot(tm)"))// e.g. Java HotSpot(TM) 64-Bit Server VM ; OpenJDK would give OpenJDK 64-Bit Server VM
 				{
 					System.err.println("Issue: The use of an Intel HD2000/3000 driver in combination with Windows 10 and");
diff --git a/src/main/java/org/jogamp/java3d/JoglPipeline.java b/src/main/java/org/jogamp/java3d/JoglPipeline.java
index 2c5e4b6..8db33d5 100644
--- a/src/main/java/org/jogamp/java3d/JoglPipeline.java
+++ b/src/main/java/org/jogamp/java3d/JoglPipeline.java
@@ -79,6 +79,7 @@ import com.jogamp.opengl.Threading;
 
 import com.jogamp.common.nio.Buffers;
 import com.jogamp.common.os.Platform;
+import com.jogamp.common.util.VersionNumber;
 import com.jogamp.nativewindow.awt.AWTGraphicsConfiguration;
 import com.jogamp.nativewindow.awt.AWTGraphicsDevice;
 import com.jogamp.nativewindow.awt.AWTGraphicsScreen;
@@ -8130,8 +8131,8 @@ static boolean hasFBObjectSizeChanged(JoglDrawable jdraw, int width, int height)
 				}
 				
 				if (Platform.getOSName().equalsIgnoreCase("Windows 10") && //win10
-						(Platform.JAVA_VERSION_NUMBER.compareTo(Platform.Version18) > 0) || // 1.9 or 1.8 > 51 //Version 19 was swapped to version 9 due to JEP 223 in jogl 2.4.0
-						(Platform.JAVA_VERSION_NUMBER.compareTo(Platform.Version18) == 0 && Platform.JAVA_VERSION_UPDATE > 51) && //
+						(Platform.JAVA_VERSION_NUMBER.compareTo(new VersionNumber(1, 8, 0)) > 0) || // 1.9 or 1.8 > 51 //Version 19 was swapped to version 9 due to JEP 223 in jogl 2.4.0
+						(Platform.JAVA_VERSION_NUMBER.compareTo(new VersionNumber(1, 8, 0)) == 0 && Platform.JAVA_VERSION_UPDATE > 51) && //
 								Platform.getJavaVMName().toLowerCase().startsWith("java hotspot(tm)"))// e.g. Java HotSpot(TM) 64-Bit Server VM ; OpenJDK would give OpenJDK 64-Bit Server VM
 				{					
 					System.err.println("Issue: The use of an Intel HD2000/3000 driver in combination with Windows 10 and");