s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Attempt to change priority order of JRE resolution on Windows. (#4238)

Browse Source 
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.
This commit is contained in:
Antonin Delpeuch 2021-11-24 13:49:52 +01:00 committed by GitHub
parent 77d958c9d4
commit cf8b1401fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packaging/pom.xml
View File

@ -25,6 +25,7 @@
<windows.package.jre.directory>null</windows.package.jre.directory> <windows.package.jre.directory>null</windows.package.jre.directory>
<windows.package.jre.outputDirectory>jre</windows.package.jre.outputDirectory> <windows.package.jre.outputDirectory>jre</windows.package.jre.outputDirectory>
<windows.package.jre.prefix></windows.package.jre.prefix> <windows.package.jre.prefix></windows.package.jre.prefix>
<windows.package.jre.bundledAsFallback>false</windows.package.jre.bundledAsFallback>
</properties> </properties>
<profiles> <profiles>
@ -215,7 +216,7 @@
<path>${windows.package.jre.path}</path> <path>${windows.package.jre.path}</path>
<minVersion>${java.minversion}</minVersion> <minVersion>${java.minversion}</minVersion>
<maxVersion>${java.maxversion}</maxVersion> <maxVersion>${java.maxversion}</maxVersion>
<bundledJreAsFallback>true</bundledJreAsFallback> <bundledJreAsFallback>${windows.package.jre.bundledAsFallback}</bundledJreAsFallback>
<initialHeapSize>512</initialHeapSize> <initialHeapSize>512</initialHeapSize>
<maxHeapSize>2048</maxHeapSize> <maxHeapSize>2048</maxHeapSize>
<opts> <opts>

1
settings.xml
View File

@ -16,6 +16,7 @@
<windows.package.jre.directory>${windows.jre.home}</windows.package.jre.directory> <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.outputDirectory>server/target/jre</windows.package.jre.outputDirectory>
<windows.package.jre.prefix>with-java-</windows.package.jre.prefix> <windows.package.jre.prefix>with-java-</windows.package.jre.prefix>
<windows.package.jre.bundledAsFallback>true</windows.package.jre.bundledAsFallback>
</properties> </properties>
</profile> </profile>
</profiles> </profiles>