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

Resolve "Upgrade to Java 21"

parent cf653dfd

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line 
image: maven:3.8.4-openjdk-17-slim

image: maven:3-eclipse-temurin-21



cache:

  key: ${CI_COMMIT_REF_SLUG} # cache is for per branch

FaceEngines/pom.xml

+6 −0
Original line number Diff line number Diff line
@@ -119,6 +119,12 @@ 
            <artifactId>commons-lang3</artifactId>

            <version>${version.org.apache.commons}</version>

        </dependency>

        <!-- http://ejml.org/wiki/index.php?title=Main_Page -->

        <dependency>

            <groupId>org.ejml</groupId>

            <artifactId>ejml-simple</artifactId>

            <version>0.43</version>

        </dependency>

    </dependencies>

    <properties>

        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

GeometryData/pom.xml

+1 −5
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
                        <publicPackage>cz.fidentis.analyst</publicPackage>

                        <publicPackage>cz.fidentis.analyst.data.mesh</publicPackage>

                        <publicPackage>cz.fidentis.analyst.data.ray</publicPackage>

                        <publicPackage>cz.fidentis.analyst.data.ray.impl</publicPackage><!-- !!! -->

                        <publicPackage>cz.fidentis.analyst.data.shapes</publicPackage>

                        <publicPackage>cz.fidentis.analyst.data.surfacemask</publicPackage>

                        <publicPackage>cz.fidentis.analyst.math</publicPackage>
@@ -92,11 +93,6 @@ 
            <artifactId>guava</artifactId>

            <version>${version.com.google.guava}</version>

        </dependency>

        <!--<dependency>

            <groupId>org.apache.commons</groupId>

            <artifactId>commons-lang3</artifactId>

            <version>${version.org.apache.commons}</version>

        </dependency>-->

        <!-- https://mvnrepository.com/artifact/junit/junit -->

        <dependency>

            <groupId>org.junit.jupiter</groupId>

README.md

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ This project is being developed at Masaryk University, Brno, as collaborative pr 


## Requirements (for development)



*  [Oracle JDK 17](https://www.oracle.com/java/technologies/downloads/#java17) or [OpenJDK 17](https://www.openlogic.com/openjdk-downloads)

*  [Oracle JDK 21](https://www.oracle.com/java/technologies/downloads/#java21) or [OpenJDK 21](https://www.openlogic.com/openjdk-downloads)

*  [Maven](https://www.mkyong.com/maven/how-to-install-maven-in-windows/) for compilation



## Compilation

Rendering/pom.xml

+5 −0
Original line number Diff line number Diff line
@@ -69,6 +69,11 @@ 
            <artifactId>FaceData</artifactId>

            <version>${project.version}</version>

        </dependency>

        <dependency>

            <groupId>${project.groupId}</groupId>

            <artifactId>SpacePartitioningData</artifactId>

            <version>${project.version}</version>

        </dependency>

        <dependency>

            <groupId>${project.groupId}</groupId>

            <artifactId>GPU</artifactId>