diff --git a/GUI/pom.xml b/GUI/pom.xml
index cdd285386aecb9fb929a48eff0c4d70385c67d3c..08ad88ef5d83fce782cb58b0b411bc9185c3096f 100644
--- a/GUI/pom.xml
+++ b/GUI/pom.xml
@@ -22,7 +22,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
- <useDefaultManifestFile>true</useDefaultManifestFile>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
</configuration>
</plugin>
<!-- Check code style -->
@@ -54,37 +56,37 @@
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-api-annotations-common</artifactId>
- <version>${netbeans.version}</version>
+ <version>${version.org.netbeans}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util</artifactId>
- <version>${netbeans.version}</version>
+ <version>${version.org.netbeans}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-awt</artifactId>
- <version>${netbeans.version}</version>
+ <version>${version.org.netbeans}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-dialogs</artifactId>
- <version>${netbeans.version}</version>
+ <version>${version.org.netbeans}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-modules</artifactId>
- <version>${netbeans.version}</version>
+ <version>${version.org.netbeans}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-filesystems-nb</artifactId>
- <version>${netbeans.version}</version>
+ <version>${version.org.netbeans}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-modules-options-api</artifactId>
- <version>${netbeans.version}</version>
+ <version>${version.org.netbeans}</version>
<type>jar</type>
</dependency>
<dependency>
@@ -121,27 +123,27 @@
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-windows</artifactId>
- <version>${netbeans.version}</version>
+ <version>${version.org.netbeans}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util-ui</artifactId>
- <version>${netbeans.version}</version>
+ <version>${version.org.netbeans}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util-lookup</artifactId>
- <version>${netbeans.version}</version>
+ <version>${version.org.netbeans}</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-modules-settings</artifactId>
- <version>${netbeans.version}</version>
+ <version>${version.org.netbeans}</version>
</dependency>
<dependency>
<groupId>org.netbeans.external</groupId>
<artifactId>AbsoluteLayout</artifactId>
- <version>RELEASE123</version>
+ <version>${version.org.netbeans}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -158,7 +160,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>30.1-jre</version>
+ <version>${version.com.google.guava}</version>
</dependency>
<dependency>
<groupId>org.imgscalr</groupId>
@@ -170,15 +172,89 @@
<artifactId>jocl</artifactId>
<version>2.0.4</version>
</dependency>
+
+ <!-- JOGL -->
<dependency>
- <groupId>org.jogamp.gluegen</groupId>
- <artifactId>gluegen-rt-main</artifactId>
- <version>2.3.2</version>
+ <groupId>org.jogamp.jogl</groupId>
+ <artifactId>jogl-all</artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.jogl</groupId>
+ <artifactId>jogl-all-natives-linux-aarch64</artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.jogl</groupId>
+ <artifactId>jogl-all-natives-linux-amd64</artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.jogl</groupId>
+ <artifactId>jogl-all-natives-linux-armv6hf</artifactId>
+ <version>${version.org.jogamp}</version>
</dependency>
<dependency>
<groupId>org.jogamp.jogl</groupId>
- <artifactId>jogl-all-main</artifactId>
- <version>2.3.2</version>
+ <artifactId>jogl-all-natives-linux-i586</artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.jogl</groupId>
+ <artifactId>jogl-all-natives-macosx-universal</artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.jogl</groupId>
+ <artifactId>jogl-all-natives-windows-amd64</artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.jogl</groupId>
+ <artifactId>jogl-all-natives-windows-i586 </artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+
+ <!-- GLUEGEN -->
+ <dependency>
+ <groupId>org.jogamp.gluegen</groupId>
+ <artifactId>gluegen-rt</artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.gluegen</groupId>
+ <artifactId>gluegen-rt-natives-macosx-universal</artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.gluegen</groupId>
+ <artifactId>gluegen-rt-natives-linux-aarch64</artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.gluegen</groupId>
+ <artifactId>gluegen-rt-natives-linux-amd64</artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.gluegen</groupId>
+ <artifactId>gluegen-rt-natives-linux-armv6hf</artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.gluegen</groupId>
+ <artifactId>gluegen-rt-natives-linux-i586</artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.gluegen</groupId>
+ <artifactId>gluegen-rt-natives-windows-amd64</artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.gluegen</groupId>
+ <artifactId>gluegen-rt-natives-windows-i586 </artifactId>
+ <version>${version.org.jogamp}</version>
</dependency>
</dependencies>
<properties>
diff --git a/GUI/src/main/java/cz/fidentis/analyst/featurepoints/FeaturePointsAction.java b/GUI/src/main/java/cz/fidentis/analyst/featurepoints/FeaturePointsAction.java
index def699be4d8f37d86568a4a5c036e1badd1bd52d..3a6d4f2bafb0fe383ceb699aba05ce99ce41bbfc 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/featurepoints/FeaturePointsAction.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/featurepoints/FeaturePointsAction.java
@@ -1,6 +1,5 @@
package cz.fidentis.analyst.featurepoints;
-import cz.fidentis.analyst.Logger;
import cz.fidentis.analyst.canvas.Canvas;
import cz.fidentis.analyst.core.ControlPanelAction;
import cz.fidentis.analyst.core.DoubleSpinner;
diff --git a/GUI/src/main/java/cz/fidentis/analyst/featurepoints/FeaturePointsPanel.java b/GUI/src/main/java/cz/fidentis/analyst/featurepoints/FeaturePointsPanel.java
index bc191362cfacc71370501f73ca7c3d11629ef6d5..04d59a8e575c4bad5052bfe4fe8283401972ce7a 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/featurepoints/FeaturePointsPanel.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/featurepoints/FeaturePointsPanel.java
@@ -2,9 +2,7 @@ package cz.fidentis.analyst.featurepoints;
import cz.fidentis.analyst.core.ControlPanel;
import cz.fidentis.analyst.drawables.DrawableFeaturePoints;
-import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import javax.swing.AbstractAction;
import javax.swing.ImageIcon;
/**
diff --git a/HumanFace/pom.xml b/HumanFace/pom.xml
index 15f7a1153412b79aa0cd4d2dd303671193e01ea1..e0d3cc3ffbfa9f2f08cde7ddc0878f5fcd6b7d70 100644
--- a/HumanFace/pom.xml
+++ b/HumanFace/pom.xml
@@ -25,7 +25,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
- <useDefaultManifestFile>true</useDefaultManifestFile>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
</configuration>
</plugin>
<!-- Check code style -->
@@ -57,7 +59,7 @@
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-api-annotations-common</artifactId>
- <version>${netbeans.version}</version>
+ <version>${version.org.netbeans}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -82,12 +84,12 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>30.1-jre</version>
+ <version>${version.com.google.guava}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
- <version>5.6.0</version>
+ <version>${version.org.junit.jupiter}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/MeshAlgorithms/pom.xml b/MeshAlgorithms/pom.xml
index 770808c14868d7acf3e9535f268acd5a859f8a3d..5bb8a1e3d431b9ec76fd4738c33d1bcabc632f0f 100644
--- a/MeshAlgorithms/pom.xml
+++ b/MeshAlgorithms/pom.xml
@@ -25,7 +25,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
- <useDefaultManifestFile>true</useDefaultManifestFile>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
</configuration>
</plugin>
<!-- Check code style -->
@@ -57,7 +59,7 @@
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-api-annotations-common</artifactId>
- <version>${netbeans.version}</version>
+ <version>${version.org.netbeans}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -77,12 +79,12 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>30.1-jre</version>
+ <version>${version.com.google.guava}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
- <version>5.6.0</version>
+ <version>${version.org.junit.jupiter}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/MeshModel/pom.xml b/MeshModel/pom.xml
index d5a245eb3a7f20a4aa2719ec59a249a4f81a47a5..b012a736486ff8fd61f2d0335a166a0503ab3e44 100644
--- a/MeshModel/pom.xml
+++ b/MeshModel/pom.xml
@@ -29,7 +29,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
- <useDefaultManifestFile>true</useDefaultManifestFile>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
</configuration>
</plugin>
<!-- Check code style -->
@@ -69,25 +71,6 @@
<artifactId>j3d-core-utils</artifactId>
<version>1.3.1</version>
</dependency>
- <dependency>
- <groupId>org.netbeans.api</groupId>
- <artifactId>org-netbeans-api-annotations-common</artifactId>
- <version>${netbeans.version}</version>
- </dependency>
- <!-- check dependencies
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-dependency-analyzer</artifactId>
- <version>1.10</version>
- </dependency>
- -->
- <!-- depdendency reported by maven-dependency-analyzer:
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- <version>6.2.1</version>
- </dependency>
- -->
<!-- https://github.com/mokiat/java-data-front -->
<dependency>
<groupId>com.github.mokiat</groupId>
@@ -104,13 +87,13 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>30.1-jre</version>
+ <version>${version.com.google.guava}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/junit/junit -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
- <version>5.6.0</version>
+ <version>${version.org.junit.jupiter}</version>
<scope>test</scope>
</dependency>
<!--<dependency>
@@ -122,7 +105,7 @@
<dependency>
<groupId>com.opencsv</groupId>
<artifactId>opencsv</artifactId>
- <version>5.3</version>
+ <version>5.6</version>
</dependency>
<!-- https://mvnrepository.com/artifact/javax.xml/jaxb-api -->
<dependency>
diff --git a/Rendering/pom.xml b/Rendering/pom.xml
index 43a09e52891afe48c8792d0af87d985bae9a2a2c..5f3283a96cd74b788c6825b1b108cccf925e2aa9 100644
--- a/Rendering/pom.xml
+++ b/Rendering/pom.xml
@@ -25,7 +25,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
- <useDefaultManifestFile>true</useDefaultManifestFile>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
</configuration>
</plugin>
<!-- Check code style -->
@@ -57,7 +59,7 @@
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-api-annotations-common</artifactId>
- <version>${netbeans.version}</version>
+ <version>${version.org.netbeans}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -75,24 +77,98 @@
<version>${version.javax.vecmath}</version>
</dependency>
<dependency>
- <groupId>org.jogamp.gluegen</groupId>
- <artifactId>gluegen-rt-main</artifactId>
- <version>2.3.2</version>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-util</artifactId>
+ <version>${version.org.netbeans}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.netbeans.api</groupId>
+ <artifactId>org-openide-awt</artifactId>
+ <version>${version.org.netbeans}</version>
</dependency>
+
+ <!-- JOGL -->
<dependency>
<groupId>org.jogamp.jogl</groupId>
- <artifactId>jogl-all-main</artifactId>
- <version>2.3.2</version>
+ <artifactId>jogl-all</artifactId>
+ <version>${version.org.jogamp}</version>
</dependency>
<dependency>
- <groupId>org.netbeans.api</groupId>
- <artifactId>org-openide-util</artifactId>
- <version>${netbeans.version}</version>
+ <groupId>org.jogamp.jogl</groupId>
+ <artifactId>jogl-all-natives-linux-aarch64</artifactId>
+ <version>${version.org.jogamp}</version>
</dependency>
<dependency>
- <groupId>org.netbeans.api</groupId>
- <artifactId>org-openide-awt</artifactId>
- <version>${netbeans.version}</version>
+ <groupId>org.jogamp.jogl</groupId>
+ <artifactId>jogl-all-natives-linux-amd64</artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.jogl</groupId>
+ <artifactId>jogl-all-natives-linux-armv6hf</artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.jogl</groupId>
+ <artifactId>jogl-all-natives-linux-i586</artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.jogl</groupId>
+ <artifactId>jogl-all-natives-macosx-universal</artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.jogl</groupId>
+ <artifactId>jogl-all-natives-windows-amd64</artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.jogl</groupId>
+ <artifactId>jogl-all-natives-windows-i586 </artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+
+ <!-- GLUEGEN -->
+ <dependency>
+ <groupId>org.jogamp.gluegen</groupId>
+ <artifactId>gluegen-rt</artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.gluegen</groupId>
+ <artifactId>gluegen-rt-natives-macosx-universal</artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.gluegen</groupId>
+ <artifactId>gluegen-rt-natives-linux-aarch64</artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.gluegen</groupId>
+ <artifactId>gluegen-rt-natives-linux-amd64</artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.gluegen</groupId>
+ <artifactId>gluegen-rt-natives-linux-armv6hf</artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.gluegen</groupId>
+ <artifactId>gluegen-rt-natives-linux-i586</artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.gluegen</groupId>
+ <artifactId>gluegen-rt-natives-windows-amd64</artifactId>
+ <version>${version.org.jogamp}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.gluegen</groupId>
+ <artifactId>gluegen-rt-natives-windows-i586 </artifactId>
+ <version>${version.org.jogamp}</version>
</dependency>
</dependencies>
<properties>
diff --git a/SpacePartitioning/pom.xml b/SpacePartitioning/pom.xml
index 88f21bf2e714842d7dbdef08905cfbe6ec0b3bb8..71a03325189f4643ac3a43d77d5140efa42f8ebd 100644
--- a/SpacePartitioning/pom.xml
+++ b/SpacePartitioning/pom.xml
@@ -28,7 +28,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
- <useDefaultManifestFile>true</useDefaultManifestFile>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
</configuration>
</plugin>
<!-- Check code style -->
@@ -57,11 +59,6 @@
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>org.netbeans.api</groupId>
- <artifactId>org-netbeans-api-annotations-common</artifactId>
- <version>${netbeans.version}</version>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>MeshModel</artifactId>
@@ -76,7 +73,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
- <version>5.6.0</version>
+ <version>${version.org.junit.jupiter}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/application/pom.xml b/application/pom.xml
index db83e80ff1c8dafc03669c772e97ee45bcdc1f28..aed089f05f8c4aeb0d60c5cdb172ebbc303bd2fc 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -22,7 +22,7 @@
<dependency>
<groupId>org.netbeans.cluster</groupId>
<artifactId>platform</artifactId>
- <version>${netbeans.version}</version>
+ <version>${version.org.netbeans}</version>
<type>pom</type>
</dependency>
<dependency>
@@ -34,17 +34,9 @@
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-modules-nbjunit</artifactId>
- <version>${netbeans.version}</version>
+ <version>${version.org.netbeans}</version>
<scope>test</scope> <!-- beyond platform cluster, this often needs to be dropped down to compile/runtime, some other modules in IDE clusters depend on it -->
</dependency>
- <!-- To use Jelly Tools in your functional tests, add or replace with:
- <dependency>
- <groupId>org.netbeans.api</groupId>
- <artifactId>org-netbeans-modules-jellytools-platform</artifactId>
- <version>${netbeans.version}</version>
- <scope>test</scope>
- </dependency>
- -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>MeshModel</artifactId>
@@ -78,7 +70,7 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
- <version>5.6.0</version>
+ <version>${version.org.junit.jupiter}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/application/src/main/resources/app.conf b/application/src/main/resources/app.conf
index 85e3e56aab56e224e470f1dcf4a511391e3fccd1..5d3a6c22e411e8b758a48acdc1538c57e99c363f 100644
--- a/application/src/main/resources/app.conf
+++ b/application/src/main/resources/app.conf
@@ -5,7 +5,13 @@ default_cachedir="${HOME}/.${APPNAME}/dev/cache"
# options used by the launcher by default, can be overridden by explicit
# command line switches
-default_options="--branding fidentisanalyst -J-Xms4G -J-Xmx4G"
+#
+# JOGL issue (github.com/jzy3d/issues/4):
+# -Jadd-exports=java.base/java.lang=ALL-UNNAMED
+# -Jadd-exports=java.desktop/sun.awt=ALL-UNNAMED
+# -Jadd-exports=java.desktop/sun.java2d=ALL-UNNAMED
+#
+default_options="--branding fidentisanalyst -J-Xms4G -J-Xmx4G -J--add-exports=java.base/java.lang=ALL-UNNAMED -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=java.desktop/sun.java2d=ALL-UNNAMED"
# for development purposes you may wish to append: -J-Dnetbeans.logger.console=true -J-ea
# default location of JDK/JRE, can be overridden by using --jdkhome <dir> switch
diff --git a/branding/pom.xml b/branding/pom.xml
index bdd1b585e0953c83351a4cdaa0479273ad8a5e49..adf9e6e05f857ea0688a11e2acfc2039ff5044d9 100644
--- a/branding/pom.xml
+++ b/branding/pom.xml
@@ -21,7 +21,7 @@
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-api-annotations-common</artifactId>
- <version>${netbeans.version}</version>
+ <version>${version.org.netbeans}</version>
</dependency>
</dependencies>
@@ -35,8 +35,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
- <!-- to have the jar plugin pickup the nbm generated manifest -->
- <useDefaultManifestFile>true</useDefaultManifestFile>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
</configuration>
</plugin>
</plugins>
diff --git a/pom.xml b/pom.xml
index 3bd06eba974017437b1fda3eb289ebc6e52386e6..bbb98e4cc1f8f95d805af38301fbc05db6139c5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,13 +11,15 @@
<name>FIDENTIS-Analyst-2</name>
<properties>
- <netbeans.version>RELEASE123</netbeans.version>
<brandingToken>fidentisanalyst</brandingToken>
- <version.maven.plugin.checkstyle>3.1.1</version.maven.plugin.checkstyle>
- <version.plugin.checkstyle>8.5</version.plugin.checkstyle>
- <version.javax.vecmath>1.5.2</version.javax.vecmath>
+ <version.maven.plugin.checkstyle>3.1.2</version.maven.plugin.checkstyle>
<checkstyle.fail>false</checkstyle.fail>
<checkstyle.severity>warning</checkstyle.severity>
+ <version.javax.vecmath>1.5.2</version.javax.vecmath>
+ <version.org.junit.jupiter>5.8.2</version.org.junit.jupiter>
+ <version.com.google.guava>31.1-jre</version.com.google.guava>
+ <version.org.jogamp>v2.4.0-rc4</version.org.jogamp>
+ <version.org.netbeans>RELEASE130</version.org.netbeans>
</properties>
<repositories>
@@ -31,15 +33,27 @@
<name>NetBeans</name>
<url>http://netbeans.apidesign.org/maven2/</url>
</repository>
- </repositories>
+ <!-- JOGL -->
+ <repository>
+ <id>jzy3d-snapshots</id>
+ <name>Jzy3d Snapshots</name>
+ <url>https://maven.jzy3d.org/snapshots/</url>
+ </repository>
+ <repository>
+ <id>jzy3d-releases</id>
+ <name>Jzy3d Releases</name>
+ <url>https://maven.jzy3d.org/releases/</url>
+ </repository>
+ </repositories>
+
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.netbeans.utilities</groupId>
<artifactId>nbm-maven-plugin</artifactId>
- <version>4.5</version>
+ <version>4.7</version>
<extensions>true</extensions>
<configuration>
<brandingToken>${brandingToken}</brandingToken>
@@ -51,7 +65,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
+ <version>3.10.1</version>
<configuration>
<release>11</release>
</configuration>
@@ -59,17 +73,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
+ <version>3.0.0-M6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <version>3.2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.22.0</version>
+ <version>3.0.0-M6</version>
</plugin>
</plugins>
</pluginManagement>