Back to staging

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-03 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-03 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.
@@ -111,9 +111,9 @@ Scroll down for the per-milestone/RC steps.
     TODO: it may be possible to work around this error by always using a different random ID when doing the notarization.
 - [ ] Sanity check the build for the following:
   - [ ] 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-03-M1`.
+  - [ ] Make sure filenames contain expected build name and milestone, e.g., `2026-03-M2`.
   - [ ] Splash screen says the expected release name with no milestone, e.g., `2026-03`.
-  - [ ] `Help -> About` says the expected build name and milestone, e.g., `2026-03-M1`.
+  - [ ] `Help -> About` says the expected build name and milestone, e.g., `2026-03-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.
@@ -126,11 +126,11 @@ Scroll down for the per-milestone/RC steps.
     - `https://download.eclipse.org/justj/epp/milestone/latest` - 
        This is needed when there is a new version of JustJ that is not also published as a release.
        For example, Java 21 between 2024-06 M1 and release date of 2024-06.
-  - [ ] Verify that no non-EPP content is in the p2 repo
+  - [ ] Verify that no non-EPP content is in the [p2 repo](https://download.eclipse.org/technology/epp/staging/repository/)
        (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/).
+- [ ] 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-03 M1`.
+  - [ ] Edit Jenkins Build Information and name it, e.g., `2026-03 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.
@@ -160,7 +160,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-03/ -
+      copy the composite\*M2.jar files over the composite\*.jar files in https://download.eclipse.org/technology/epp/packages/2026-03/ -
       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

packages/org.eclipse.epp.package.committers.feature/epp.website.xml

@@ -34,6 +34,6 @@ Click <a href="https://github.com/eclipse-egit/egit/issues">here</a> to open a b
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-committers-2026-03-M1" />
+  <product name="eclipse-committers-2026-03-M2" />
 
 </configuration>

packages/org.eclipse.epp.package.cpp.feature/epp.website.xml

@@ -22,6 +22,6 @@
   </packageMetaData>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-cpp-2026-03-M1" />
+  <product name="eclipse-cpp-2026-03-M2" />
 
 </configuration>

packages/org.eclipse.epp.package.dsl.feature/epp.website.xml

@@ -27,6 +27,6 @@
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-dsl-2026-03-M1" />
+  <product name="eclipse-dsl-2026-03-M2" />
 
 </configuration>

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 <b>cre
   </packageMetaData>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-embedcpp-2026-03-M1" />
+  <product name="eclipse-embedcpp-2026-03-M2" />
 
 </configuration>

packages/org.eclipse.epp.package.java.feature/epp.website.xml

@@ -28,6 +28,6 @@
 
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-java-2026-03-M1" />
+	<product name="eclipse-java-2026-03-M2" />
 
 </configuration>

packages/org.eclipse.epp.package.jee.feature/epp.website.xml

@@ -34,6 +34,6 @@ Click <a href="https://github.com/eclipse-wildwebdeveloper/wildwebdeveloper/issu
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-jee-2026-03-M1" />
+  <product name="eclipse-jee-2026-03-M2" />
 
 </configuration>

packages/org.eclipse.epp.package.modeling.feature/epp.website.xml

@@ -24,6 +24,6 @@
   </packageMetaData>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-modeling-2026-03-M1" />
+  <product name="eclipse-modeling-2026-03-M2" />
 
 </configuration>

packages/org.eclipse.epp.package.php.feature/epp.website.xml

@@ -32,6 +32,6 @@ Click <a href="https://github.com/eclipse-wildwebdeveloper/wildwebdeveloper/issu
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-php-2026-03-M1" />
+  <product name="eclipse-php-2026-03-M2" />
 
 </configuration>

packages/org.eclipse.epp.package.rcp.feature/epp.website.xml

@@ -27,6 +27,6 @@
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-rcp-2026-03-M1" />
+  <product name="eclipse-rcp-2026-03-M2" />
 
 </configuration>

packages/org.eclipse.epp.package.scout.feature/epp.website.xml

@@ -31,6 +31,6 @@
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-scout-2026-03-M1" />
+  <product name="eclipse-scout-2026-03-M2" />
 
 </configuration>

releng/org.eclipse.epp.config/org.eclipse.epp.releng.updater/src/org/eclipse/epp/releng/updater/Updater.java

@@ -40,7 +40,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.39";
 
@@ -305,7 +305,8 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
 			@Override
 			public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
 				String fileName = dir.getFileName().toString();
-				if ("target".equals(fileName) || fileName.startsWith(".") || dir.endsWith("META-INF/maven")) {
+				if ("target".equals(fileName) || "sanity-check".equals(fileName) || fileName.startsWith(".")
+						|| dir.endsWith("META-INF/maven")) {
 					return FileVisitResult.SKIP_SUBTREE;
 				}
 				Path relativePath = root.relativize(dir);

releng/org.eclipse.epp.config/parent/pom.xml

@@ -35,13 +35,13 @@
     <PREV_RELEASE_NAME>2025-12</PREV_RELEASE_NAME>
     <NEXT_RELEASE_NAME>2026-06</NEXT_RELEASE_NAME>
     <!-- Name of the milestone -->
-    <RELEASE_MILESTONE>M1</RELEASE_MILESTONE>
+    <RELEASE_MILESTONE>M2</RELEASE_MILESTONE>
     <!-- Version of the release -->
     <RELEASE_VERSION>4.39.0</RELEASE_VERSION>
     <!-- Name release directory on download.eclipse.org -->
-    <RELEASE_DIR>202601081000</RELEASE_DIR>
+    <RELEASE_DIR>202601291000</RELEASE_DIR>
     <!-- SimRel Repo to build from -->
-    <SIMREL_REPO>https://download.eclipse.org/releases/2026-03/202601091000/</SIMREL_REPO>
+    <SIMREL_REPO>https://download.eclipse.org/staging/2026-03/</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) -->