Prepare Release 4.36

.github/workflows/prepareRelease.yml

@@ -1,15 +1,23 @@
 name: Prepare Next Release
 on:
-  milestone:
-    types: [created]
+  workflow_dispatch:
+    inputs:
+      nextReleaseName:
+        description: 'Next release name, e.g.: 2025-03'
+        required: true
+      nextReleaseVersion:
+        description: 'Next release name, e.g.: 4.35'
+        required: true
+      baselineRepository:
+        description: 'Previous release baseline repository, e.g.: 4.34-I-builds/I20241120-1800'
+        required: true
 
 permissions:
   contents: read
 
 jobs:
   prepare:
     runs-on: ubuntu-latest
-    if: contains(github.event.milestone.description, 'Release')
     permissions:
       pull-requests: write
       contents: write
@@ -18,10 +26,6 @@ jobs:
       uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
       with:
         maven-version: 3.9.9
-    - id: get-release-name
-      run: |
-        name=$(echo ${{ github.event.milestone.due_on }} | cut -d- -f-2)
-        echo "name=$name" >> $GITHUB_OUTPUT
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
         ref: master
@@ -32,15 +36,20 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Update Main Versions
-      run: mvn -U -ntp -f eclipse-platform-parent org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=${{ github.event.milestone.title }}.0-SNAPSHOT -Dmodules=../eclipse.platform.releng.prereqs.sdk
+      run: mvn -U -ntp -f eclipse-platform-parent org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=${{ inputs.nextReleaseVersion }}.0-SNAPSHOT -Dmodules=../eclipse.platform.releng.prereqs.sdk
     - name: Update Release Versions
-      run: mvn -ntp -f eclipse-platform-parent/pom.xml --non-recursive org.eclipse.tycho:tycho-versions-plugin:set-property -Dproperties=releaseVersion,releaseName -DnewReleaseName=${{ steps.get-release-name.outputs.name }} -DnewreleaseVersion=${{ github.event.milestone.title }}
-    - name: Create Pull Request for Release ${{ github.event.milestone.title }}
+      run: >-
+        mvn -ntp -f eclipse-platform-parent/pom.xml --non-recursive org.eclipse.tycho:tycho-versions-plugin:set-property 
+        -Dproperties=releaseVersion,releaseName,previous-release.baseline
+        -DnewReleaseName=${{ inputs.nextReleaseName }}
+        -DnewReleaseVersion=${{ inputs.nextReleaseVersion }}
+        '-DnewPrevious-release.baseline=https://download.eclipse.org/eclipse/updates/${{ inputs.baselineRepository }}'
+    - name: Create Pull Request for Release ${{ inputs.nextReleaseVersion }}
       uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
       with:
-        commit-message: Prepare Release ${{ github.event.milestone.title }}
-        branch: prepare_R${{ github.event.milestone.title }}
-        title: Prepare Release ${{ github.event.milestone.title }}
+        commit-message: Prepare Release ${{ inputs.nextReleaseVersion }}
+        branch: prepare_R${{ inputs.nextReleaseVersion }}
+        title: Prepare Release ${{ inputs.nextReleaseVersion }}
         body: A new Release Milstone was created, please review the changes and merge if appropriate.
         delete-branch: true
         milestone: ${{ github.event.milestone.number }}

.github/workflows/updateRelease.yml

@@ -2,10 +2,26 @@ name: Update For Next Release
 
 on:
   workflow_call:
+    inputs:
+      nextReleaseVersion:
+        description: 'The version of the release, for example: 4.35'
+        type: string
+        required: true
+      botName:
+        description: The name of the bot that authos the changes
+        type: string
+        default: 'Eclipse Releng Bot'
+      botMail:
+        description: The name of the bot that authos the changes
+        type: string
+        default: '[email protected]'
+    secrets:
+      githubBotPAT:
+        description: The personal access token (with scope 'public_repo') of the bot to push a required change to a branch.
+
 jobs:
   update:
     runs-on: ubuntu-latest
-    if: contains(github.event.milestone.description, 'Release') 
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
@@ -24,15 +40,18 @@ jobs:
     - name: Update Versions
       run: >-
           mvn -U -B -ntp
-          org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=${{ github.event.milestone.title }}.0-SNAPSHOT
-          org.eclipse.tycho:tycho-versions-plugin:set-parent-version -DnewParentVersion=${{ github.event.milestone.title }}.0-SNAPSHOT
-    - name: Create Pull Request for Release ${{ github.event.milestone.title }}
+          org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=${{ inputs.nextReleaseVersion }}.0-SNAPSHOT
+          org.eclipse.tycho:tycho-versions-plugin:set-parent-version -DnewParentVersion=${{ inputs.nextReleaseVersion }}.0-SNAPSHOT
+    - name: Create Pull Request for Release ${{ inputs.nextReleaseVersion }}
       uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
       with:
-        commit-message: Update for release ${{ github.event.milestone.title }}
-        branch: update_R${{ github.event.milestone.title }}
-        title: Update for release ${{ github.event.milestone.title }}
-        body: A new release milstone was created, please review the changes and merge if appropriate.
+        token: ${{ secrets.githubBotPAT || secrets.GITHUB_TOKEN }}
+        commit-message: Update for release ${{ inputs.nextReleaseVersion }}
+        branch: update_R${{ inputs.nextReleaseVersion }}
+        title: Update for release ${{ inputs.nextReleaseVersion }}
+        body: A new release milestone was created, please review the changes and merge if appropriate.
+        author: ${{ inputs.botName }} <${{ inputs.botMail }}>
+        committer: ${{ inputs.botName }} <${{ inputs.botMail }}>
         delete-branch: true
         milestone: ${{ github.event.milestone.number }}
         add-paths: |

Jenkinsfile

@@ -23,7 +23,6 @@ pipeline {
 				anyOf {
 					branch 'master'
 					branch 'R*_maintenance'
-					branch 'prepare_R*'
 				}
 			}
 			steps {

RELEASE.md

@@ -194,8 +194,12 @@ The release is scheduled for 10AM EST. Typically the jobs are scheduled beforeha
 #### **Create new Stream Repos:**
   - Run the [Create New Stream Repos](https://ci.eclipse.org/releng/job/Releng/job/newStreamRepos/) job to make an I-builds repo for the next release.
 
+#### **Prepare:**
+  - Run the [prepareRelease](https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/actions/workflows/prepareRelease.yml) GH workflow to create a PR
+  to preapre eclipse-platform-parent/pom.xml for for the next release.
+
 #### **Create Git Milestones for the next Release:**
-  - Milestones in git are created by running the create-milestones job in jenkins, usually after RC1 or RC2. Only specific users can access this job for security reasons. If milestones need to be created and have not please contact @sdawley @sravanlakkimsetti or @laeubi to run it.
+  - Milestones in git are created by running the `create-milestones` job in jenkins, usually after RC1 or RC2. Only specific users can access this job for security reasons. If milestones need to be created and have not please contact @sdawley @sravanlakkimsetti or @laeubi to run it.
 
 #### **Version Updates:**
   - Once the milestones are created (see above) the [Prepare Next Release](https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/actions/workflows/prepareRelease.yml) workflow will run, which will update pom and product versions for the Eclipse repositories and submit pull requests for the changes.  

eclipse-platform-parent/pom.xml

@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse</groupId>
   <artifactId>eclipse-platform-parent</artifactId>
-  <version>4.35.0-SNAPSHOT</version>
+  <version>4.36.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <!--
     See maven-enforcer-plugin configuration to actually break the build if
@@ -49,8 +49,8 @@
       such as Version: Mars (4.5), for main features.
       See bug 328139.
     -->
-    <releaseName>2025-03</releaseName>
-    <releaseVersion>4.35</releaseVersion>
+    <releaseName>2025-06</releaseName>
+    <releaseVersion>4.36</releaseVersion>
     <!--
       The releaseNumbers below, for SDK and Platform, might be
       thought of as the "marketing number" or "branding number",
@@ -129,7 +129,7 @@
     <compare-version-with-baselines.skip>true</compare-version-with-baselines.skip>
     <version.baseline.check.skip>${compare-version-with-baselines.skip}</version.baseline.check.skip> <!-- Allows projects to overwrite the value set on the CLI to skip the check in any case. -->
     <tycho.baseline.replace>all</tycho.baseline.replace>
-    <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.34-I-builds/I20241120-1800/</previous-release.baseline>
+    <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.34-I-builds/I2026-1800</previous-release.baseline>
 
     <!--
       Declaration of properties that contribute to the arg line for the tycho-surefire-plugin.
@@ -243,7 +243,7 @@
             <artifact>
               <groupId>org.eclipse</groupId>
               <artifactId>eclipse-sdk-prereqs</artifactId>
-              <version>4.35.0-SNAPSHOT</version>
+              <version>4.36.0-SNAPSHOT</version>
             </artifact>
           </target>
           <environments>

eclipse.platform.releng.prereqs.sdk/pom.xml

@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse-platform-parent</artifactId>
-    <version>4.35.0-SNAPSHOT</version>
+    <version>4.36.0-SNAPSHOT</version>
     <relativePath>../eclipse-platform-parent</relativePath>
   </parent>