Commit beb195cf authored by Radek Ošlejšek's avatar Radek Ošlejšek
Browse files

Merge branch '108-upgrade-to-jdk-17-2' into 'master' 

Resolve "Upgrade to JDK 17"

Closes #108

See merge request grp-fidentis/analyst2!211
parents 6922bb8c 7a771e38

GUI/pom.xml

+95 −19
Original line number Diff line number Diff line
@@ -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>

GUI/src/main/java/cz/fidentis/analyst/featurepoints/FeaturePointsAction.java

+0 −1
Original line number Diff line number Diff line 
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;

GUI/src/main/java/cz/fidentis/analyst/featurepoints/FeaturePointsPanel.java

+0 −2
Original line number Diff line number Diff line
@@ -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;



/**

HumanFace/pom.xml

+6 −4
Original line number Diff line number Diff line
@@ -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>

MeshAlgorithms/pom.xml

+6 −4
Original line number Diff line number Diff line
@@ -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>