Merge branch 'master' into dependabot/github_actions/gradle/wrapper-v…

…alidation-action-3.3.0
adoptium · Apr 19, 2024 · 6ad7e7e · 6ad7e7e
2 parents ca02f2a + ee3dda2
commit 6ad7e7e
Show file tree

Hide file tree

Showing 14 changed files with 49 additions and 17 deletions.
diff --git a/linux/Jenkinsfile b/linux/Jenkinsfile
@@ -180,7 +180,7 @@ def CheckAndUpload(String Target, String Distro, String BuildArch, String Versio
                  jf 'rt u **/build/ospackage/temurin-*${BUILDARCH}.deb deb/pool/main/t/temurin-${VERSION}/ --target-props=${DISTROLIST}deb.component=main;deb.architecture=${BUILDARCH} --flat=true'
                }
                if (BuildArch == "riscv64") {
-                 handleRISCVUpload("Debian")
+               handleRISCVUpload("Debian")
                }
                break
            case "Alpine":
@@ -416,7 +416,7 @@ def uploadArtifacts(String DISTRO, String buildArch, String Version) {
             uploadAlpineArtifacts(buildArch)
             break
         default:
-            uploadRpmArtifacts(DISTRO,buildArch)
+            uploadRpmArtifacts(DISTRO, buildArch, Version)
             break
     }
 }
@@ -472,9 +472,11 @@ def uploadDebArtifacts(String buildArch, String Version) {
         also update linux/{jdk,jre}/debian/main/packing/build.sh
     */
     def deb_versions = [
+            "trixie", // Debian/13
             "bookworm", // Debian/12
             "bullseye", // Debian/11
             "buster",   // Debian/10
+            "noble",    // Ubuntu/24.04 (LTS) 
             "jammy",    // Ubuntu/22.04 (LTS)
             "focal",    // Ubuntu/20.04 (LTS)
             "bionic"   // Ubuntu/18.04 (LTS)
@@ -510,7 +512,8 @@ def uploadDebArtifacts(String buildArch, String Version) {
         }
 }
 
-def uploadRpmArtifacts(String DISTRO, String rpmArch) {
+def uploadRpmArtifacts(String DISTRO, String rpmArch, String Version) {
+    env.VERSION = Version
     def Distro = "RPM"
     def distro_Package = [
         'redhat' : [
@@ -524,6 +527,7 @@ def uploadRpmArtifacts(String DISTRO, String rpmArch) {
             'rpm/fedora/37',
             'rpm/fedora/38',
             'rpm/fedora/39',
+            'rpm/fedora/40',
             'rpm/oraclelinux/7',
             'rpm/oraclelinux/8',
             'rpm/amazonlinux/2'
@@ -545,17 +549,18 @@ def uploadRpmArtifacts(String DISTRO, String rpmArch) {
         's390x'  : 's390x',
         'riscv64' : 'riscv64'
     ]
+
     // if VERSION is 8 or 20 remove s390x from the list
     if (VERSION == '8' || VERSION == '20') {
         rpmArchList.remove('s390x')
     }
     // if VERSION is 20 remove armv7hl from the list
-
     if (VERSION >= '20') {
         rpmArchList.remove('armv7hl')
     }
+
     // If Version < 21 remove riscv64
-    if (VERSION < '21') {
+    if (VERSION == '8' || VERSION == '11' || VERSION == '17') {
         rpmArchList.remove('riscv64')
     }
 

diff --git a/linux/jdk/debian/src/main/packaging/microsoft/11/debian/changelog b/linux/jdk/debian/src/main/packaging/microsoft/11/debian/changelog
@@ -1,3 +1,9 @@
+msopenjdk-11 (11.0.23-1) STABLE; urgency=medium
+
+  * Microsoft 11.0.23-1 release.
+
+ -- Microsoft Package Maintainers <[email protected]>  Thu, 11 Apr 2024 01:43:51 +0000
+
 msopenjdk-11 (11.0.22-1) STABLE; urgency=medium
 
   * Microsoft 11.0.22-1 release.

diff --git a/linux/jdk/debian/src/main/packaging/microsoft/11/debian/rules b/linux/jdk/debian/src/main/packaging/microsoft/11/debian/rules
@@ -3,7 +3,7 @@
 pkg_name = msopenjdk-11
 priority = 1111
 jvm_tools = jaotc jar jarsigner java javac javadoc javap jcmd jconsole jdb jdeprscan jdeps jfr jhsdb jimage jinfo jjs jlink jmap jmod jps jrunscript jshell jstack jstat jstatd keytool pack200 rmic rmid rmiregistry serialver unpack200 jexec jspawnhelper
-url_version = 11.0.22
+url_version = 11.0.23
 amd64_tarball_url = https://aka.ms/download-jdk/microsoft-jdk-$(url_version)-linux-x64.tar.gz
 amd64_checksum_url = https://aka.ms/download-jdk/microsoft-jdk-$(url_version)-linux-x64.tar.gz.sha256sum.txt
 arm64_tarball_url = https://aka.ms/download-jdk/microsoft-jdk-$(url_version)-linux-aarch64.tar.gz

diff --git a/linux/jdk/debian/src/main/packaging/microsoft/17/debian/changelog b/linux/jdk/debian/src/main/packaging/microsoft/17/debian/changelog
@@ -1,3 +1,9 @@
+msopenjdk-17 (17.0.11-1) STABLE; urgency=medium
+
+  * Microsoft 17.0.11-1 release.
+
+ -- Microsoft Package Maintainers <[email protected]>  Wed, 10 Apr 2024 06:14:26 +0000
+
 msopenjdk-17 (17.0.10-1) STABLE; urgency=medium
 
   * Microsoft 17.0.10-1 release.

diff --git a/linux/jdk/debian/src/main/packaging/microsoft/17/debian/rules b/linux/jdk/debian/src/main/packaging/microsoft/17/debian/rules
@@ -3,7 +3,7 @@
 pkg_name = msopenjdk-17
 priority = 1711
 jvm_tools = jar jarsigner java javac javadoc javap jcmd jconsole jdb jdeprscan jdeps jfr jhsdb jimage jinfo jlink jmap jmod jpackage jps jrunscript jshell jstack jstat jstatd keytool rmiregistry serialver jexec jspawnhelper
-url_version = 17.0.10
+url_version = 17.0.11
 amd64_tarball_url = https://aka.ms/download-jdk/microsoft-jdk-$(url_version)-linux-x64.tar.gz
 amd64_checksum_url = https://aka.ms/download-jdk/microsoft-jdk-$(url_version)-linux-x64.tar.gz.sha256sum.txt
 arm64_tarball_url = https://aka.ms/download-jdk/microsoft-jdk-$(url_version)-linux-aarch64.tar.gz

diff --git a/linux/jdk/debian/src/main/packaging/microsoft/21/debian/changelog b/linux/jdk/debian/src/main/packaging/microsoft/21/debian/changelog
@@ -1,3 +1,9 @@
+msopenjdk-21 (21.0.3-1) STABLE; urgency=medium
+
+  * Microsoft 21.0.3-1 release.
+
+ -- Microsoft Package Maintainers <[email protected]>  Wed, 10 Apr 2024 05:09:39 +0000
+
 msopenjdk-21 (21.0.2-1) STABLE; urgency=medium
 
   * Microsoft 21.0.2-1 release.

diff --git a/linux/jdk/debian/src/main/packaging/microsoft/21/debian/rules b/linux/jdk/debian/src/main/packaging/microsoft/21/debian/rules
@@ -3,7 +3,7 @@
 pkg_name = msopenjdk-21
 priority = 2111
 jvm_tools = jar jarsigner java javac javadoc javap jcmd jconsole jdb jdeprscan jdeps jfr jhsdb jimage jinfo jlink jmap jmod jpackage jps jrunscript jshell jstack jstat jstatd jwebserver keytool rmiregistry serialver jexec jspawnhelper
-url_version = 21.0.2
+url_version = 21.0.3
 amd64_tarball_url = https://aka.ms/download-jdk/microsoft-jdk-$(url_version)-linux-x64.tar.gz
 amd64_checksum_url = https://aka.ms/download-jdk/microsoft-jdk-$(url_version)-linux-x64.tar.gz.sha256sum.txt
 arm64_tarball_url = https://aka.ms/download-jdk/microsoft-jdk-$(url_version)-linux-aarch64.tar.gz

diff --git a/linux/jdk/redhat/src/main/packaging/microsoft/11/msopenjdk-11.spec b/linux/jdk/redhat/src/main/packaging/microsoft/11/msopenjdk-11.spec
@@ -1,7 +1,7 @@
-%global upstream_version 11.0.22+7
+%global upstream_version 11.0.23+9
 # Only [A-Za-z0-9.] allowed in version:
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version
-%global spec_version 11.0.22
+%global spec_version 11.0.23
 %global spec_release 1
 %global priority 1111
 
@@ -220,6 +220,8 @@ fi
 /usr/lib/tmpfiles.d/%{name}.conf
 # Make below specific 
 %changelog
+* Thu Apr 11 2024 Microsoft Package Maintainers <[email protected]> 11.0.23-1
+- Microsoft 11.0.23+9 initial release.
 * Thu Jan 11 2024 Microsoft Package Maintainers <[email protected]> 11.0.22-1
 - Microsoft 11.0.22+7 initial release.
 * Wed Oct 11 2023 Microsoft Package Maintainers <[email protected]> 11.0.21-1

diff --git a/linux/jdk/redhat/src/main/packaging/microsoft/17/msopenjdk-17.spec b/linux/jdk/redhat/src/main/packaging/microsoft/17/msopenjdk-17.spec
@@ -1,7 +1,7 @@
-%global upstream_version 17.0.10+7
+%global upstream_version 17.0.11+9
 # Only [A-Za-z0-9.] allowed in version:
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version
-%global spec_version 17.0.10
+%global spec_version 17.0.11
 %global spec_release 1
 %global priority 1161
 
@@ -217,6 +217,8 @@ fi
 /usr/lib/tmpfiles.d/%{name}.conf
 
 %changelog
+* Wed Apr 10 2024 Microsoft Package Maintainers <[email protected]> 17.0.11-1
+- Microsoft 17.0.11+9 initial release.
 * Wed Jan 10 2024 Microsoft Package Maintainers <[email protected]> 17.0.10-1
 - Microsoft 17.0.10+7 initial release.
 * Wed Oct 18 2023 Microsoft Package Maintainers <[email protected]> 17.0.9-1

diff --git a/linux/jdk/redhat/src/main/packaging/microsoft/21/msopenjdk-21.spec b/linux/jdk/redhat/src/main/packaging/microsoft/21/msopenjdk-21.spec
@@ -1,7 +1,7 @@
-%global upstream_version 21.0.2+13
+%global upstream_version 21.0.3+9
 # Only [A-Za-z0-9.] allowed in version:
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version
-%global spec_version 21.0.2
+%global spec_version 21.0.3
 %global spec_release 1
 %global priority 1211
 
@@ -222,6 +222,8 @@ fi
 /usr/lib/tmpfiles.d/%{name}.conf
 
 %changelog
+* Wed Apr 10 2024 Microsoft Package Maintainers <[email protected]> 21.0.3-1
+- Microsoft 21.0.3+9 initial release.
 * Thu Jan 11 2024 Microsoft Package Maintainers <[email protected]> 21.0.2-1
 - Microsoft 21.0.2+13 initial release.
 * Thu Oct 12 2023 Microsoft Package Maintainers <[email protected]> 21.0.1-1

diff --git a/wix/Build.OpenJDK_generic.cmd b/wix/Build.OpenJDK_generic.cmd
@@ -12,6 +12,7 @@ REM JVM=hotspot|openj9|dragonwell or both JVM=hotspot openj9
 REM PRODUCT_CATEGORY=jre|jdk (only one at a time)
 REM SKIP_MSI_VALIDATION=true (Add -sval option to light.exe to skip MSI/MSM validation and skip smoke.exe )
 REM UPGRADE_CODE_SEED=thisIsAPrivateSecretSeed ( optional ) for upgradable MSI (If none, new PRODUCT_UPGRADE_CODE is generate for each run)
+REM OUTPUT_BASE_FILENAME=customFileName (optional) for setting file names that are not based on the default naming convention
 
 SETLOCAL ENABLEEXTENSIONS
 SET ERR=0
@@ -148,7 +149,7 @@ FOR %%A IN (%ARCH%) DO (
     :CONTINUE
     ECHO Source dir used : !REPRO_DIR!
 
-    SET OUTPUT_BASE_FILENAME=!PRODUCT_SKU!!PRODUCT_MAJOR_VERSION!-!PRODUCT_CATEGORY!_!FOLDER_PLATFORM!_windows_!PACKAGE_TYPE!-!PRODUCT_FULL_VERSION!
+    IF NOT DEFINED OUTPUT_BASE_FILENAME SET OUTPUT_BASE_FILENAME=!PRODUCT_SKU!!PRODUCT_MAJOR_VERSION!-!PRODUCT_CATEGORY!_!FOLDER_PLATFORM!_windows_!PACKAGE_TYPE!-!PRODUCT_FULL_VERSION!
     REM find all *.wxi.template,*.wxl.template,*.wxs.template files and replace text with configurations
     FOR /f %%i IN ('dir /s /b *.wxi.template, *.Base.*.wxl.template *.!JVM!.*.wxl.template,*.wxs.template') DO (
         SET INPUT_FILE=%%~ni

diff --git a/wix/Includes/OpenJDK.Variables.wxi.template b/wix/Includes/OpenJDK.Variables.wxi.template
@@ -10,7 +10,7 @@
     <?define Win64="yes" ?>
     <?define Arch="(x64)" ?>
   <?elseif $(env.Platform)=arm64?>
-    <?define ProgramFilesFolder="ProgramFilesARMFolder" ?>
+    <?define ProgramFilesFolder="ProgramFiles64Folder" ?>
     <?define Win64="no" ?>
     <?define Arch="(arm64)" ?>
   <?endif?>

diff --git a/wix/Main.wxs.template b/wix/Main.wxs.template
@@ -52,7 +52,7 @@
             </Directory>
          </Directory>
     <?elseif $(env.Platform)=arm64?>
-        <Directory Id="ProgramFilesARMFolder">
+        <Directory Id="ProgramFiles64Folder"> <!-- ARM64 is 64bit -->
             <Directory Id="PRODUCTMANUFACTURER" Name="$(var.ProductManufacturer)">
                 <Directory Id="INSTALLDIR" Name="$(var.AppFolder)" />
             </Directory>

diff --git a/wix/README.md b/wix/README.md
@@ -50,6 +50,8 @@ call powershell.exe ./CreateSourceFolder.AdoptOpenJDK.ps1 ^
   set VENDOR_BRANDING_LOGO=$(var.SetupResourcesDir)\logo.ico
   set VENDOR_BRANDING_BANNER=$(var.SetupResourcesDir)\wix-banner.png
   set VENDOR_BRANDING_DIALOG=$(var.SetupResourcesDir)\wix-dialog.png
+  set OUTPUT_BASE_FILENAME=%PRODUCT_SKU%%PRODUCT_MAJOR_VERSION%-%PRODUCT_CATEGORY%_%FOLDER_PLATFORM%_windows_%PACKAGE_TYPE%-%PRODUCT_F
+ULL_VERSION%
   ```
 
  `Build.OpenJDK_generic.cmd` statically depend on this SDK version (edit if needed):