From a5af7ae5fa1f4686c087254a06806d7c40f7e680 Mon Sep 17 00:00:00 2001
From: Alexander Suter <alexander.suter@axonivy.com>
Date: Fri, 12 Jul 2024 00:03:06 +0200
Subject: [PATCH] XIVY-13665 Update to Java 21

---
 .classpath                                               | 2 +-
 .settings/org.eclipse.jdt.core.prefs                     | 6 +++---
 Dockerfile                                               | 2 +-
 Jenkinsfile                                              | 4 +++-
 pom.xml                                                  | 6 +++---
 src/main/java/ch/ivyteam/ivy/maven/IarPackagingMojo.java | 2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.classpath b/.classpath
index 716cf1e9..23142672 100644
--- a/.classpath
+++ b/.classpath
@@ -14,7 +14,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" path="src/site"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
 			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index d089a9b7..7cbe36f2 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21
diff --git a/Dockerfile b/Dockerfile
index bbcc0d27..a0e853a1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM maven:3.8.6-eclipse-temurin-17
+FROM maven:3.9.8-eclipse-temurin-21
 
 RUN addgroup --gid 1000 build && adduser --uid 1000 --gid 1000 --disabled-password --gecos "" build && \
     curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg && \
diff --git a/Jenkinsfile b/Jenkinsfile
index 42686d41..1d285046 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -63,7 +63,9 @@ def collectBuildArtifacts()  {
   recordIssues tools: [mavenConsole()], qualityGates: [[threshold: 1, type: 'TOTAL']], filters: [
     excludeType('site-maven-plugin:site'),
     excludeType('sonar-maven-plugin:sonar'),
-    excludeType('maven-surefire-plugin:test')
+    excludeType('maven-surefire-plugin:test'),
+    // printed to console by test. was since ever the case but they are now real maven warnings
+    excludeMessage('.*Uncaught exception in thread Thread.*'),
   ]
   recordIssues tools: [eclipse()], qualityGates: [[threshold: 1, type: 'TOTAL']]
 }
diff --git a/pom.xml b/pom.xml
index a5551cc6..eeddd654 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
   </organization>
 
   <properties>
-    <java.version>17</java.version>
+    <java.version>21</java.version>
     <maven.version>3.6.3</maven.version>
     <!-- version should match ivy Engine sfl4j version! And version in EngineClassLoaderFactory.SLF4J_VERSION -->
     <slf4j.version>2.0.13</slf4j.version>
@@ -212,7 +212,7 @@
         <!-- Makes MOJO declaration trough Annotation possible. -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.6.4</version>
+        <version>3.13.1</version>
         <configuration>
           <!-- see http://jira.codehaus.org/browse/MNG-5346 -->
           <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
@@ -490,7 +490,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.6.4</version>
+        <version>3.13.1</version>
         <configuration>
           <requirements>
             <others>
diff --git a/src/main/java/ch/ivyteam/ivy/maven/IarPackagingMojo.java b/src/main/java/ch/ivyteam/ivy/maven/IarPackagingMojo.java
index 06b0c66d..b0d2b427 100644
--- a/src/main/java/ch/ivyteam/ivy/maven/IarPackagingMojo.java
+++ b/src/main/java/ch/ivyteam/ivy/maven/IarPackagingMojo.java
@@ -80,7 +80,7 @@ public static interface Defaults {
    * declarations.
    *
    * From the 'target' directory only 'classes' and 'src_hd' are included by default.
-   * See {@link Defaults#TARGET_INCLUDES}.
+   * See {@link ch.ivyteam.ivy.maven.IarPackagingMojo.Defaults#TARGET_INCLUDES}.
    *
    * <pre>
    * <code>&lt;iarFileSets&gt;