Skip to content

Commit 28661fa

Browse files
committed
Manage versions of JogAmp Java 3D artifacts
And deprecate the no-longer-needed SciJava fork of Java 3D.
1 parent 302c612 commit 28661fa

File tree

1 file changed

+29
-2
lines changed

1 file changed

+29
-2
lines changed

pom.xml

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1789,7 +1789,7 @@
17891789
<jama.version>1.0.3</jama.version>
17901790
<gov.nist.math.jama.version>${jama.version}</gov.nist.math.jama.version>
17911791

1792-
<!-- Java 3D - https://github.com/scijava/java3d-core -->
1792+
<!-- [DEPRECATED] SciJava's fork of Java 3D - TO BE REMOVED in pom-scijava 39.0.0 -->
17931793
<java3d.version>1.6.0-scijava-2</java3d.version>
17941794
<j3dcore.version>${java3d.version}</j3dcore.version>
17951795
<j3dutils.version>${java3d.version}</j3dutils.version>
@@ -2034,6 +2034,16 @@
20342034
<scijava.natives.classifier.jocl>${scijava.natives.classifier.jogamp}</scijava.natives.classifier.jocl>
20352035
<scijava.natives.classifier.jogl>${scijava.natives.classifier.jogamp}</scijava.natives.classifier.jogl>
20362036

2037+
<!-- JogAmp Java 3D - https://jogamp.org/deployment/maven-java3d/ -->
2038+
<jogamp-java3d.version>1.7.2</jogamp-java3d.version>
2039+
<java3d-core.version>${jogamp-java3d.version}</java3d-core.version>
2040+
<java3d-utils.version>${jogamp-java3d.version}</java3d-utils.version>
2041+
<!-- TEMP: Avoid short name clash with org.scijava:vecmath. -->
2042+
<!--<vecmath.version>${jogamp-java3d.version}</vecmath.version>-->
2043+
<org.jogamp.java3d.java3d-core.version>${java3d-core.version}</org.jogamp.java3d.java3d-core.version>
2044+
<org.jogamp.java3d.java3d-utils.version>${java3d-utils.version}</org.jogamp.java3d.java3d-utils.version>
2045+
<org.jogamp.java3d.vecmath.version>${jogamp-java3d.version}</org.jogamp.java3d.vecmath.version>
2046+
20372047
<!-- JOML - https://joml-ci.github.io/JOML/ -->
20382048
<joml.version>1.10.5</joml.version>
20392049
<org.joml.joml.version>${joml.version}</org.joml.joml.version>
@@ -5230,7 +5240,7 @@
52305240
<version>${gov.nist.math.jama.version}</version>
52315241
</dependency>
52325242

5233-
<!-- Java 3D - https://github.com/scijava/java3d-core -->
5243+
<!-- [DEPRECATED] SciJava's fork of Java 3D - TO BE REMOVED in pom-scijava 39.0.0 -->
52345244
<dependency>
52355245
<groupId>org.scijava</groupId>
52365246
<artifactId>j3dcore</artifactId>
@@ -5881,6 +5891,23 @@
58815891
<classifier>natives-windows-amd64</classifier>
58825892
</dependency>
58835893

5894+
<!-- JogAmp Java 3D - https://jogamp.org/deployment/maven-java3d/ -->
5895+
<dependency>
5896+
<groupId>org.jogamp.java3d</groupId>
5897+
<artifactId>java3d-core</artifactId>
5898+
<version>${org.jogamp.java3d.java3d-core.version}</version>
5899+
</dependency>
5900+
<dependency>
5901+
<groupId>org.jogamp.java3d</groupId>
5902+
<artifactId>java3d-utils</artifactId>
5903+
<version>${org.jogamp.java3d.java3d-utils.version}</version>
5904+
</dependency>
5905+
<dependency>
5906+
<groupId>org.jogamp.java3d</groupId>
5907+
<artifactId>vecmath</artifactId>
5908+
<version>${org.jogamp.java3d.vecmath.version}</version>
5909+
</dependency>
5910+
58845911
<!-- JOML - https://joml-ci.github.io/JOML/ -->
58855912
<dependency>
58865913
<groupId>org.joml</groupId>

0 commit comments

Comments
 (0)