From cf8b1401fab085bef09a2ce8b885d6b5c55b61a6 Mon Sep 17 00:00:00 2001
From: Antonin Delpeuch <antonin@delpeuch.eu>
Date: Wed, 24 Nov 2021 13:49:52 +0100
Subject: [PATCH] Attempt to change priority order of JRE resolution on
 Windows. (#4238)

This only changes the resolution settings for our distribution without embedded JRE.
For packages with the embedded JRE, we keep the same logic as before.

For #4108.
---
 packaging/pom.xml | 3 ++-
 settings.xml      | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packaging/pom.xml b/packaging/pom.xml
index 1113b5e9c..bfa9aed37 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -25,6 +25,7 @@
     <windows.package.jre.directory>null</windows.package.jre.directory>
     <windows.package.jre.outputDirectory>jre</windows.package.jre.outputDirectory>
     <windows.package.jre.prefix></windows.package.jre.prefix>
+    <windows.package.jre.bundledAsFallback>false</windows.package.jre.bundledAsFallback>
   </properties>
 
   <profiles>
@@ -215,7 +216,7 @@
                 <path>${windows.package.jre.path}</path>
                 <minVersion>${java.minversion}</minVersion>
                 <maxVersion>${java.maxversion}</maxVersion>
-                <bundledJreAsFallback>true</bundledJreAsFallback>
+                <bundledJreAsFallback>${windows.package.jre.bundledAsFallback}</bundledJreAsFallback>
                 <initialHeapSize>512</initialHeapSize>
                 <maxHeapSize>2048</maxHeapSize>
                 <opts>
diff --git a/settings.xml b/settings.xml
index 9b54f74df..faf4d0d86 100644
--- a/settings.xml
+++ b/settings.xml
@@ -16,6 +16,7 @@
         <windows.package.jre.directory>${windows.jre.home}</windows.package.jre.directory>
         <windows.package.jre.outputDirectory>server/target/jre</windows.package.jre.outputDirectory>
         <windows.package.jre.prefix>with-java-</windows.package.jre.prefix>
+        <windows.package.jre.bundledAsFallback>true</windows.package.jre.bundledAsFallback>
       </properties>
     </profile>
   </profiles>