diff --git a/RELEASING.md b/RELEASING.md index 43104091..fa795306 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-06 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-06 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. @@ -112,9 +112,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-06-M1`. + - [ ] Make sure filenames contain expected build name and milestone, e.g., `2026-06-M2`. - [ ] Splash screen says the expected release name with no milestone, e.g., `2026-06`. - - [ ] `Help -> About` says the expected build name and milestone, e.g., `2026-06-M1`. + - [ ] `Help -> About` says the expected build name and milestone, e.g., `2026-06-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 +132,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-06 M1`. + - [ ] Edit Jenkins Build Information and name it, e.g., `2026-06 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 +166,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-06/ - + copy the composite\*M2.jar files over the composite\*.jar files in https://download.eclipse.org/technology/epp/packages/2026-06/ - 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 4edaeba3..929a4b62 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 037d594a..ad863a00 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 02207bb8..23390b26 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 a7903003..4720fc2f 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 3f8f6d73..258b7372 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 3274428b..533bdd71 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 822ac69c..a82847e9 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 97b60b16..88c524bb 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 14adfab1..f03096c3 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 e06b4fe6..a550d97e 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 0e7610d5..770a75cd 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.40"; diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml index c4d52f80..9df256b0 100644 --- a/releng/org.eclipse.epp.config/parent/pom.xml +++ b/releng/org.eclipse.epp.config/parent/pom.xml @@ -35,13 +35,13 @@ 2026-03 2026-09 - M1 + M2 4.40.0 - 202604091000 + 202604301000 - https://download.eclipse.org/releases/2026-06/202604101000/ + https://download.eclipse.org/staging/2026-06/ ${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 e03bb255..7ad10448 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-03 M3 embedcpp - 2026-03 M2 java - 2025-06 RC1 jee - 2026-03 M3 -modeling - 2026-03 RC1 +modeling - 2026-06 M1 php - 2025-12 RC1 rcp - 2025-06 RC2 scout - 2026-03 M3 @@ -72,7 +72,7 @@ Platforms: Linux x86_64 - 2026-03 RC2 Linux aarch64 - 2023-09 RC2 Linux riscv64 - 2025-12 M1 -Windows x86_64 - 2026-03 RC1 +Windows x86_64 - 2026-06 M1 Windows on Arm - 2025-12 RC1 macOS x86_64 - 2026-03 M1 macOS aarch64 - 2026-03- M3