Merge branch 'eclipse-platform:master' into master

Author: fedejeanne

.github/workflows/publishVersionCheckResults.yml

@@ -95,7 +95,7 @@ jobs:
     - name: Find existing information comment
       uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3.1.0
       id: search-comment
-      if: steps.fetch-patch.outputs.pull_request_number
+      if: always() && steps.fetch-patch.outputs.pull_request_number
       with:
         body-regex: '^${{ env.COMMENT_FIRST_LINE }}'
         issue-number: ${{ steps.fetch-patch.outputs.pull_request_number }}
@@ -104,7 +104,7 @@ jobs:
 
     - name: Add or update information comment
       uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-      if: always()
+      if: always() && steps.search-patch.outputs.result
       env:
         FILELIST: ${{ steps.git-commit.outputs.file-list }}
       with:
@@ -113,13 +113,21 @@ jobs:
           const fs = require('fs')
           const fileList = process.env.FILELIST
           if (fileList) { // if list is empty, no versions were changed
+            const prNumber = '${{ steps.fetch-patch.outputs.pull_request_number }}'
+            const pr = await github.rest.pulls.get({
+               pull_number: prNumber,
+               ...context.repo
+            })
+            const applyChangeMessagePart = pr.data.maintainer_can_modify
+              ? "An additional commit containing all the necessary changes was pushed to the top of this PR's branch. To obtain these changes (for example if you want to push more changes) either fetch from your fork or apply the _git patch_."
+              : "> [!WARNING]\n> :construction: **This PR cannot be modified by maintainers** because edits are disabled or it is created from an organization repository. To obtain the required changes apply the _git patch_ manually as an additional commit."
             const commentBody = `
           ${{ env.COMMENT_FIRST_LINE }}.
           Therefore the following files need a version increment:
           \`\`\`
           ${fileList}
           \`\`\`
-          An additional commit containing all the necessary changes was pushed to the top of this PR's branch. To obtain these changes (for example if you want to push more changes) either fetch from your fork or apply the _git patch_.
+          ${applyChangeMessagePart}
           <details>
           <summary>Git patch</summary>
           
@@ -130,7 +138,6 @@ jobs:
           
           Further information are available in [Common Build Issues - Missing version increments](https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/wiki/Common-Build-Issues#missing-version-increments).
           `.trim()
-            const prNumber = '${{ steps.fetch-patch.outputs.pull_request_number }}'
             const existingCommentId = '${{ steps.search-comment.outputs.comment-id  }}'
             if (existingCommentId) {
               github.rest.issues.updateComment({...context.repo, comment_id: existingCommentId, body: commentBody })

JenkinsJobs/Releng/prepareNextDevCycle.jenkinsfile

@@ -88,12 +88,6 @@ pipeline {
 				'''
 			}
 		}
-		/*TODO: Test:
-			- If deploying the parent POM works
-			- If pushing works to aggr and submodules (e.g. pde)
-			- if creation of milestones works in aggr-repo and submodules (e.g. PDE)
-			- if PR createion works in aggr-repo and submodules (e.g. PDE)
-		*/
 		stage('Update Maven Version') {
 			environment {
 				MAVEN_ARGS = '-U -B -ntp'
@@ -215,8 +209,14 @@ pipeline {
 						- Updating the previous release version to the current Release-Candidate: `${PREVIOUS_RELEASE_CANDIDATE_ID}`
 						""".stripIndent(), prBranch)
 
-					def submoduleURLs = sh(script: "git submodule foreach --quiet 'git config remote.origin.url'", returnStdout: true).trim().split('\\s')
-					for (submoduleURL in submoduleURLs) {
+					def submodulePaths = sh(script: "git submodule --quiet foreach 'echo \$sm_path'", returnStdout: true).trim().split('\\s')
+					for (submodulePath in submodulePaths) {
+						def diff = sh(script:"cd ${submodulePath} && git diff HEAD origin/master --shortstat", returnStdout: true).trim()
+						if (diff.isEmpty()) {
+							echo "Skipping submodule without changes: ${submodulePath}"
+							continue
+						}
+						def submoduleURL = sh(script: "cd ${submodulePath} && git config remote.origin.url", returnStdout: true).trim()
 						// Extract repository path from e.g.: https://github.com/eclipse-platform/eclipse.platform.git
 						def expectedPrefix = 'https://github.com/'
 						def expectedSuffix = '.git'
@@ -242,8 +242,16 @@ pipeline {
 					def organisations = [ 'eclipse-platform', 'eclipse-jdt', 'eclipse-pde', 'eclipse-equinox' ]
 					for (organisation in organisations) {
 						def repositories = listReposOfOrganization(organisation)
-						echo "${organisation} repositories: ${repositories}"
-						for (repository in repositories) {
+						echo "${organisation} repositories: ${repositories.name}"
+						for (repositoryData in repositories) {
+							def repository = repositoryData.name
+							if (repositoryData.archived) {
+								echo "Skipping archived repository: ${repository}"
+								continue
+							} else if ('.eclipsefdn'.equals(repository)) {
+								echo "Skipping .eclipsefdn repository of : ${organisation}"
+								continue
+							}
 							createMilestone(organisation, repository, "${NEXT_RELEASE_VERSION} M1",  "${NEXT_RELEASE_VERSION} Milestone 1",         "${M1_DATE}")
 							createMilestone(organisation, repository, "${NEXT_RELEASE_VERSION} M2",  "${NEXT_RELEASE_VERSION} Milestone 2",         "${M2_DATE}")
 							createMilestone(organisation, repository, "${NEXT_RELEASE_VERSION} M3",  "${NEXT_RELEASE_VERSION} Milestone 3",         "${M3_DATE}")
@@ -291,7 +299,7 @@ def listReposOfOrganization(String orga) {
 	if (!(response instanceof List) && (response.errors || (response.status && response.status != 201))) {
 		error "Response contains errors:\n${response}"
 	}
-	return response.name
+	return response
 }
 
 /**
@@ -310,8 +318,6 @@ def createMilestone(String orga, String repo, String msTitle, String msDescripti
 		} else {
 			error "Response contains errors:\n${response}"
 		}
-	} else {
-		echo 'Created successfully'
 	}
 }
 

JenkinsJobs/Releng/publishToMaven.jenkinsfile

@@ -177,7 +177,8 @@ pipeline {
 }
 
 def installMavenDaemon(String version) {
-	return install('mvnd', "https://downloads.apache.org/maven/mvnd/${version}/maven-mvnd-${version}-linux-amd64.tar.gz")
+	// Temporary workaround, until https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/6241#note_4109878 is really resolved
+	return install('mvnd', 'https://download.eclipse.org/oomph/archive/maven-mvnd-1.0.2-linux-amd64.tar.gz')
 }
 
 

JenkinsJobs/YBuilds/Y_unit_tests.groovy

@@ -3,7 +3,7 @@ def STREAMS = config.Streams
 
 def TEST_CONFIGURATIONS = [
 	[os: 'linux' , ws:'gtk'  , arch: 'x86_64' , javaVersion: 21, agentLabel: 'ubuntu-2404'        , javaHome: "tool(type:'jdk', name:'temurin-jdk21-latest')" ],
-	[os: 'linux' , ws:'gtk'  , arch: 'x86_64' , javaVersion: 25, agentLabel: 'ubuntu-2404'        , javaHome: "install('jdk', 'https://download.java.net/java/early_access/jdk25/21/GPL/openjdk-25-ea+21_linux-x64_bin.tar.gz')" ],
+	[os: 'linux' , ws:'gtk'  , arch: 'x86_64' , javaVersion: 25, agentLabel: 'ubuntu-2404'        , javaHome: "install('jdk', 'https://download.java.net/java/early_access/jdk25/27/GPL/openjdk-25-ea+27_linux-x64_bin.tar.gz')" ],
 	[os: 'macosx', ws:'cocoa', arch: 'aarch64', javaVersion: 21, agentLabel: 'nc1ht-macos11-arm64', javaHome: "'/Library/Java/JavaVirtualMachines/jdk-21.0.5+11-arm64/Contents/Home'" ],
 	[os: 'macosx', ws:'cocoa', arch: 'x86_64' , javaVersion: 21, agentLabel: 'nc1ht-macos11-arm64', javaHome: "'/Library/Java/JavaVirtualMachines/jdk-21.0.5+11/Contents/Home'" ],
 	[os: 'win32' , ws:'win32', arch: 'x86_64' , javaVersion: 21, agentLabel: 'qa6xd-win11'        , javaHome: "'C:\\\\Program Files\\\\Eclipse Adoptium\\\\jdk-21.0.5.11-hotspot'" ],

cje-production/dockerfiles/opensuse-gtk3-metacity/15-gtk3/Dockerfile

@@ -1,4 +1,4 @@
-FROM opensuse/leap:15@sha256:797c4f17a3d7875e1477d89846b33fd0910b84612d926539c98e89e5aec82ea0
+FROM opensuse/leap:15@sha256:774b7e4b804f00b1e01d07b5192294efa93f370935f9971886899480b9adb57a
 
 ### user name recognition at runtime w/ an arbitrary uid - for OpenShift deployments
 COPY scripts/uid_entrypoint /usr/local/bin/uid_entrypoint