Skip to content
Merged

Pr m3 #379

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 1 addition & 37 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,7 @@ Scroll down for the per-milestone/RC steps.
- [ ] Create new [PMI entry](https://projects.eclipse.org/projects/technology.packaging)
- [ ] Update splash screen (once per release cycle, hopefully done before M1).
See detailed [instructions](https://github.com/eclipse-packaging/packages/blob/master/packages/org.eclipse.epp.package.common/splash/INSTRUCTIONS.md).
- [ ] This step is automated along with the following step.
~When the year changes, e.g., between 2025-12 and 2026-03 releases, an update of the copyright year is required with a very smart search&replace. A good replacement is `/, 2021/, 2022/` excluding `*.svg`~
- [ ] The `Update Name` step below is now fully automated.
~The following manual steps can be skipped and simply document what the automation does.
Previously on every M and RC,
the whole version string was manually updated,
including the platform version;
this large automated change includes updating the following:~
- [ ] ~pom.xml~
- [ ] ~feature.xml~
- [ ] ~MANIFEST.MF~
- [ ] ~epp.website.xml~
- [ ] ~`NewAndNoteworthy` entry needs updating which has a slightly different pattern than other versions.~
- [ ] ~epp.product~
- [ ] ~p2.inf~
- [ ] ~epp.p2.inf~
- [ ] ~Jenkinsfile (SimRel triggering URL)~
- [ ] ~`2025-12` -> `2026->03` part~
- [ ] ~`4.38` -> `4.39` part~
- [ ] Adding the previous past release explicitly to list in release.xml, located in promote-a-build.sh
- [ ] Archive old releases (two R releases should stay on download.eclipse.org) to archive.eclipse.org and remove non-R downloads.
- This can be done through the web ui at https://download.eclipse.org/technology/epp/

Expand Down Expand Up @@ -75,23 +56,6 @@ Scroll down for the per-milestone/RC steps.
) to set the value of `MILESTONE`, `PLATFORM_VERSION`, and possibly `EXECUTION_ENVIRONMENT` to the current appropriate values.
- Use `Run` tool-bar button drop-down menu to launch the `Update Versions` launch configuration
to apply all the necessary name and version changes.
- [ ] ~Due to automation, this step can now be skipped.~
~Update name of the release in strings with a "smart" global find&replace.
_Be careful on M3 that the replace did not match the Eclipse project name M2E!_
See [this](https://github.com/eclipse-packaging/packages/commit/d7c1fc0b355185ceb9635fbc12a4af81e2295a91/) for an example.
Use commit message like `[releng] Prepare repo for 2025-09 M1`.In particular, check the following::~
- ~**TODO can this be automated**
On M1 add the M1 qualifier, e.g., `2025-06-R` -> `2025-09-M1`, on RC2 set it to `R` the qualifier, e.g., `2025-09-RC1` -> `2025-09-R`.
**Except** for `eclipse.simultaneous.release.name` which should go from `2025-06 (4.36.0)` -> `2025-09 M1 (4.37.0 M1)` on M1 and `2025-09 RC1 (4.37 RC1)` -> `2025-09 (4.37.0)` on RC2.~
- [ ] ~`packages/*/epp.website.xml` for `product name=` line.~
- [ ] ~`RELEASE_NAME`, `PREV_RELEASE_NAME`, `NEXT_RELEASE_NAME`, `RELEASE_MILESTONE`, `RELEASE_DIR`, `SIMREL_REPO`, variables in parent pom `releng/org.eclipse.epp.config/parent/pom.xml`~
- ~`SIMREL_REPO` should be updated to the URL published in the email to cross-project-issues announcing SimRel repo is ready for EPP build.~
- [ ] ~**TODO can this part below be automated**~
- ~See comment in the pom.xml file around `eclipse.simultaneous.release.name`.~
- ~On R build, for `eclipse.simultaneous.release.name` remove qualifier,
i.e., it should be `2025-09 (4.37.0)`.~
- ~On M1 build add the qualifier back in, for `eclipse.simultaneous.release.name`,
i.e., it should be `2025-09 M1 (4.37.0 M1)`~
- [ ] Update the [Last Recorded +1 in the email template](
https://github.com/eclipse-packaging/packages/blob/master/releng/org.eclipse.epp.config/tools/upload-to-staging.sh
) which any package and platform +1s that have been received since the last update.
Expand Down Expand Up @@ -145,7 +109,7 @@ Scroll down for the per-milestone/RC steps.
To test the upgrade an equivalent to the simrel release composite site needs to done.
Add the following software sites to available software, check for updates and then make sure stuff works.
In particular check error log and that core features, e.g., JDT, Platform, have been upgraded.
- `https://download.eclipse.org/staging/2025-09/` -
- `https://download.eclipse.org/staging/2025-12/` -
_NOTE_ Use `SIMREL_REPO` if the staging repo has been updated since the `SIMREL_REPO` location was created.
- `https://download.eclipse.org/technology/epp/staging/repository/`
- `https://download.eclipse.org/justj/epp/milestone/latest` -
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
2 changes: 1 addition & 1 deletion packages/org.eclipse.epp.package.cpp/.forceQualifierUpdate
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
2 changes: 1 addition & 1 deletion packages/org.eclipse.epp.package.dsl/.forceQualifierUpdate
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
2 changes: 1 addition & 1 deletion packages/org.eclipse.epp.package.jee/.forceQualifierUpdate
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
2 changes: 1 addition & 1 deletion packages/org.eclipse.epp.package.php/.forceQualifierUpdate
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
2 changes: 1 addition & 1 deletion packages/org.eclipse.epp.package.rcp/.forceQualifierUpdate
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025-10-30T12:00:00+00:00
2025-11-20T12:00:00+00:00
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ private static String getReleaseDirFromSchedule() {
var schedule = HttpClient.newBuilder().build()
.send(HttpRequest.newBuilder(URI.create(SIMREL__SCHEDULE)).GET().build(), BodyHandlers.ofString())
.body();
var milestoneDatePattern = Pattern.compile("\"" + MILESTONE + "\"\\s*:\\s*\"(?<date>20[2-9][0-9]-[01][0-9]-[0123][0-9])\"");
var milestoneDatePattern = Pattern
.compile("\"" + MILESTONE + "\"\\s*:\\s*\"(?<date>20[2-9][0-9]-[01][0-9]-[0123][0-9])\"");
var matcher = milestoneDatePattern.matcher(schedule);
if (matcher.find()) {
var dateLiteral = matcher.group("date");
Expand Down Expand Up @@ -234,6 +235,7 @@ private void visit(Path file) throws IOException {
contents.put(file, modifiedContent);
}
} else if (relativePathName.equals("RELEASING.md")) {
apply(file, " `https://download.eclipse.org/staging/" + SIMREL_VERSION_MATCHER + "/`", SIMREL_VERSION);
// TODO
}
}
Expand Down
2 changes: 1 addition & 1 deletion releng/org.eclipse.epp.config/parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<!-- Name release directory on download.eclipse.org -->
<RELEASE_DIR>202511201000</RELEASE_DIR>
<!-- SimRel Repo to build from -->
<SIMREL_REPO>https://download.eclipse.org/staging/2025-12/</SIMREL_REPO>
<SIMREL_REPO>https://download.eclipse.org/releases/2025-12/202511211000/</SIMREL_REPO>
<!-- ID used to generate the filename of the packages -->
<eclipse.simultaneous.release.id>${RELEASE_NAME}-${RELEASE_MILESTONE}</eclipse.simultaneous.release.id>
<!-- Timestamp used in various places, e.g. the about dialog (see about.mappings) -->
Expand Down
4 changes: 2 additions & 2 deletions releng/org.eclipse.epp.config/tools/upload-to-staging.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Last +1 received for each package and platform (apologies if I missed one of you

Packages:
committers - 2025-12 M1
cpp - 2025-09 RC2a
cpp - 2025-12 M1
dsl - 2025-12 M1
embedcpp - 2024-09 RC2
java - 2025-06 RC1
Expand All @@ -66,7 +66,7 @@ rcp - 2025-06 RC2
scout - 2025-03 RC2

Platforms:
Linux x86_64 - 2025-09 RC2a
Linux x86_64 - 2025-12 M1
Linux aarch64 - 2023-09 RC2
Linux riscv64 - 2025-12 M1
Windows x86_64 - 2025-12 M2
Expand Down
Loading