Skip to content
Snippets Groups Projects
Commit 4d27753d authored by Radek Ošlejšek's avatar Radek Ošlejšek
Browse files

org.codehause.mojo replaced with org.apache.netbeans.utilities for... 

org.codehause.mojo replaced with org.apache.netbeans.utilities for nbm-maven-plugin, enabling as to compile with Java11 (we used Java8 so far)
parent 8239caa8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Comparison/pom.xml
+ 3
− 15
View file @ 4d27753d
......@@ -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>
......
GUI/pom.xml
+ 1
− 1
View file @ 4d27753d
......@@ -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>
......
MeshModel/pom.xml
+ 15
− 1
View file @ 4d27753d
......@@ -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>
......
MeshModel/src/main/java/cz/fidentis/analyst/mesh/io/MeshObjLoader.java
+ 4
− 4
View file @ 4d27753d
......@@ -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();
......
Renderer/pom.xml
+ 1
− 1
View file @ 4d27753d
......@@ -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>
......
application/pom.xml
+ 1
− 1
View file @ 4d27753d
......@@ -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: -->
......
branding/pom.xml
+ 1
− 1
View file @ 4d27753d
......@@ -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>
......
pom.xml
+ 4
− 5
View file @ 4d27753d
......@@ -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>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment