From 1ce7869c1c4fc7371e93bfb93e6967123b7bd5a7 Mon Sep 17 00:00:00 2001 From: Ed Merks Date: Thu, 8 Oct 2026 13:35:59 +0200 Subject: [PATCH] Back to staging - Use https://download.eclipse.org/staging/2026-12/ Part of https://github.com/eclipse-packaging/packages/issues/472 --- RELEASING.md | 12 +++++++----- .../epp.website.xml | 2 +- .../epp.website.xml | 2 +- .../epp.website.xml | 2 +- .../epp.website.xml | 2 +- .../epp.website.xml | 2 +- .../epp.website.xml | 2 +- .../epp.website.xml | 2 +- .../epp.website.xml | 2 +- .../epp.website.xml | 2 +- .../epp.website.xml | 2 +- .../src/org/eclipse/epp/releng/updater/Updater.java | 2 +- releng/org.eclipse.epp.config/parent/pom.xml | 6 +++--- .../tools/upload-to-staging.sh | 4 ++-- 14 files changed, 23 insertions(+), 21 deletions(-) diff --git a/RELEASING.md b/RELEASING.md index 89eb50ff..d2086677 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -3,7 +3,7 @@ This guide contains the step-by-step process to complete an EPP release and assumes that you have an IDE provisioned using the [Oomph setup]( https://github.com/eclipse-packaging/packages/blob/master/CONTRIBUTING.md#create-an-eclipse-development-environment). -**Before** copying this file to create a new issue titled `EPP 2026-12 M1` with label `endgame`, update the names and versions, including those in this document. +**Before** copying this file to create a new issue titled `EPP 2026-12 M2` with label `endgame`, update the names and versions, including those in this document. - [ ] To update names and versions, edit [org.eclipse.epp.releng.updater.Updater]( releng/org.eclipse.epp.config/org.eclipse.epp.releng.updater/src/org/eclipse/epp/releng/updater/Updater.java ) to set the values of `MILESTONE`, `PLATFORM_VERSION`, and possibly `EXECUTION_ENVIRONMENT` to the current appropriate values. @@ -68,6 +68,7 @@ Scroll down for the per-milestone/RC steps. ) which lists any package and platform +1s that have been received since the last update. - [ ] Wait for announcement that the staging repo is ready on [simrel-dev](https://accounts.eclipse.org/mailing-list/simrel-dev). An [example announcement](https://www.eclipse.org/lists/simrel-dev/msg00032.html). + - [ ] Be sure to pull the `main` branch first and then create a new branch for a new pull request. - [ ] Update `SIMREL_REPO` in `releng/org.eclipse.epp.config/parent/pom.xml` if not done above. - [ ] Or use the `Run` toolbar button drop-down menu to launch the `Update to Milestone Repository` launch configuration. This will automatically determine the correct update site URL and will create an appropriate commit message in the system clipboard. @@ -79,6 +80,7 @@ Scroll down for the per-milestone/RC steps. This script will make a local commit you need to push; **do not amend it** because the timestamp is relevant. - In some cases a respin/rebuild is needed and setGitDate needs to be run again. In that case you may need to manually add a minute or two to the applied timestamp in the script. +- [ ] Push the two commits on the new branch to your fork in order to launch a verification build and then merge the result to `main`. - [ ] Run a [CI build](https://ci.eclipse.org/packaging/job/epp/job/master/) that includes the above changes. - If the build fails there may be the opportunity to continue the build rather than restart it. This is relatively underused option but enabled by the multi-step Jenkins build in the Jenkinsfile. @@ -112,9 +114,9 @@ Scroll down for the per-milestone/RC steps. - [ ] Use the `External Tools` toolbar button drop-down menu to launch the `Prepare Staging Sanity Check` launch configuration. This will automatically download the packages specified in the launch configuration to subfolders in `/org.eclipse.epp.packages/sanity-check` to make the follow steps easier. - [ ] Download a package from the build's [staging output](https://download.eclipse.org/technology/epp/staging/). - - [ ] Make sure filenames contain expected build name and milestone, e.g., `2026-12-M1`. + - [ ] Make sure filenames contain expected build name and milestone, e.g., `2026-12-M2`. - [ ] Splash screen says the expected release name with no milestone, e.g., `2026-12`. - - [ ] `Help -> About` says the expected build name and milestone, e.g., `2026-12-M1`. + - [ ] `Help -> About` says the expected build name and milestone, e.g., `2026-12-M2`. - [ ] From the `Console`, open the `Host OSGi console` and use `ss -s INSTALLED` to verify that there are no bundles failing to resolve. - [ ] The `org.eclipse.epp.package.*` features and bundles have the timestamp of the forced qualifier update or later. - [ ] Upgrade from previous release works. @@ -132,7 +134,7 @@ Scroll down for the per-milestone/RC steps. (especially justj, update [remove-justj-from-p2.xml](https://github.com/eclipse-packaging/packages/blob/master/releng/org.eclipse.epp.config/tools/remove-justj-from-p2.xml) if needed). - [ ] Edit the [Jenkins build](https://ci.eclipse.org/packaging/job/epp/job/master/lastBuild/). - [ ] Mark build as Keep forever. - - [ ] Edit Jenkins Build Information and name it, e.g., `2026-12 M1`. + - [ ] Edit Jenkins Build Information and name it, e.g., `2026-12 M2`. - [ ] Run the [Promote a Build]( https://ci.eclipse.org/packaging/job/promote-a-build/ ) CI job to prepare build artifacts and copy them to download.eclipse.org. @@ -166,7 +168,7 @@ This applies to all releases, i.e. M1, M2, M3, RC1 and R. Everything except R is typically the Friday around 9:30am Ottawa time and the R is the following Wednesday sometime before 10am in coordination with the SimRel release engineer. - [ ] Check that this worked: - copy the composite\*M1.jar files over the composite\*.jar files in https://download.eclipse.org/technology/epp/packages/2026-12/ - + copy the composite\*M2.jar files over the composite\*.jar files in https://download.eclipse.org/technology/epp/packages/2026-12/ - this is done automatically with the [EPP Make Visible job](https://ci.eclipse.org/packaging/job/epp-makeVisible/) which is automatically triggered by SimRel's diff --git a/packages/org.eclipse.epp.package.committers.feature/epp.website.xml b/packages/org.eclipse.epp.package.committers.feature/epp.website.xml index 871863a7..427d3e1b 100644 --- a/packages/org.eclipse.epp.package.committers.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.committers.feature/epp.website.xml @@ -34,6 +34,6 @@ Click here to open a b - + diff --git a/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml b/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml index cc7e606b..5210ade5 100644 --- a/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml @@ -22,6 +22,6 @@ - + diff --git a/packages/org.eclipse.epp.package.dsl.feature/epp.website.xml b/packages/org.eclipse.epp.package.dsl.feature/epp.website.xml index 9fe6d910..5d4d1801 100644 --- a/packages/org.eclipse.epp.package.dsl.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.dsl.feature/epp.website.xml @@ -27,6 +27,6 @@ - + diff --git a/packages/org.eclipse.epp.package.embedcpp.feature/epp.website.xml b/packages/org.eclipse.epp.package.embedcpp.feature/epp.website.xml index a7e7ce6e..06a63237 100644 --- a/packages/org.eclipse.epp.package.embedcpp.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.embedcpp.feature/epp.website.xml @@ -29,6 +29,6 @@ To avoid compatibility issues with pre 6.x plug-ins, it is recommended to cre - + diff --git a/packages/org.eclipse.epp.package.java.feature/epp.website.xml b/packages/org.eclipse.epp.package.java.feature/epp.website.xml index 4a730d03..1a3894ff 100644 --- a/packages/org.eclipse.epp.package.java.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.java.feature/epp.website.xml @@ -28,6 +28,6 @@ - + diff --git a/packages/org.eclipse.epp.package.jee.feature/epp.website.xml b/packages/org.eclipse.epp.package.jee.feature/epp.website.xml index a9bcb002..7e5be301 100644 --- a/packages/org.eclipse.epp.package.jee.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.jee.feature/epp.website.xml @@ -34,6 +34,6 @@ Click + diff --git a/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml b/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml index 5297c3d9..aa93cd26 100644 --- a/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml @@ -24,6 +24,6 @@ - + diff --git a/packages/org.eclipse.epp.package.php.feature/epp.website.xml b/packages/org.eclipse.epp.package.php.feature/epp.website.xml index 3a51b357..a4af2cb9 100644 --- a/packages/org.eclipse.epp.package.php.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.php.feature/epp.website.xml @@ -32,6 +32,6 @@ Click + diff --git a/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml b/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml index 1cfb8089..bdf5037f 100644 --- a/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml @@ -27,6 +27,6 @@ - + diff --git a/packages/org.eclipse.epp.package.scout.feature/epp.website.xml b/packages/org.eclipse.epp.package.scout.feature/epp.website.xml index 607adcb8..885681c2 100644 --- a/packages/org.eclipse.epp.package.scout.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.scout.feature/epp.website.xml @@ -31,6 +31,6 @@ - + diff --git a/releng/org.eclipse.epp.config/org.eclipse.epp.releng.updater/src/org/eclipse/epp/releng/updater/Updater.java b/releng/org.eclipse.epp.config/org.eclipse.epp.releng.updater/src/org/eclipse/epp/releng/updater/Updater.java index e0faba0d..03c8a0dc 100644 --- a/releng/org.eclipse.epp.config/org.eclipse.epp.releng.updater/src/org/eclipse/epp/releng/updater/Updater.java +++ b/releng/org.eclipse.epp.config/org.eclipse.epp.releng.updater/src/org/eclipse/epp/releng/updater/Updater.java @@ -39,7 +39,7 @@ public class Updater { /** * M1, M2, M3, RC1, RC2 */ - private static final String MILESTONE = "M1"; + private static final String MILESTONE = "M2"; private static final String PLATFORM_VERSION = "4.42"; diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml index c10217ed..985c5d63 100644 --- a/releng/org.eclipse.epp.config/parent/pom.xml +++ b/releng/org.eclipse.epp.config/parent/pom.xml @@ -35,13 +35,13 @@ 2026-09 2027-03 - M1 + M2 4.42.0 - 202610081000 + 202610291000 - https://download.eclipse.org/releases/2026-12/202610091000/ + https://download.eclipse.org/staging/2026-12/ ${RELEASE_NAME}-${RELEASE_MILESTONE} diff --git a/releng/org.eclipse.epp.config/tools/upload-to-staging.sh b/releng/org.eclipse.epp.config/tools/upload-to-staging.sh index c860e48f..9cedca88 100755 --- a/releng/org.eclipse.epp.config/tools/upload-to-staging.sh +++ b/releng/org.eclipse.epp.config/tools/upload-to-staging.sh @@ -63,7 +63,7 @@ dsl - 2026-09 M2 embedcpp - 2026-09 RC1 java - 2025-09 RC1 jee - 2026-06 RC2 -modeling - 2026-09 RC2 +modeling - 2026-12 M1 php - 2025-12 RC1 rcp - 2025-06 RC2 scout - 2026-09 RC2 @@ -72,7 +72,7 @@ Platforms: Linux x86_64 - 2026-09 RC2 Linux aarch64 - 2023-09 RC2 Linux riscv64 - 2025-12 M1 -Windows x86_64 - 2026-09 RC2 +Windows x86_64 - 2026-12 M1 Windows on Arm - 2026-06 RC2 macOS x86_64 - 2026-03 M1 macOS aarch64 - 2026-09 RC2