From 4d27753dbcc165f91ab08b166dd19ba8dbc8d440 Mon Sep 17 00:00:00 2001
From: Radek Oslejsek <oslejsek@fi.muni.cz>
Date: Wed, 28 Apr 2021 15:12:45 +0200
Subject: [PATCH] org.codehause.mojo replaced with
org.apache.netbeans.utilities for nbm-maven-plugin, enabling as to compile
with Java11 (we used Java8 so far)
---
Comparison/pom.xml | 18 +++---------------
GUI/pom.xml | 2 +-
MeshModel/pom.xml | 16 +++++++++++++++-
.../analyst/mesh/io/MeshObjLoader.java | 8 ++++----
Renderer/pom.xml | 2 +-
application/pom.xml | 2 +-
branding/pom.xml | 2 +-
pom.xml | 9 ++++-----
8 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/Comparison/pom.xml b/Comparison/pom.xml
index 4b7c8a91..3d85ab6b 100644
--- a/Comparison/pom.xml
+++ b/Comparison/pom.xml
@@ -11,7 +11,7 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
+ <groupId>org.apache.netbeans.utilities</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
@@ -57,14 +57,6 @@
</execution>
</executions>
</plugin>
- <!-- <plugin>
- <groupId>org.openjfx</groupId>
- <artifactId>javafx-maven-plugin</artifactId>
- <version>0.0.4</version>
- <configuration>
- <mainClass>org.openjfx.App</mainClass>
- </configuration>
- </plugin> -->
</plugins>
</build>
<dependencies>
@@ -83,17 +75,13 @@
<artifactId>vecmath</artifactId>
<version>${version.javax.vecmath}</version>
</dependency>
- <!-- <dependency>
- <groupId>org.openjfx</groupId>
- <artifactId>javafx-controls</artifactId>
- <version>11.0.2</version>
- </dependency> -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>30.1-jre</version>
</dependency>
- <dependency>
+ <dependency>
+ <!-- fast (de)serailization -->
<groupId>de.ruedigermoeller</groupId>
<artifactId>fst</artifactId>
<version>2.57</version>
diff --git a/GUI/pom.xml b/GUI/pom.xml
index 9f635f2b..ec98cb3b 100644
--- a/GUI/pom.xml
+++ b/GUI/pom.xml
@@ -11,7 +11,7 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
+ <groupId>org.apache.netbeans.utilities</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
diff --git a/MeshModel/pom.xml b/MeshModel/pom.xml
index ef16df96..33f1efcc 100644
--- a/MeshModel/pom.xml
+++ b/MeshModel/pom.xml
@@ -11,7 +11,7 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
+ <groupId>org.apache.netbeans.utilities</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
@@ -75,6 +75,20 @@
<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>
diff --git a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/io/MeshObjLoader.java b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/io/MeshObjLoader.java
index bf982b3e..0cdfb0e9 100644
--- a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/io/MeshObjLoader.java
+++ b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/io/MeshObjLoader.java
@@ -94,8 +94,8 @@ public class MeshObjLoader {
*/
private static MeshFacet parseMeshToFacet(OBJModel model, OBJMesh mesh) throws IOException {
MeshFacet meshFacet = new MeshFacetImpl();
- Map<MeshPoint, Integer> vertices = new HashMap();
- Map<Edge, Integer> edges = new HashMap();
+ Map<MeshPoint, Integer> vertices = new HashMap<>();
+ Map<Edge, Integer> edges = new HashMap<>();
for (OBJFace face : mesh.getFaces()) {
processFace(model, face, meshFacet, vertices, edges);
@@ -134,7 +134,7 @@ public class MeshObjLoader {
meshFacet.getCornerTable().addRow(cornerTableRow);
}
- List<Edge> triangleEdges = new ArrayList();
+ List<Edge> triangleEdges = new ArrayList<>();
triangleEdges.add(new Edge(trianglePoints.get(0).getPosition(),
trianglePoints.get(1).getPosition(), actRow + 2));
triangleEdges.add(new Edge(trianglePoints.get(1).getPosition(),
@@ -164,7 +164,7 @@ public class MeshObjLoader {
* @throws IOException If face is non-triangular
*/
private static List<MeshPoint> parseFaceToTriangle(OBJModel model, OBJFace face) throws IOException {
- List<MeshPoint> result = new ArrayList();
+ List<MeshPoint> result = new ArrayList<>();
List<OBJDataReference> references = face.getReferences();
diff --git a/Renderer/pom.xml b/Renderer/pom.xml
index 046ecc6a..6ee00742 100644
--- a/Renderer/pom.xml
+++ b/Renderer/pom.xml
@@ -11,7 +11,7 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
+ <groupId>org.apache.netbeans.utilities</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
diff --git a/application/pom.xml b/application/pom.xml
index 7a965512..51b10c2a 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -76,7 +76,7 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
+ <groupId>org.apache.netbeans.utilities</groupId>
<artifactId>nbm-maven-plugin</artifactId>
</plugin>
<!-- Permits NbModuleSuite to be run in integration-test phase: -->
diff --git a/branding/pom.xml b/branding/pom.xml
index 3581e245..91815f94 100644
--- a/branding/pom.xml
+++ b/branding/pom.xml
@@ -28,7 +28,7 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
+ <groupId>org.apache.netbeans.utilities</groupId>
<artifactId>nbm-maven-plugin</artifactId>
</plugin>
<plugin>
diff --git a/pom.xml b/pom.xml
index b07ae996..83b77281 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,6 @@
<brandingToken>fidentisanalyst</brandingToken>
<version.maven.plugin.checkstyle>3.1.1</version.maven.plugin.checkstyle>
<version.plugin.checkstyle>8.5</version.plugin.checkstyle>
- <version.plugin.source>2.4</version.plugin.source>
<version.javax.vecmath>1.5.2</version.javax.vecmath>
<checkstyle.fail>false</checkstyle.fail>
<checkstyle.severity>warning</checkstyle.severity>
@@ -30,7 +29,7 @@
<repository>
<id>netbeans</id>
<name>NetBeans</name>
- <url>http://bits.netbeans.org/nexus/content/groups/netbeans/</url>
+ <url>http://netbeans.apidesign.org/maven2/</url>
</repository>
</repositories>
@@ -38,9 +37,9 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
+ <groupId>org.apache.netbeans.utilities</groupId>
<artifactId>nbm-maven-plugin</artifactId>
- <version>4.1</version>
+ <version>4.5</version>
<extensions>true</extensions>
<configuration>
<brandingToken>${brandingToken}</brandingToken>
@@ -54,7 +53,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
- <release>8</release>
+ <release>11</release>
</configuration>
</plugin>
<plugin>
--
GitLab