Update jogl / gluegen to 2.4.0 (#2159)

Update jogl / gluegen to 2.4.0
winder · Mar 22, 2023 · c2a1f26 · c2a1f26
1 parent d18ae95
commit c2a1f26
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 86 deletions.
diff --git a/pom.xml b/pom.xml
@@ -35,11 +35,12 @@
   </developers>
 
   <repositories>
-    <repository>
-      <id>jzy3d</id>
-      <name>JOGL alternative repository</name>
-      <url>https://maven.jzy3d.org/releases/</url>
-    </repository>
+	  <repository>
+	    <id>jogamp-remote</id>
+	    <name>jogamp test mirror</name>
+	    <url>https://www.jogamp.org/deployment/maven/</url>
+	    <layout>default</layout>
+	  </repository>
   </repositories>
 
   <properties>
@@ -49,8 +50,8 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jetty.version>9.4.41.v20210516</jetty.version>
     <jersey.version>2.29.1</jersey.version>
-    <gluegen.version>v2.4.0-rc-20210111</gluegen.version>
-    <jogl.version>v2.4.0-rc-20210111</jogl.version>
+    <gluegen.version>2.4.0</gluegen.version>
+    <jogl.version>2.4.0</jogl.version>
     <miglayout.version>3.7.4</miglayout.version>
     <guava.version>28.1-jre</guava.version>
     <jssc.version>2.8.0</jssc.version>

diff --git a/ugs-core/pom.xml b/ugs-core/pom.xml
@@ -18,92 +18,17 @@
     <properties>
         <project.build.releaseSourceDirectory>release_files</project.build.releaseSourceDirectory>
     </properties>
-
     <dependencies>
-        <!-- JOGL -->
-        <dependency>
-            <groupId>org.jogamp.jogl</groupId>
-            <artifactId>jogl-all</artifactId>
-            <version>${jogl.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jogamp.jogl</groupId>
-            <artifactId>jogl-all-natives-linux-aarch64</artifactId>
-            <version>${jogl.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jogamp.jogl</groupId>
-            <artifactId>jogl-all-natives-linux-amd64</artifactId>
-            <version>${jogl.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jogamp.jogl</groupId>
-            <artifactId>jogl-all-natives-linux-armv6hf</artifactId>
-            <version>${jogl.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jogamp.jogl</groupId>
-            <artifactId>jogl-all-natives-linux-i586</artifactId>
-            <version>${jogl.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jogamp.jogl</groupId>
-            <artifactId>jogl-all-natives-macosx-universal</artifactId>
-            <version>${jogl.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jogamp.jogl</groupId>
-            <artifactId>jogl-all-natives-windows-amd64</artifactId>
-            <version>${jogl.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jogamp.jogl</groupId>
-            <artifactId>jogl-all-natives-windows-i586</artifactId>
-            <version>${jogl.version}</version>
-        </dependency>
-
-        <!-- GLUEGEN -->
-        <dependency>
-            <groupId>org.jogamp.gluegen</groupId>
-            <artifactId>gluegen-rt</artifactId>
-            <version>${gluegen.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jogamp.gluegen</groupId>
-            <artifactId>gluegen-rt-natives-macosx-universal</artifactId>
-            <version>${gluegen.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jogamp.gluegen</groupId>
-            <artifactId>gluegen-rt-natives-linux-aarch64</artifactId>
-            <version>${gluegen.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.jogamp.gluegen</groupId>
-            <artifactId>gluegen-rt-natives-linux-amd64</artifactId>
+            <artifactId>gluegen-rt-main</artifactId>
             <version>${gluegen.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.jogamp.gluegen</groupId>
-            <artifactId>gluegen-rt-natives-linux-armv6hf</artifactId>
-            <version>${gluegen.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jogamp.gluegen</groupId>
-            <artifactId>gluegen-rt-natives-linux-i586</artifactId>
-            <version>${gluegen.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jogamp.gluegen</groupId>
-            <artifactId>gluegen-rt-natives-windows-amd64</artifactId>
-            <version>${gluegen.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jogamp.gluegen</groupId>
-            <artifactId>gluegen-rt-natives-windows-i586</artifactId>
-            <version>${gluegen.version}</version>
+            <groupId>org.jogamp.jogl</groupId>
+            <artifactId>jogl-all-main</artifactId>
+            <version>${jogl.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.glassfish.tyrus.bundles</groupId>
             <artifactId>tyrus-standalone-client</artifactId>