Merge branch 'eclipse-platform:master' into Fix3090

MohananRahul · web-flow · commit 24d832994d19 · 2025-06-06T13:42:07.000+05:30
diff --git a/.github/workflows/checkVersions.yml b/.github/workflows/checkVersions.yml
@@ -69,7 +69,7 @@ jobs:
         command: >
           mvn verify ${{ inputs.extra-maven-args }} -DskipTests -Dcompare-version-with-baselines.skip=false
           org.eclipse.tycho:tycho-versions-plugin:bump-versions -Dtycho.bump-versions.increment=100
-          --threads 1C --fail-at-end --show-version
+          --update-snapshots --threads 1C --fail-at-end --show-version
 
     - name: Commit version increments, if any
       run: |
diff --git a/JenkinsJobs/Builds/build.jenkinsfile b/JenkinsJobs/Builds/build.jenkinsfile
@@ -133,8 +133,8 @@ spec:
                   sshagent(['github-bot-ssh']) {
                     sh '''
                         set -eo pipefail
-                        git config --global user.email "eclipse-releng-bot@eclipse.org"
-                        git config --global user.name "Eclipse Releng Bot"
+                        git config --global user.email 'releng-bot@eclipse.org'
+                        git config --global user.name 'Eclipse Releng Bot'
                         ./mb100_cloneRepos.sh $CJE_ROOT/buildproperties.shsource 2>&1 | tee $logDir/mb100_cloneRepos.sh.log
                     '''
                   }
diff --git a/JenkinsJobs/Releng/prepareNextDevCycle.jenkinsfile b/JenkinsJobs/Releng/prepareNextDevCycle.jenkinsfile
@@ -83,7 +83,7 @@ pipeline {
 				checkout scm
 				sh '''
 					git submodule update --init --recursive
-					git config --global user.email 'eclipse-releng-bot@eclipse.org'
+					git config --global user.email 'releng-bot@eclipse.org'
 					git config --global user.name 'Eclipse Releng Bot'
 				'''
 			}
diff --git a/eclipse.jdt b/eclipse.jdt
@@ -1 +1 @@
-Subproject commit 9cfb980012e680317d07af6826345aa14060cc6c
+Subproject commit 17e910a3872a45bcead05eaac79beb1cb85878df
diff --git a/eclipse.jdt.debug b/eclipse.jdt.debug
@@ -1 +1 @@
-Subproject commit 6b29139ec39357b0bb7700b959b358fe1b5741d6
+Subproject commit 769a887e111fe6f5064b6afad2a80e2a03cf3739
diff --git a/eclipse.pde b/eclipse.pde
@@ -1 +1 @@
-Subproject commit 2b7b5cf392114fd4eef2b9012bddad5c4c4d3887
+Subproject commit 3807d8ba6dee5a3bc871416a1fb56ba40a94d8d6
diff --git a/eclipse.platform b/eclipse.platform
@@ -1 +1 @@
-Subproject commit 4cca97846e509c102ab5ffdec7f351ede423d52d
+Subproject commit c3dfa7bc07048f1db682284b32a4011290b81c55
diff --git a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
@@ -3,7 +3,7 @@
 <feature
       id="org.eclipse.help"
       label="%featureName"
-      version="2.3.2200.qualifier"
+      version="2.3.2300.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.help.base"
       license-feature="org.eclipse.license"
diff --git a/eclipse.platform.swt b/eclipse.platform.swt
@@ -1 +1 @@
-Subproject commit a3174e7d800f70ffad0f4347c746742eaae3420d
+Subproject commit 8e220ada2a481fcef64d06f72c31090784efce8e
diff --git a/equinox b/equinox
@@ -1 +1 @@
-Subproject commit 79b34279ded9bf68365e353a48da03d7ce1f752c
+Subproject commit 6de4b1c28e7f8ca9b1fb3130fa286347b1a91caa
diff --git a/oomph/Platform.setup b/oomph/Platform.setup
@@ -174,7 +174,6 @@
   </setupTask>
   <setupTask
       xsi:type="setup:VariableTask"
-      disabled="true"
       type="BOOLEAN"
       name="early.redirection.4.37"
       defaultValue="true"
@@ -184,21 +183,18 @@
   </setupTask>
   <setupTask
       xsi:type="setup:CompoundTask"
-      disabled="true"
       filter="(early.redirection.4.37=true)"
       name="EarlyRedirection">
     <setupTask
         xsi:type="setup:RedirectionTask"
-        disabled="true"
         sourceURL="https://download.eclipse.org/eclipse/updates/4.36-I-builds"
         targetURL="https://download.eclipse.org/eclipse/updates/4.37-I-builds">
       <description>Redirect 4.36 I-builds to 4.37 I-builds</description>
     </setupTask>
     <setupTask
         xsi:type="setup:RedirectionTask"
-        disabled="true"
         sourceURL="https://download.eclipse.org/eclipse/updates/4.35/R-4.35-202502280140"
-        targetURL="https://download.eclipse.org/eclipse/updates/4.36-I-builds/tbd">
+        targetURL="https://download.eclipse.org/eclipse/updates/4.36-I-builds/I20250528-1830">
       <description>Redirect the release 4.35 build to the final 4.36 I-build which should point at the simple repository to avoid redirecting to 4.36 while it's still empty before the actual release</description>
     </setupTask>
   </setupTask>

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ pipeline {`
`83`	`83`	`checkout scm`
`84`	`84`	`sh '''`
`85`	`85`	`git submodule update --init --recursive`
`86`		`- git config --global user.email 'eclipse-[email protected]'`
	`86`	`+ git config --global user.email '[email protected]'`
`87`	`87`	`git config --global user.name 'Eclipse Releng Bot'`
`88`	`88`	`'''`
`89`	`89`	`}`