From aa711f291f8be340d478828af990f33e8739d565 Mon Sep 17 00:00:00 2001
From: Joachim Nielandt <joachim.nielandt@vlaanderen.be>
Date: Thu, 15 Jun 2023 16:27:40 +0200
Subject: [PATCH 1/2] Added toolchain to .m2/toolchains.xml

- is used to autodetect correct jdk
- mirrored the setup of geonetwork which seemed to work fine for me
---
 pom.xml | 106 +++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 71 insertions(+), 35 deletions(-)

diff --git a/pom.xml b/pom.xml
index ab6e8467..57311f9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -318,6 +318,37 @@
   </dependencyManagement>
 
   <profiles>
+    <profile>
+      <!-- force use of java 11 if available in toolchains.xml -->
+      <id>toolchain</id>
+      <activation>
+        <file>
+          <exists>${user.home}/.m2/toolchains.xml</exists>
+        </file>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-toolchains-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>toolchain</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <toolchains>
+                <jdk>
+                  <version>11</version>
+                </jdk>
+              </toolchains>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <!-- Use -Drelax property to avoid:
 * findbug
 * checkstyle
@@ -465,6 +496,11 @@
           <artifactId>maven-source-plugin</artifactId>
           <version>3.2.1</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-toolchains-plugin</artifactId>
+          <version>3.0.0</version>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
@@ -472,41 +508,41 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
       </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-source-plugin</artifactId>
-          <executions>
-            <execution>
-              <id>attach-sources</id>
-              <phase>verify</phase>
-              <goals>
-                <goal>jar-no-fork</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-enforcer-plugin</artifactId>
-          <executions>
-            <execution>
-              <id>enforce-versions</id>
-              <goals>
-                <goal>enforce</goal>
-              </goals>
-              <configuration>
-                <rules>
-                  <requireMavenVersion>
-                    <version>3.6.3</version>
-                  </requireMavenVersion>
-                  <requireJavaVersion>
-                    <version>${java.version}</version>
-                  </requireJavaVersion>
-                </rules>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>jar-no-fork</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce-versions</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireMavenVersion>
+                  <version>3.6.3</version>
+                </requireMavenVersion>
+                <requireJavaVersion>
+                  <version>${java.version}</version>
+                </requireJavaVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>

From 1803ad7ce9dcdc42f6632152a27b7a32f0008245 Mon Sep 17 00:00:00 2001
From: Joachim Nielandt <joachim.nielandt@vlaanderen.be>
Date: Thu, 15 Jun 2023 16:49:15 +0200
Subject: [PATCH 2/2] Tidied up comment.

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 57311f9e..7f5d5bf8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -350,9 +350,9 @@
       </build>
     </profile>
     <!-- Use -Drelax property to avoid:
-* findbug
-* checkstyle
-* and tests. -->
+      * findbug
+      * checkstyle
+      * and tests. -->
     <profile>
       <id>relax-build</id>
       <activation>