Merge branch 'eclipse-platform:master' into master

Author: fedejeanne

.github/workflows/junit.yml

@@ -38,7 +38,7 @@ jobs:
            done
 
       - name: Publish Unit Test Results
-        uses: EnricoMi/publish-unit-test-result-action@afb2984f4d89672b2f9d9c13ae23d53779671984 # v2.19.0
+        uses: EnricoMi/publish-unit-test-result-action@3a74b2957438d0b6e2e61d67b05318aa25c9e6c6 # v2.20.0
         id: test-results
         with:
           commit: ${{ github.event.workflow_run.head_sha }}

.github/workflows/maven.yml

@@ -62,7 +62,7 @@ jobs:
     - name: Set up Maven
       uses: stCarolas/setup-maven@v5
       with:
-        maven-version: 3.9.9
+        maven-version: 3.9.10
     - name: Build
       env:
         GTK_XCFLAGS: '-Wno-deprecated-declarations'

.mvn/extensions.xml

@@ -4,6 +4,6 @@
 	<extension>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-build</artifactId>
-		<version>4.0.12</version>
+		<version>4.0.13</version>
 	</extension>
 </extensions>

Jenkinsfile

@@ -44,7 +44,7 @@ def runOnNativeBuildAgent(String platform, Closure body) {
 
 /** Returns the download URL of the JDK against whose C headers (in the 'include/' folder) and native libraries the SWT natives are compiled.*/
 def getNativeJdkUrl(String os, String arch) { // To update the used JDK version update the URL template below
-	if('win32'.equals(os) && 'aarch64'.equals(arch)) {
+	if ('win32'.equals(os) && 'aarch64'.equals(arch)) {
 		// Temporary workaround until there are official Temurin GA releases for Windows on ARM that can be consumed through JustJ
 		dir("${WORKSPACE}/repackage-win32.aarch64-jdk") {
 			sh """
@@ -86,7 +86,7 @@ def Set NATIVES_CHANGED = []
 
 pipeline {
 	options {
-		skipDefaultCheckout() // Specialiced checkout is performed below
+		skipDefaultCheckout() // Specialized checkout is performed below
 		timestamps()
 		timeout(time: 180, unit: 'MINUTES')
 		buildDiscarder(logRotator(numToKeepStr: 'master'.equals(env.BRANCH_NAME) ? '20' : '5', artifactNumToKeepStr: 'master'.equals(env.BRANCH_NAME) ? '3' : '1' ))
@@ -116,32 +116,31 @@ pipeline {
 					script {
 						def authorMail = sh(script: 'git log -1 --pretty=format:"%ce" HEAD', returnStdout: true)
 						echo 'HEAD commit author: ' + authorMail
-						if ('eclipse-releng-bot@eclipse.org'.equals(authorMail) && !params.forceNativeBuilds) {
-							// Prevent endless build-loops due to self triggering because of a previous automated build of SWT-natives and the associated updates.
+						def buildBotMail = 'platform-bot@eclipse.org'
+						if (buildBotMail.equals(authorMail) && !params.forceNativeBuilds) {
+							// Prevent endless build-loops due to self triggering because of a previous automated build of natives and the associated updates.
 							currentBuild.result = 'ABORTED'
 							error('Abort build only triggered by automated SWT-natives update.')
 						}
-					}
-					sh '''
+						sh """
+						java -version
 						git version
 						git lfs version
+						git config --global user.email '${buildBotMail}'
+						git config --global user.name 'Eclipse Platform Bot'
 						git config --unset core.hooksPath # Jenkins disables hooks by default as security feature, but we need the hooks for LFS
 						git lfs update # Install Git LFS hooks in repository, which has been skipped due to the initially nulled hookspath
 						git lfs pull
 						git fetch --all --tags --quiet
 						git remote set-url --push origin git@github.com:eclipse-platform/eclipse.platform.swt.git
-					'''
+						"""
+					}
 				}
 			}
 		}
 		stage('Check if SWT-binaries build is needed') {
 			steps {
 				dir('eclipse.platform.swt') {
-					sh'''
-						java -version
-						git config --global user.email 'eclipse-releng-bot@eclipse.org'
-						git config --global user.name 'Eclipse Releng Bot'
-					'''
 					script {
 						def allWS = ['cocoa', 'gtk', 'win32']
 						def libraryFilePattern = [ 'cocoa' : 'libswt-*.jnilib', 'gtk' : 'libswt-*.so', 'win32' : 'swt-*.dll' ]
@@ -157,7 +156,7 @@ pipeline {
 							'''
 							def sourceFoldersProps = readProperties(file: 'nativeSourceFolders.properties')
 							def sources = sourceFoldersProps.collectEntries{ k, src -> [ k, src.split(',').collect{ f -> '\'' + f + '\''}.join(' ') ] }
-							for(ws in allWS) {
+							for (ws in allWS) {
 								def diff = sh(script: "git diff HEAD ${swtTag} ${sources.src_common} ${sources['src_' + ws]}", returnStdout: true)
 								if (!diff.trim().isEmpty()) {
 									NATIVES_CHANGED += ws
@@ -175,7 +174,7 @@ pipeline {
 									sed -i -e "s/rev=${versions.rev}/rev=${versions.new_rev}/g" \
 										'bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak'
 								"""
-							for(ws in allWS) {
+							for (ws in allWS) {
 								if (NATIVES_CHANGED.contains(ws)) {
 								sh """
 									# Delete native binaries to be replaced by subsequent binaries build
@@ -239,7 +238,7 @@ pipeline {
 							script {
 								def (ws, os, arch) = env.PLATFORM.split('\\.')
 								dir("jdk-download-${ws}.${arch}") {
-									// Fetch the JDK, which provides the C header-files and shared native libraries, against which the natives are build.
+									// Fetch the JDK, which provides the C header files and shared native libraries against which the native code is built.
 									sh "curl ${getNativeJdkUrl(os, arch)} | tar -xzf - include/ lib/"
 									stash name:"jdk.resources.${ws}.${arch}", includes: "include/,lib/"
 									deleteDir()
@@ -382,11 +381,11 @@ pipeline {
 				sshagent(['github-bot-ssh']) {
 					dir('eclipse.platform.swt') {
 						sh """
-							# Check for the master-branch as late as possible to have as much of the same behaviour as possible
+							# Check for the master-branch as late as possible to have as much of the same behavior as possible
 							if [[ '${BRANCH_NAME}' == master ]] || [[ '${BRANCH_NAME}' =~ R[0-9]+_[0-9]+(_[0-9]+)?_maintenance ]]; then
 								if [[ ${params.skipCommit} != true ]]; then
 									
-									# Don't rebase and just fail in case another commit has been pushed to the master/maintanance branch in the meantime
+									# Don't rebase and just fail in case another commit has been pushed to the master/maintenance branch in the meantime
 									git push origin HEAD:refs/heads/${BRANCH_NAME}
 									git push origin refs/tags/${getLatestGitTag()}