From 158b6bcfb7b1d1dd6e427672feb15850c8d0ea3e Mon Sep 17 00:00:00 2001
From: TheOtherP <theotherp@gmx.de>
Date: Mon, 20 Nov 2023 20:53:55 +0100
Subject: [PATCH] Update build dockerfiles to use current GraalVM

---
 core/pom.xml                           | 6 +++---
 core/src/main/resources/changelog.yaml | 6 ------
 misc/build-and-release.ps1             | 9 ++-------
 misc/buildLinuxCore/amd64/dockerfile   | 8 ++++----
 misc/buildLinuxCore/arm64/dockerfile   | 8 ++++----
 5 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index e114d976c..bdfb2ad36 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -99,7 +99,7 @@
         <dependency>
             <groupId>org.nzbhydra</groupId>
             <artifactId>mapping</artifactId>
-            <version>5.3.3</version>
+            <version>5.3.3-SNAPSHOT</version>
         </dependency>
 
         <!-- spring (boot) -->
@@ -505,7 +505,7 @@
                                     <builder>paketobuildpacks/builder:tiny</builder>
                                     <env>
                                         <BP_NATIVE_IMAGE>true</BP_NATIVE_IMAGE>
-                                        <!--                                        <BP_NATIVE_IMAGE_BUILD_ARGUMENTS>-march=compatibility</BP_NATIVE_IMAGE_BUILD_ARGUMENTS>-->
+                                        <BP_NATIVE_IMAGE_BUILD_ARGUMENTS>-march=compatibility</BP_NATIVE_IMAGE_BUILD_ARGUMENTS>
                                     </env>
                                 </image>
                             </configuration>
@@ -530,7 +530,7 @@
                                     <buildArg>-H:DeadlockWatchdogInterval=0</buildArg>
                                     <buildArg>--initialize-at-build-time=org.apache.commons.logging.LogFactoryService</buildArg>
                                     <buildArg>-H:+StaticExecutableWithDynamicLibC</buildArg>
-                                    <!--                                    <buildArg>-march=compatibility</buildArg>-->
+                                    <buildArg>-march=compatibility</buildArg>
                                     <buildArg>--no-fallback -J-Xmx7g</buildArg>
                             </buildArgs>
                                 <classesDirectory>${project.build.outputDirectory}</classesDirectory>
diff --git a/core/src/main/resources/changelog.yaml b/core/src/main/resources/changelog.yaml
index eb3d73887..14244957a 100644
--- a/core/src/main/resources/changelog.yaml
+++ b/core/src/main/resources/changelog.yaml
@@ -1,10 +1,4 @@
 #@formatter:off
--   version: "v5.3.3"
-    date: "2023-11-20"
-    changes:
-        -   type: "fix"
-            text: "Windows releases didn't run on intel CPUs (see what I wrote below about this being hard?). See #899"
-    final: true
 -   version: "v5.3.2"
     date: "2023-11-18"
     changes:
diff --git a/misc/build-and-release.ps1 b/misc/build-and-release.ps1
index 98dbfd350..971fd4009 100644
--- a/misc/build-and-release.ps1
+++ b/misc/build-and-release.ps1
@@ -154,11 +154,6 @@ try {
     exit 1
 }
 
-2
-
-Write-Host "Replace core.exe and pr any key to continue..."
-$Host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")
-
 $windowsVersion = releases/windows-release/include/core.exe -version
 if ($windowsVersion -ne $version) {
     Write-Error "Windows version $version expected but is $windowsVersion"
@@ -269,10 +264,10 @@ if (-not $?) {
     exit 1
 }
 if ($dryRun) {
-    Write-Host "Committing update to $version (not really, just dry run) ***********************************************************************"
+    Write-Host "Committing update to $nextVersion (not really, just dry run) ***********************************************************************"
 } else {
     Write-Host "Committing ***********************************************************************"
-    git commit -am "Update to $version"
+    git commit -am "Update to $nextVersion"
     if (-not $?) {
         Write-Error "Commit failed"
         git reset --hard
diff --git a/misc/buildLinuxCore/amd64/dockerfile b/misc/buildLinuxCore/amd64/dockerfile
index ee9405026..33644c41b 100644
--- a/misc/buildLinuxCore/amd64/dockerfile
+++ b/misc/buildLinuxCore/amd64/dockerfile
@@ -13,10 +13,10 @@ ENV M2_HOME=/opt/maven
 ENV MAVEN_HOME=/opt/maven
 ENV PATH=${M2_HOME}/bin:${PATH}
 
-RUN wget -nv --no-check-certificate https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.3/graalvm-ce-java17-linux-amd64-22.3.3.tar.gz
-RUN tar xzf graalvm-ce-java17-linux-amd64-22.3.3.tar.gz -C /
-ENV PATH=/graalvm-ce-java17-22.3.3/bin/:$PATH
-ENV JAVA_HOME=/graalvm-ce-java17-22.3.3
+RUN wget -nv --no-check-certificate https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-17.0.9/graalvm-community-jdk-17.0.9_linux-x64_bin.tar.gz
+RUN tar xzf graalvm-community-jdk-17.0.9_linux-x64_bin.tar.gz -C /
+ENV PATH=/graalvm-community-openjdk-17.0.9+9.1/bin/:$PATH
+ENV JAVA_HOME=/graalvm-community-openjdk-17.0.9+9.1
 
 # When you update this also change the directory in buildInContainer.sh
 RUN wget -nv --no-check-certificate https://github.com/upx/upx/releases/download/v4.2.1/upx-4.2.1-amd64_linux.tar.xz
diff --git a/misc/buildLinuxCore/arm64/dockerfile b/misc/buildLinuxCore/arm64/dockerfile
index b4f7143e8..e0c19247c 100644
--- a/misc/buildLinuxCore/arm64/dockerfile
+++ b/misc/buildLinuxCore/arm64/dockerfile
@@ -12,10 +12,10 @@ ENV M2_HOME=/opt/maven
 ENV MAVEN_HOME=/opt/maven
 ENV PATH=${M2_HOME}/bin:${PATH}
 
-RUN wget -nv --no-check-certificate https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.3.3/graalvm-ce-java17-linux-aarch64-22.3.3.tar.gz
-RUN tar xzf graalvm-ce-java17-linux-aarch64-22.3.3.tar.gz -C /
-ENV PATH=/graalvm-ce-java17-22.3.3/bin/:$PATH
-ENV JAVA_HOME=/graalvm-ce-java17-22.3.3
+RUN wget -nv --no-check-certificate https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-17.0.9/graalvm-community-jdk-17.0.9_linux-aarch64_bin.tar.gz
+RUN tar xzf graalvm-community-jdk-17.0.9_linux-aarch64_bin.tar.gz -C /
+ENV PATH=/graalvm-community-openjdk-17.0.9+9.1/bin/:$PATH
+ENV JAVA_HOME=/graalvm-community-openjdk-17.0.9+9.1
 
 # When you update this also change the directory in buildInContainer.sh
 RUN wget -nv --no-check-certificate https://github.com/upx/upx/releases/download/v4.2.1/upx-4.2.1-arm64_linux.tar.xz