Merge branch 'eclipse-platform:master' into master

fedejeanne · web-flow · commit fb9beea40f92 · 2025-06-30T08:00:07.000+02:00
diff --git a/.github/workflows/publishVersionCheckResults.yml b/.github/workflows/publishVersionCheckResults.yml
@@ -118,7 +118,7 @@ jobs:
                pull_number: prNumber,
                ...context.repo
             })
-            const applyChangeMessagePart = pr.data.maintainer_can_modify
+            const applyChangeMessagePart = pr.data.maintainer_can_modify || pr.data.base.repo.full_name == pr.data.head.repo.full_name
               ? "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 = `
diff --git a/JenkinsJobs/Releng/prepareNextDevCycle.jenkinsfile b/JenkinsJobs/Releng/prepareNextDevCycle.jenkinsfile
@@ -114,13 +114,17 @@ pipeline {
 					"STREAM=\"${PREVIOUS_RELEASE_VERSION}.0\"" : "STREAM=\"${NEXT_RELEASE_VERSION}.0\"",
 					"STREAMMajor=\"${PREVIOUS_RELEASE_VERSION_MAJOR}\"" : "STREAMMajor=\"${NEXT_RELEASE_VERSION_MAJOR}\"",
 					"STREAMMinor=\"${PREVIOUS_RELEASE_VERSION_MINOR}\"" : "STREAMMinor=\"${NEXT_RELEASE_VERSION_MINOR}\"",
+					"ECLIPSE_RUN_REPO=\"https://download.eclipse.org/eclipse/updates/${PREVIOUS_RELEASE_VERSION}-I-builds/\"" : "ECLIPSE_RUN_REPO=\"https://download.eclipse.org/eclipse/updates/${NEXT_RELEASE_VERSION}-I-builds/\"",
 				])
 				replaceInFile('eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.p2.inf', [
 					"${PREVIOUS_RELEASE_VERSION} Release" : "${NEXT_RELEASE_VERSION} Release",
 				])
 				replaceInFile('eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.p2.inf', [
 					"${PREVIOUS_RELEASE_VERSION} Release" : "${NEXT_RELEASE_VERSION} Release",
 				])
+				replaceInFile('eclipse.platform.releng/features/org.eclipse.platform-feature/rootfiles/.eclipseproduct', [
+					"version=${PREVIOUS_RELEASE_VERSION}.0" : "version=${NEXT_RELEASE_VERSION}.0",
+				])
 				replaceInFile('production/testScripts/configuration/streamSpecific.properties', [
 					"for ${PREVIOUS_RELEASE_VERSION}.0 builds" : "for ${NEXT_RELEASE_VERSION}.0 builds",
 				])
diff --git a/eclipse.jdt.core b/eclipse.jdt.core
@@ -1 +1 @@
-Subproject commit f86e4064136f0258c75ad7bb8bbabd5f20b58db1
+Subproject commit 727f3b46dd27826f90455de6869e109c7ebc408a
diff --git a/eclipse.jdt.debug b/eclipse.jdt.debug
@@ -1 +1 @@
-Subproject commit d8fb6abfa2977de298738e0cfcedc28928ebcc91
+Subproject commit d4763b2d67c2d05ef1358e556ea08ca1fc8304fd
diff --git a/eclipse.jdt.ui b/eclipse.jdt.ui
@@ -1 +1 @@
-Subproject commit e100015cee4d9a0af50f1f98e4d1ca1a47d98ef1
+Subproject commit f9dd240f40428769b922725156acc2a4259244e2
diff --git a/eclipse.pde b/eclipse.pde
@@ -1 +1 @@
-Subproject commit ab57e13367e354497c1e833f6c6068b14f460d3c
+Subproject commit 1d7648e3128fce0aaf2ea1d41ce5dd5cfb69c966
diff --git a/eclipse.platform b/eclipse.platform
@@ -1 +1 @@
-Subproject commit da462e2dea56accd18ec83a04718345b3abe8c90
+Subproject commit 1ef11c0f0dc792ede37394fe9c270a48706565c9
diff --git a/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
@@ -39,14 +39,14 @@
     </location>
 
     <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-      <unit id="org.eclipse.emf.common" version="2.42.0.v20250401-0947"/>
+      <unit id="org.eclipse.emf.common" version="2.43.0.v20250629-1403"/>
       <unit id="org.eclipse.emf.ecore" version="2.39.0.v20250401-0947"/>
       <unit id="org.eclipse.emf.ecore.change" version="2.17.0.v20240604-0832"/>
       <unit id="org.eclipse.emf.ecore.xmi" version="2.39.0.v20250414-1351"/>
       <unit id="org.eclipse.emf.edit" version="2.23.0.v20250330-0741"/>
       <unit id="org.eclipse.emf.databinding" version="1.9.0.v20240604-0832"/>
       <unit id="org.eclipse.emf.databinding.edit" version="1.10.0.v20240604-0832"/>
-      <repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.42.0"/>
+      <repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202506291444"/>
     </location>
 
     <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
@@ -10,7 +10,7 @@
    <feature id="org.eclipse.swt.tools.feature" version="0.0.0"/>
    <feature id="org.eclipse.equinox.executable" version="0.0.0"/>
    <feature id="org.eclipse.sdk" version="0.0.0"/>
-   <feature id="org.eclipse.e4.core.tools.feature.source" version="0.0.0"/>
+   <feature id="org.eclipse.e4.core.tools.feature" version="0.0.0"/>
    <feature id="org.eclipse.e4.tools.persistence.feature" version="0.0.0"/>
    <feature id="org.eclipse.pde.unittest.junit" version="0.0.0"/>
    <feature id="org.eclipse.tips.feature" version="0.0.0"/>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.product
@@ -182,11 +182,8 @@ United States, other countries, or both.
    <features>
       <feature id="org.eclipse.sdk"/>
       <feature id="org.eclipse.equinox.p2.user.ui"/>
-      <feature id="org.eclipse.equinox.p2.user.ui.source"/>
       <feature id="org.eclipse.e4.core.tools.feature" installMode="root"/>
-      <feature id="org.eclipse.e4.core.tools.feature.source" installMode="root"/>
       <feature id="org.eclipse.tips.feature" installMode="root"/>
-      <feature id="org.eclipse.tips.feature.source" installMode="root"/>
    </features>
 
    <configurations>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2014 IBM Corporation, and others.
+  Copyright (c) 2014, 2025 IBM Corporation, and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -43,7 +43,7 @@
         <configuration>
           <includeAllDependencies>false</includeAllDependencies>
           <compress>false</compress>
-          <name>Eclipse Equinox and p2 runtime target repository</name>
+          <repositoryName>Eclipse Equinox and p2 runtime target repository</repositoryName>
         </configuration>
       </plugin>
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012, 2020 Eclipse Foundation.
+  Copyright (c) 2012, 2025 Eclipse Foundation.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -105,7 +105,6 @@
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-p2-repository-plugin</artifactId>
-        <version>${tycho.version}</version>
         <executions>
           <execution>
             <id>default-assemble-repository</id>
diff --git a/eclipse.platform.releng/publish-to-maven-central/SDK4Mvn.aggr b/eclipse.platform.releng/publish-to-maven-central/SDK4Mvn.aggr
@@ -4,7 +4,6 @@
     <contributions label="sdk_http">
       <repositories location="https://download.eclipse.org/eclipse/updates/4.37-I-builds">
         <bundles name="org.eclipse.equinox.slf4j"/>
-        <bundles name="org.eclipse.tm.terminal.control"/>
         <features name="org.eclipse.equinox.p2.sdk.feature.group"/>
         <features name="org.eclipse.equinox.p2.discovery.feature.feature.group"/>
         <features name="org.eclipse.core.runtime.feature.feature.group"/>
@@ -16,6 +15,7 @@
         <features name="org.eclipse.pde.unittest.junit.feature.group"/>
         <features name="org.eclipse.tips.feature.feature.group"/>
         <features name="org.eclipse.jdt.ui.unittest.junit.feature.feature.group"/>
+        <features name="org.eclipse.terminal.feature.feature.group"/>
       </repositories>
     </contributions>
   </validationSets>
diff --git a/eclipse.platform.swt b/eclipse.platform.swt
@@ -1 +1 @@
-Subproject commit e2cbda9823b020a4e230fe0e5aca3216023cb7fc
+Subproject commit 8a8c67d14986abab9a2d7049cca2476ec8fcb7b0
diff --git a/eclipse.platform.ui b/eclipse.platform.ui
@@ -1 +1 @@
-Subproject commit 51c4ffc7261f610f1ebaa93024cb94576c633c62
+Subproject commit a4840da1b2b89a93298ea766feb7f2738c935677
diff --git a/equinox b/equinox
@@ -1 +1 @@
-Subproject commit c3e98066701895eeaab9c5f97d80b5555ffa2ec4
+Subproject commit 833a216f56e2815a293bcf9eb5577811e79d7e6b
