From ed391d7c76465de5a0830542c0688dea7e04e693 Mon Sep 17 00:00:00 2001
From: Demeng7215 <43016355+demengc@users.noreply.github.com>
Date: Tue, 29 Jul 2025 12:33:18 -0400
Subject: [PATCH] Auto-discover JDK toolchain instead of requiring explicit
 toolchains.xml

- Fix JitPack builds and streamline collaboration by automatically discovering and selecting a JDK toolchain with JDK version testJava (or above)
- Explicit toolchain declaration in ~/.m2/toolchains.xml is no longer required
---
 pom.xml | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index 22d432dd..3754fc13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,8 +22,8 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.github.cryptomorin</groupId>
@@ -133,16 +133,13 @@
                         <execution>
                             <phase>validate</phase>
                             <goals>
-                                <goal>toolchain</goal>
+                                <goal>display-discovered-jdk-toolchains</goal>
+                                <goal>select-jdk-toolchain</goal>
                             </goals>
                         </execution>
                     </executions>
                     <configuration>
-                        <toolchains>
-                            <jdk>
-                                <version>[${testJava}]</version>
-                            </jdk>
-                        </toolchains>
+                        <version>[${testJava},)</version>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -415,21 +412,21 @@
                     <extensions>true</extensions>
                     <configuration>
                         <publishingServerId>central</publishingServerId>
-<!--                        <autoPublish>true</autoPublish>-->
-<!--                        <waitUntil>published</waitUntil>-->
+                        <!--                        <autoPublish>true</autoPublish>-->
+                        <!--                        <waitUntil>published</waitUntil>-->
                     </configuration>
                 </plugin>
-<!--                <plugin>-->
-<!--                    <groupId>org.sonatype.plugins</groupId>-->
-<!--                    <artifactId>nexus-staging-maven-plugin</artifactId>-->
-<!--                    <version>1.7.0</version>-->
-<!--                    <extensions>true</extensions>-->
-<!--                    <configuration>-->
-<!--                        <serverId>ossrh</serverId>-->
-<!--                        <nexusUrl>https://oss.sonatype.org/</nexusUrl>-->
-<!--                        <autoReleaseAfterClose>true</autoReleaseAfterClose>-->
-<!--                    </configuration>-->
-<!--                </plugin>-->
+                <!--                <plugin>-->
+                <!--                    <groupId>org.sonatype.plugins</groupId>-->
+                <!--                    <artifactId>nexus-staging-maven-plugin</artifactId>-->
+                <!--                    <version>1.7.0</version>-->
+                <!--                    <extensions>true</extensions>-->
+                <!--                    <configuration>-->
+                <!--                        <serverId>ossrh</serverId>-->
+                <!--                        <nexusUrl>https://oss.sonatype.org/</nexusUrl>-->
+                <!--                        <autoReleaseAfterClose>true</autoReleaseAfterClose>-->
+                <!--                    </configuration>-->
+                <!--                </plugin>-->
             </plugins>
         </pluginManagement>
     </build>