Merge branch 'master' into dependabot/github_actions/actions/download-artifact-4.1.8

Author: gdams

.github/workflows/scorecards.yml

@@ -66,6 +66,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
+        uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
         with:
           sarif_file: results.sarif

linux/jdk/alpine/src/main/packaging/Dockerfile

@@ -31,6 +31,7 @@ RUN --mount=type=secret,id=gpg,gid=1000,uid=1000,dst=/tmp/private.rsa \
 		wget -o /home/builder/.abuild/private.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk; \
 	else \
 		abuild-keygen -a -n; \
+		sudo cp /home/builder/.abuild/*.rsa.pub /etc/apk/keys/; \
 	fi
 
 # Prepare entrypoint

linux/jdk/alpine/src/packageTest/java/packaging/AlpineFlavours.java

@@ -35,10 +35,9 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
 		return Stream.of(
 			Arguments.of("alpine", "edge"),
 			Arguments.of("alpine", "latest"),
-			Arguments.of("alpine", "3.17"),
-			Arguments.of("alpine", "3.16"),
-			Arguments.of("alpine", "3.15"),
-			Arguments.of("alpine", "3.14")
+			Arguments.of("alpine", "3.19"),
+			Arguments.of("alpine", "3.18"),
+			Arguments.of("alpine", "3.17")
 		);
 	}
 }

linux/jre/alpine/src/main/packaging/Dockerfile

@@ -27,6 +27,7 @@ RUN --mount=type=secret,id=gpg,gid=1000,uid=1000,dst=/tmp/private.rsa \
 		wget -o /home/builder/.abuild/private.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk; \
 	else \
 		abuild-keygen -a -n; \
+		sudo cp /home/builder/.abuild/*.rsa.pub /etc/apk/keys/; \
 	fi
 
 # Prepare entrypoint

linux/jre/alpine/src/packageTest/java/packaging/AlpineFlavours.java

@@ -35,10 +35,9 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
 		return Stream.of(
 			Arguments.of("alpine", "edge"),
 			Arguments.of("alpine", "latest"),
-			Arguments.of("alpine", "3.17"),
-			Arguments.of("alpine", "3.16"),
-			Arguments.of("alpine", "3.15"),
-			Arguments.of("alpine", "3.14")
+			Arguments.of("alpine", "3.19"),
+			Arguments.of("alpine", "3.18"),
+			Arguments.of("alpine", "3.17")
 		);
 	}
 }

wix/Lang/OpenJDK.Base.zh-cn.wxl.template

@@ -6,10 +6,10 @@
 	<String Id="ProductUrlUpdateInfo" Value="{product_update_info_link}" />
 	<String Id="OSVersionRequired" Value="Windows 7 or later is required." />
 	<String Id="ProductIsNotSupportedOnItanium" Value="This product is not supported on Itanium 64-bit systems." />
-	<String Id="FeatureEnvironmentTitle" Value="Add to PATH" />
-	<String Id="FeatureEnvironmentDescription" Value="Add to PATH environment variable." />
-	<String Id="FeatureJavaHomeTitle" Value="Set JAVA_HOME variable" />
-	<String Id="FeatureJavaHomeDescription" Value="Set JAVA_HOME environment variable." />
+	<String Id="FeatureEnvironmentTitle" Value="修改 PATH 变量值." />
+	<String Id="FeatureEnvironmentDescription" Value="通过将 JDK 安装路径添加到 PATH 值开头来修改 PATH 环境变量值." />
+	<String Id="FeatureJavaHomeTitle" Value="设置或重写 JAVA_HOME 变量." />
+	<String Id="FeatureJavaHomeDescription" Value="使用 JDK 安装路径来设置或重写 JAVA_HOME 环境变量值." />
 	<String Id="FeatureSourceTitle" Value="Source Code" />
 	<String Id="FeatureSourceDescription" Value="Source code for classes that comprise the public API of Java." />
 	<String Id="FeatureJarFileRunWithTitle" Value="Associate .jar" />
@@ -25,4 +25,6 @@
 	<String Id="CustomScopeDlgTitle" Value="{\WixUI_Font_Title}Installation Scope" />
 	<String Id="CustomScopeDlgPerUser" Value="Install &amp;just for you ([LogonUser])" />
 	<String Id="CustomScopeDlgPerMachine" Value="Install for all users of this &amp;machine" />
+	<String Id="BrowseDlg_Title" Value="浏览 [ProductName]" />
 </WixLocalization>
+	

wix/Lang/OpenJDK.Base.zh-tw.wxl.template

@@ -6,10 +6,10 @@
 	<String Id="ProductUrlUpdateInfo" Value="{product_update_info_link}" />
 	<String Id="OSVersionRequired" Value="Windows 7 or later is required." />
 	<String Id="ProductIsNotSupportedOnItanium" Value="This product is not supported on Itanium 64-bit systems." />
-	<String Id="FeatureEnvironmentTitle" Value="Add to PATH" />
-	<String Id="FeatureEnvironmentDescription" Value="Add to PATH environment variable." />
-	<String Id="FeatureJavaHomeTitle" Value="Set JAVA_HOME variable" />
-	<String Id="FeatureJavaHomeDescription" Value="Set JAVA_HOME environment variable." />
+	<String Id="FeatureEnvironmentTitle" Value="修改 PATH 變數值" />
+	<String Id="FeatureEnvironmentDescription" Value="將 JDK 安裝路徑新增至 PATH 值開頭來修改 PATH 環境變數值." />
+	<String Id="FeatureJavaHomeTitle" Value="設定或重寫 JAVA_HOME 變量" />
+	<String Id="FeatureJavaHomeDescription" Value="使用 JDK 安裝路徑來設定或重寫 JAVA_HOME 環境變數值." />
 	<String Id="FeatureSourceTitle" Value="Source Code" />
 	<String Id="FeatureSourceDescription" Value="Source code for classes that comprise the public API of Java." />
 	<String Id="FeatureJarFileRunWithTitle" Value="Associate .jar" />
@@ -25,4 +25,5 @@
 	<String Id="CustomScopeDlgTitle" Value="{\WixUI_Font_Title}Installation Scope" />
 	<String Id="CustomScopeDlgPerUser" Value="Install &amp;just for you ([LogonUser])" />
 	<String Id="CustomScopeDlgPerMachine" Value="Install for all users of this &amp;machine" />
-</WixLocalization>
+	<String Id="BrowseDlg_Title" Value="瀏覽 [ProductName]" />
+</WixLocalization>