From a0879d435d8e0739fe3ef60b44bf7fc69119788f Mon Sep 17 00:00:00 2001 From: Ed Merks Date: Wed, 10 Jun 2026 07:58:40 +0200 Subject: [PATCH] Prepare for 2026-09 M1 which will support Java 25. - Improve the updater to update all places affected by the EXECUTION_ENVIRONMENT changing to Java 25. - Update CHANGELOG.md for 2026-09 for the new Java 25 requirement and the fact it's currently missing for windows aarch64. - Update the splash.bmp. - Update +1s. --- .github/workflows/build.yml | 4 +-- CHANGELOG.md | 5 +++ Jenkinsfile | 2 +- README.md | 6 ++-- RELEASING.md | 26 +++++++-------- .../epp.website.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../epp.p2.inf | 2 +- .../epp.product | 20 +++++------ .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 +-- .../pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../org.eclipse.epp.package.common/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 ++-- .../META-INF/MANIFEST.MF | 4 +-- .../org.eclipse.epp.package.common/pom.xml | 2 +- .../org.eclipse.epp.package.common/splash.bmp | Bin 546086 -> 546086 bytes .../epp.website.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../epp.p2.inf | 2 +- .../epp.product | 20 +++++------ .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 +-- packages/org.eclipse.epp.package.cpp/pom.xml | 2 +- .../epp.website.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../epp.p2.inf | 2 +- .../epp.product | 20 +++++------ .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 +-- packages/org.eclipse.epp.package.dsl/pom.xml | 2 +- .../epp.website.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../epp.p2.inf | 2 +- .../epp.product | 20 +++++------ .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 +-- .../org.eclipse.epp.package.embedcpp/pom.xml | 2 +- .../epp.website.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../epp.p2.inf | 2 +- .../epp.product | 20 +++++------ .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 +-- packages/org.eclipse.epp.package.java/pom.xml | 2 +- .../epp.website.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../epp.p2.inf | 2 +- .../epp.product | 20 +++++------ .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 +-- packages/org.eclipse.epp.package.jee/pom.xml | 2 +- .../epp.website.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../epp.p2.inf | 2 +- .../epp.product | 20 +++++------ .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 +-- .../org.eclipse.epp.package.modeling/pom.xml | 2 +- .../epp.website.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../epp.p2.inf | 2 +- .../epp.product | 20 +++++------ .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 +-- packages/org.eclipse.epp.package.php/pom.xml | 2 +- .../epp.website.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../epp.p2.inf | 2 +- .../epp.product | 20 +++++------ .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 +-- packages/org.eclipse.epp.package.rcp/pom.xml | 2 +- .../epp.website.xml | 4 +-- .../feature.xml | 2 +- .../pom.xml | 2 +- .../epp.p2.inf | 2 +- .../epp.product | 20 +++++------ .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 4 +-- .../org.eclipse.epp.package.scout/pom.xml | 2 +- pom.xml | 2 +- .../aggregation/pom.xml | 4 +-- releng/org.eclipse.epp.config/oomph/EPP.setup | 8 ++--- .../org.eclipse.epp.releng.updater/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 ++-- .../eclipse/epp/releng/updater/Updater.java | 31 +++++++++++++++--- .../parent/bundle-feature/pom.xml | 2 +- .../parent/bundle/pom.xml | 2 +- .../parent/feature/pom.xml | 2 +- releng/org.eclipse.epp.config/parent/pom.xml | 27 ++++++++------- .../parent/product/pom.xml | 2 +- releng/org.eclipse.epp.config/tools/pom.xml | 2 +- .../tools/promote-a-build.sh | 1 + .../tools/upload-to-staging.sh | 6 ++-- 106 files changed, 280 insertions(+), 252 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d2227d532..de6334d29 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,10 +20,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up JDK 21 + - name: Set up JDK 25 uses: actions/setup-java@v4 with: - java-version: '21' + java-version: '25' distribution: 'temurin' cache: maven - name: Set up Maven diff --git a/CHANGELOG.md b/CHANGELOG.md index e6e27a6e1..d8d1bdc9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ This document aims to highlight configuration and content changes of the package For changes in Eclipse projects that contribute to SimRel and are included in the EPP packages, refer to the change log or New and Noteworthy document of the participating projects. The [Eclipse IDE New & Noteworthy](https://eclipseide.org/release/noteworthy/) page combines all those documents in one place. +## 2026-09 + +- Eclipse IDE now ships with Java 25 by default and the individual downloads now require Java 25. +- Current there is no Temurin JDK for Windows aarch64 so those packages have no embedded JRE, see [https://github.com/adoptium/aqa-tests/issues/6623](https://github.com/adoptium/aqa-tests/issues/6623). + ## 2025-09 - The Eclipse IDE for C/C++ Developers now includes the _C/C++ LLVM-Family Compiler Build Support_ feature to provide a CDT managed build system toolchain description for Clang users. diff --git a/Jenkinsfile b/Jenkinsfile index eeeb5931c..a71f1b1a0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { // check every 5 minutes for changes to the staging repo's content.jar URLTrigger(cronTabSpec: 'H/5 * * * *', entries: [URLTriggerEntry( - url: 'https://download.eclipse.org/staging/2026-06/content.jar', + url: 'https://download.eclipse.org/staging/2026-09/content.jar', contentTypes: [ MD5Sum() ] diff --git a/README.md b/README.md index a1a38c6e9..a4042577a 100644 --- a/README.md +++ b/README.md @@ -78,14 +78,14 @@ This is done by using the Eclipse Foundation internal signing service and can be ### Additional Configuration Possibilities -By default, the EPP build uses the content of the Eclipse Simultaneous Release _Staging_ repository at as input. +By default, the EPP build uses the content of the Eclipse Simultaneous Release _Staging_ repository at as input. Sometimes it is desired to build against another release, e.g., a different milestone, or against a local mirror of this repository. This can be achieved by setting the Java property `eclipse.simultaneous.release.repository` to another URL. As an example, by adding the following argument to the Maven command line, -the EPP build will read its input from the composite Eclipse 2026-06 repository: +the EPP build will read its input from the composite Eclipse 2026-09 repository: - -Declipse.simultaneous.release.repository="https://download.eclipse.org/releases/2026-06" + -Declipse.simultaneous.release.repository="https://download.eclipse.org/releases/2026-09" ### EPP Configuration File format diff --git a/RELEASING.md b/RELEASING.md index df4b0d09f..fe5a9d1f2 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 RC2` 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-09 M1` 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. @@ -19,7 +19,7 @@ The individual releases are tracked with [endgame](https://github.com/eclipse-pa For each release (M1, M2, M3, RC1, RC2) an endgame ticket is created with the appropriate contents from the rest of this document: EPP releases happen for each milestone and release candidate according to the [Eclipse Simultaneous Release Plan]( -https://github.com/eclipse-simrel/.github/blob/main/wiki/SimRel/2026-06.md) +https://github.com/eclipse-simrel/.github/blob/main/wiki/SimRel/2026-09.md) **Steps at the beginning of each release cycle, i.e., before M1:** @@ -52,7 +52,7 @@ Scroll down for the per-milestone/RC steps. - [ ] Search for ` url=` (notice the blank before url) in `epp.website.xml` to see which ones are contained in the different packages. - [ ] Remember that some of the features will release new versions together with the new Eclipse release. Therefore using the _currently_ released version number may be wrong. - Look at the news links in [2026-06 Participants](https://eclipse.dev/simrel/?file=wiki/SimRel/2026-06_participants.json). + Look at the news links in [2026-09 Participants](https://eclipse.dev/simrel/?file=wiki/SimRel/2026-09_participants.json). - [ ] Synchronize the following - Remember to check the branch; these links are to master, but around RC2 master may be set up for the next release already. - [ ] Synchronize any changes to [platform.product]( https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/products/eclipse-platform/platform.product @@ -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-R`. - - [ ] 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-R`. + - [ ] Make sure filenames contain expected build name and milestone, e.g., `2026-09-M1`. + - [ ] Splash screen says the expected release name with no milestone, e.g., `2026-09`. + - [ ] `Help -> About` says the expected build name and milestone, e.g., `2026-09-M1`. - [ ] 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. @@ -122,17 +122,17 @@ Scroll down for the per-milestone/RC steps. To test the upgrade an equivalent to the simrel release composite site needs to be 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/2026-06/` - + - `https://download.eclipse.org/staging/2026-09/` - _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` - 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. + For example, Java 25 between 2026-09 M1 and release date of 2026-09. - [ ] 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/lastBuild/). - [ ] Mark build as Keep forever. - - [ ] Edit Jenkins Build Information and name it, e.g., `2026-06 R`. + - [ ] Edit Jenkins Build Information and name it, e.g., `2026-09 M1`. - [ ] 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\*R.jar files over the composite\*.jar files in https://download.eclipse.org/technology/epp/packages/2026-06/ - + copy the composite\*M1.jar files over the composite\*.jar files in https://download.eclipse.org/technology/epp/packages/2026-09/ - 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 @@ -175,8 +175,8 @@ Everything except R is typically the Friday around 9:30am Ottawa time and the R **24-48 Hours Before Final release day** - [ ] **24 Hours before Final release** Make sure files are in final location to allow downloads to mirror. - - [ ] Tag the release, e.g., `2026-06_R`. - Example command line: `git tag --annotate 2026-06_R -m"2026-06 Release" 1b7a1c1af156e3ac57768b87be258cd22b49456b`. + - [ ] Tag the release, e.g., `2026-09_R`. + Example command line: `git tag --annotate 2026-09_R -m"2026-09 Release" 1b7a1c1af156e3ac57768b87be258cd22b49456b`. - [ ] Run the [Rename Provisional to Final]( https://ci.eclipse.org/packaging/job/rename-provisional-to-final/ ) CI job to rename the provisional release milestone to final directory. @@ -201,7 +201,7 @@ These jobs should be completed by approximately 10am Ottawa time on release days - The current release needs to be promoted as "latest" under https://download.eclipse.org/technology/epp/packages/latest/. This should be a composite pointing to a specific https://download.eclipse.org/technology/epp/packages/yyyy-MM/. - The _next_ release sub-directory needs to be created immediately. - - When 2026-06 is released, a directory 2026-09 must be created with an empty p2 composite repository pointing to 2026-06 until M1. + - When 2026-09 is released, a directory 2026-12 must be created with an empty p2 composite repository pointing to 2026-09 until M1. - On M1 release day this changes to a composite p2 repository with M1 content. - [ ] _Optional - useful when testing changes to the promotion scripts:_ - Run the build once in `DRY_RUN` mode to ensure that the output is correct before it applies changes to download.eclipse.org. 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 5aafe4623..1b051b653 100644 --- a/packages/org.eclipse.epp.package.committers.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.committers.feature/epp.website.xml @@ -29,11 +29,11 @@ Click here to open a b - + diff --git a/packages/org.eclipse.epp.package.committers.feature/feature.xml b/packages/org.eclipse.epp.package.committers.feature/feature.xml index b0800c627..60086c26f 100644 --- a/packages/org.eclipse.epp.package.committers.feature/feature.xml +++ b/packages/org.eclipse.epp.package.committers.feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.epp org.eclipse.epp-feature-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/feature diff --git a/packages/org.eclipse.epp.package.committers.product/epp.p2.inf b/packages/org.eclipse.epp.package.committers.product/epp.p2.inf index 5179639bc..dc6ee03fd 100644 --- a/packages/org.eclipse.epp.package.committers.product/epp.p2.inf +++ b/packages/org.eclipse.epp.package.committers.product/epp.p2.inf @@ -2,7 +2,7 @@ instructions.configure=\ mkdir(path:${installFolder}/dropins); properties.1.name = org.eclipse.equinox.p2.description -properties.1.value = 2026-06 Release of the Eclipse Committers package. +properties.1.value = 2026-09 Release of the Eclipse Committers package. properties.2.name = org.eclipse.equinox.p2.provider properties.2.value = Eclipse Packaging Project diff --git a/packages/org.eclipse.epp.package.committers.product/epp.product b/packages/org.eclipse.epp.package.committers.product/epp.product index 3a2092060..0da25b3ab 100644 --- a/packages/org.eclipse.epp.package.committers.product/epp.product +++ b/packages/org.eclipse.epp.package.committers.product/epp.product @@ -1,14 +1,14 @@ - + - -Dosgi.requiredJavaVersion=21 + -Dosgi.requiredJavaVersion=25 -Dosgi.instance.area.default=@user.home/eclipse-workspace -Dosgi.dataAreaRequiresExplicitInit=true -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true @@ -89,9 +89,9 @@ This file should also be easy to compare against all the other epp.product files - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 @@ -247,7 +247,7 @@ United States, other countries, or both. - + @@ -269,7 +269,7 @@ United States, other countries, or both. - + @@ -307,8 +307,8 @@ United States, other countries, or both. - - + + diff --git a/packages/org.eclipse.epp.package.committers.product/pom.xml b/packages/org.eclipse.epp.package.committers.product/pom.xml index 0ec6e7cb4..fab2f022d 100644 --- a/packages/org.eclipse.epp.package.committers.product/pom.xml +++ b/packages/org.eclipse.epp.package.committers.product/pom.xml @@ -20,7 +20,7 @@ org.eclipse.epp org.eclipse.epp-product-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/product diff --git a/packages/org.eclipse.epp.package.committers/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.committers/META-INF/MANIFEST.MF index 7efb1a182..a1a1d2283 100644 --- a/packages/org.eclipse.epp.package.committers/META-INF/MANIFEST.MF +++ b/packages/org.eclipse.epp.package.committers/META-INF/MANIFEST.MF @@ -2,10 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.epp.package.committers;singleton:=true -Bundle-Version: 4.40.0.qualifier +Bundle-Version: 4.41.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-25 Require-Bundle: org.eclipse.platform, org.eclipse.equinox.app, org.eclipse.ui;bundle-version="[3.2.0,4.0.0)", diff --git a/packages/org.eclipse.epp.package.committers/pom.xml b/packages/org.eclipse.epp.package.committers/pom.xml index e65e177b7..dae94a91a 100644 --- a/packages/org.eclipse.epp.package.committers/pom.xml +++ b/packages/org.eclipse.epp.package.committers/pom.xml @@ -21,7 +21,7 @@ org.eclipse.epp org.eclipse.epp-bundle-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/bundle diff --git a/packages/org.eclipse.epp.package.common.feature/feature.xml b/packages/org.eclipse.epp.package.common.feature/feature.xml index 4135bd0dd..28a91ffa8 100644 --- a/packages/org.eclipse.epp.package.common.feature/feature.xml +++ b/packages/org.eclipse.epp.package.common.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/packages/org.eclipse.epp.package.common.feature/pom.xml b/packages/org.eclipse.epp.package.common.feature/pom.xml index 719591b01..97497e18b 100644 --- a/packages/org.eclipse.epp.package.common.feature/pom.xml +++ b/packages/org.eclipse.epp.package.common.feature/pom.xml @@ -21,7 +21,7 @@ org.eclipse.epp org.eclipse.epp-feature-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/feature diff --git a/packages/org.eclipse.epp.package.common/.classpath b/packages/org.eclipse.epp.package.common/.classpath index 375961e4d..7a42e53ce 100644 --- a/packages/org.eclipse.epp.package.common/.classpath +++ b/packages/org.eclipse.epp.package.common/.classpath @@ -1,6 +1,6 @@ - + diff --git a/packages/org.eclipse.epp.package.common/.settings/org.eclipse.jdt.core.prefs b/packages/org.eclipse.epp.package.common/.settings/org.eclipse.jdt.core.prefs index 1e0cb16bb..f85df3839 100644 --- a/packages/org.eclipse.epp.package.common/.settings/org.eclipse.jdt.core.prefs +++ b/packages/org.eclipse.epp.package.common/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=25 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.compliance=25 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,4 +12,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=21 +org.eclipse.jdt.core.compiler.source=25 diff --git a/packages/org.eclipse.epp.package.common/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.common/META-INF/MANIFEST.MF index ebe8a0cd0..682b85944 100644 --- a/packages/org.eclipse.epp.package.common/META-INF/MANIFEST.MF +++ b/packages/org.eclipse.epp.package.common/META-INF/MANIFEST.MF @@ -3,9 +3,9 @@ Bundle-ManifestVersion: 2 Automatic-Module-Name: org.eclipse.epp.package.common Bundle-Name: Common EPP Bundle Bundle-SymbolicName: org.eclipse.epp.package.common;singleton:=true -Bundle-Version: 4.40.0.qualifier +Bundle-Version: 4.41.0.qualifier Bundle-Vendor: Eclipse Packaging Project -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-25 Require-Bundle: org.eclipse.platform, org.eclipse.equinox.app, org.eclipse.ui, diff --git a/packages/org.eclipse.epp.package.common/pom.xml b/packages/org.eclipse.epp.package.common/pom.xml index 20970a662..e6b892e51 100644 --- a/packages/org.eclipse.epp.package.common/pom.xml +++ b/packages/org.eclipse.epp.package.common/pom.xml @@ -19,7 +19,7 @@ org.eclipse.epp org.eclipse.epp-bundle-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/bundle diff --git a/packages/org.eclipse.epp.package.common/splash.bmp b/packages/org.eclipse.epp.package.common/splash.bmp index 2a5b635ae02b7a70ddf8e1460ab7c6111749e365..3bbf86ac2e10aa85f5138d6709b19c7ccb4c2682 100644 GIT binary patch delta 4891 zcmY*cXK)l(w)X9T7Rq6gCI`)EG+AksM?w-pBMBi!LOG6vNCJ@^NFvC_*d`k;!C-@J zc5&gr8fXmbU6Xdr1_QNz&&JPTw`{O+c=pzF)t2p7{@xkAGPV4;)!nym-}{~Oo%5a3 z$6vA>f621pG)qcj*-~;EJ0Y?q{Ec+BmE}s+8upYZG>-F|Cf1p3P1eC7H^Z&A!=7PNfwt+9FG7 zK}MPmW@*U5-W8K-*P>^}8q^o{pe(C`*Z5d5Gf87Uc2SJIfx)G}!<-EM{hyEYKL8}gHvIGEm;M7YC4=MBiz#K0k&6+UyPb*Yti2KBHDOM8MEsZ zWP*b**a@2whJ+Lt<5TG~4ZJG;bQ!bBGmxWmz^$?%E6oU(!VHh}=Q6fMOs=ne2;ru2 zG}f(0L;YqRsb+@w<{9ItDIA15J)3W>X0>t$ax^yh(k*ZjFqhH@zw~J}+aQYesR$PJ z@dfqF5ryb0u*V^DsHxpR$q|yMN+DwOM!mBZp zM>0BDMD#9)!&HevUniQIwxT+?3Vur+LZw5PUNQs^?e8Q<pA z>^Q@+=F>Ux21X~Wl zU$O~a-$MAEVHA00VW4*#)@{Cm2iILhd)qD)c)}F4qz_6HNsX4`#fmC_9lEA3L_<+G zS}W#ZVe1%rr_DjgS%ETrF3K&%=&c&&-nGmS`~Q*cK(^GfmOUzteThe}eu;I`ml)pn zcXVuc2h;kF!|xk{IVBebjt~|M?ZW;8|A7Ms{}Vm4A4AX=rsK0udqVvr$vUWI zlVOZYfIV3b2kF0qbly)okVC4FMX~Qtq*E2S$4a7h<-u|;Bj-3lyNBjKsn z2-@i{Fn`T?R8(z1S^i?o@7jcYPn^Zh&F8SB=Segd_Mw;Ymr5jn0(bj{m~ttal_`1Q~6 zv73|pZTa5PYLMW#Pg@$6}Yka88EJZ2lL$N6rHO_KOwH2Vu zn2n&$k6L?~fKJYzWu?q1{q0%SE6!GsK5LMxHy~gzB2Q;PE}`dP9KnOTeuw?%KgZKA+(x8(2RiDOVfT|~aroe0v1#>d=&IX*LL(nP&a%AK7z%cv zHM#3|L;k*IrPY{NK04Z z@eL>O@+*JG(PJNA?W*6Pp=2q_GV2kvmY~GoLy_K&Lah}gIy)-NZq#N5P?M35YI8oi z15H@O|M)WVGqd!smsy6$d|Y>$<+C(C>oil0X%R4*P-M0u-(Vs<(P2hFuZK@5hdE{v z(jFi#sD4L!AHu^c4`TDWli0QMkJ!HZ&p34K6YSalK1Sv~i`u|EG~{-n%p5>A)%h~L z38m2^aA+!bOpg`$Fu}Y6}qm6Qi>R(zq0xAQlOkT8PSD~-C z36aufwCB{KjkIp5gbS=fWPV<8iMeBJas_Es3SV}KDaXu7NrWhsYM6?0NrQaC6rj*9 zG#IF+Qf?ZlYcbj3(V1XONWc`r>d-kcuYV(UJaq}lWH_A6Mm>?As8?!>w! zujAq2W2kk9QLfJ>_c_U(HsmSw@KVTlshuj)SP`=4Ns}+LK9O1ZoNFW}dcNfvbHw^J z8cHoKa=CPknXL=9W9N>m7+ZfH>(-pcs-?$JU$%nk^AU_ccn(7i>-i7YSOx2livJXi z5(V$Q!7|f5MaZ|fqOmyvd?IftSFQZe4Q5gslak5zY1DeAQ%6PVt4gQ-LCbI6V72i< z^aNWlP~MCdo^g{^$QD=4mWFS#WRc1Fs`r?sYi3a`rg{osSE!(mi-S2i8CkSdrjkyh zdsS>K)bVl9CM7~o&xYg_80g68u_n5=r^%_COh?v)Y$=hYqCSgUoNM6Uy~nJ{1L3V0 zY}$y2hW287@eADYJ~NqJm}YUK#_C21c`vBXK$swO2d1LkUyNp_H1Iz4T~rHR`dW6(8MP|Loyt_H||c~4a-RyEDmFCX&6hYJ26-&ZTN@`JqxmxeC&JXVL|ES_w;#~ z^2)7LP^YY*S`lqpscxjosc)qCHb?u%=syH)OXN8e$_X+oL<}Vcv}9b=Xk$t$w23K5 zr=!#3c-c=(8*q`>Mu#UVvLw1bvcs)bKs)IH#F4l4iD?K=@5j@RzKT;%U&S*I9mRb9 z06kaC?Vbduh>Ww`YFy6HWJ>D9O zlr`az+Fop!IS*S}7fEjjf>UHl{^=B(hL1AV&Z}dEsgqLD;NV+g zg?!P{hVlXeYoxo-&b#qTwFB+T`+y&^D4+P0^4~OpwAx;Z0FyrJzW) z3o}^^AFvDgOeO8L3mZkI;cAai!A!i}Bjmg2b00Z2Ku+~geT|ZpMOQy%g;#4JuyP_R zJ{oD#8ISN!(dSJk<296XL~Zon#7k0GV9q2;Oo&pci;th6HrHgOouqg3g!v+C=D`vn zOiHt(MDU2oNkqJgU!*DBp6%Ol8+ zjidLCwY5}1lQF)2?B0Cz@N;L+O2e~+W8x&@%EjZ`h0?sxw5t2otQZ}Io@msQjZsZ` z_L*nyd*2)iNsqJ(yTzoqB&gyOX(T`yAI~*?LNHHD4{4JpLosE_#7L(kFp^SPiAEjm zn(y%-YTPfbICAKaw6#wtjcV)FIl|$>$2M%F)?Noa#eym(28RzF#CP9*d+&oc&YndR znRofp#d~w)HtE2y@R1mwYp|lNVJ80TgAbyPRLbw%zD-u2xwrJjJMTy*7SYm}0!tQd zUcVk)=9JyOeOr2C1x@EIj11jd90f^lFxb;WnVW#RY18oUuAX@R*=N$V)xtMo#^}fh zv?RW&(>4ut``*xx)rCS??Tv2H4=82CBC-RORK5}nG)F~Mx`Dv2`YJ6fT+Y?D4 z5+~08#aUM_U6SrTE*uq^mOr_JxI29C;C&nTO&JqOqoL!Cl!jV@5;fqL4NjgoA^osJ zI4H&u9r|d7krW=@Clu$cU$gq&s_5z!qf5w`1fpOHRiG3Mba&nNe&y(>6w8IjM3&5V z9u~U%-~Jm%pWnHIg^^*{l^XJ0?|l%WggE4KNpnQ_hbVjg+2^7J*kzm7ub1pE3U@`> zub+P*I%SB71|DgN6gWxV)oot89#<}1z7NEuix;tE(TEg$UHCy{HB#Yu!7mC;1$_Qn zf=eheOHaQgoR1+;gULWj5(&rR>9r+YVl0lO;&y2HD#pr&$mGnRb@SZTFs& xRJ8TXTv@u*=azjfMsLm1!d%&h3fW(-T-{PvE2A-q#$*~IjTot}cFISI{|8ggHqQV6 delta 4929 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 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 a6be58f90..1212eba5c 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.cpp.feature/feature.xml b/packages/org.eclipse.epp.package.cpp.feature/feature.xml index fbfb93938..4c2bbc067 100644 --- a/packages/org.eclipse.epp.package.cpp.feature/feature.xml +++ b/packages/org.eclipse.epp.package.cpp.feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.epp org.eclipse.epp-feature-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/feature diff --git a/packages/org.eclipse.epp.package.cpp.product/epp.p2.inf b/packages/org.eclipse.epp.package.cpp.product/epp.p2.inf index 9e6af1d02..c73e7990a 100644 --- a/packages/org.eclipse.epp.package.cpp.product/epp.p2.inf +++ b/packages/org.eclipse.epp.package.cpp.product/epp.p2.inf @@ -2,7 +2,7 @@ instructions.configure=\ mkdir(path:${installFolder}/dropins); properties.1.name = org.eclipse.equinox.p2.description -properties.1.value = 2026-06 Release of the Eclipse C/C++ Developers Developers package. +properties.1.value = 2026-09 Release of the Eclipse C/C++ Developers Developers package. properties.2.name = org.eclipse.equinox.p2.provider properties.2.value = Eclipse Packaging Project diff --git a/packages/org.eclipse.epp.package.cpp.product/epp.product b/packages/org.eclipse.epp.package.cpp.product/epp.product index 8ba748b56..3e8387a8e 100644 --- a/packages/org.eclipse.epp.package.cpp.product/epp.product +++ b/packages/org.eclipse.epp.package.cpp.product/epp.product @@ -1,14 +1,14 @@ - + - -Dosgi.requiredJavaVersion=21 + -Dosgi.requiredJavaVersion=25 -Dosgi.instance.area.default=@user.home/eclipse-workspace -Dosgi.dataAreaRequiresExplicitInit=true -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true @@ -89,9 +89,9 @@ This file should also be easy to compare against all the other epp.product files - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 @@ -247,7 +247,7 @@ United States, other countries, or both. - + @@ -269,7 +269,7 @@ United States, other countries, or both. - + @@ -319,8 +319,8 @@ United States, other countries, or both. - - + + diff --git a/packages/org.eclipse.epp.package.cpp.product/pom.xml b/packages/org.eclipse.epp.package.cpp.product/pom.xml index d1e1c1ae1..ca1d01305 100644 --- a/packages/org.eclipse.epp.package.cpp.product/pom.xml +++ b/packages/org.eclipse.epp.package.cpp.product/pom.xml @@ -20,7 +20,7 @@ org.eclipse.epp org.eclipse.epp-product-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/product diff --git a/packages/org.eclipse.epp.package.cpp/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.cpp/META-INF/MANIFEST.MF index 2de5dd52c..e0ed1c089 100644 --- a/packages/org.eclipse.epp.package.cpp/META-INF/MANIFEST.MF +++ b/packages/org.eclipse.epp.package.cpp/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: EPP CPP Bundle Bundle-SymbolicName: org.eclipse.epp.package.cpp;singleton:=true -Bundle-Version: 4.40.0.qualifier +Bundle-Version: 4.41.0.qualifier Bundle-Vendor: Eclipse Packaging Project -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-25 Require-Bundle: org.eclipse.platform, org.eclipse.equinox.app Eclipse-BundleShape: dir diff --git a/packages/org.eclipse.epp.package.cpp/pom.xml b/packages/org.eclipse.epp.package.cpp/pom.xml index 6f2c8b794..89731a1d2 100644 --- a/packages/org.eclipse.epp.package.cpp/pom.xml +++ b/packages/org.eclipse.epp.package.cpp/pom.xml @@ -21,7 +21,7 @@ org.eclipse.epp org.eclipse.epp-bundle-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/bundle 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 fe9384862..90072ef1f 100644 --- a/packages/org.eclipse.epp.package.dsl.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.dsl.feature/epp.website.xml @@ -22,11 +22,11 @@ - + diff --git a/packages/org.eclipse.epp.package.dsl.feature/feature.xml b/packages/org.eclipse.epp.package.dsl.feature/feature.xml index 4d6f69a56..be5c49719 100644 --- a/packages/org.eclipse.epp.package.dsl.feature/feature.xml +++ b/packages/org.eclipse.epp.package.dsl.feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.epp org.eclipse.epp-feature-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/feature diff --git a/packages/org.eclipse.epp.package.dsl.product/epp.p2.inf b/packages/org.eclipse.epp.package.dsl.product/epp.p2.inf index ab96c11d7..bc6c6ac0f 100644 --- a/packages/org.eclipse.epp.package.dsl.product/epp.p2.inf +++ b/packages/org.eclipse.epp.package.dsl.product/epp.p2.inf @@ -2,7 +2,7 @@ instructions.configure=\ mkdir(path:${installFolder}/dropins); properties.1.name = org.eclipse.equinox.p2.description -properties.1.value = 2026-06 Release of the Eclipse DSL Tools package. +properties.1.value = 2026-09 Release of the Eclipse DSL Tools package. properties.2.name = org.eclipse.equinox.p2.provider properties.2.value = Eclipse Packaging Project diff --git a/packages/org.eclipse.epp.package.dsl.product/epp.product b/packages/org.eclipse.epp.package.dsl.product/epp.product index 568e57119..fca3dfa9d 100644 --- a/packages/org.eclipse.epp.package.dsl.product/epp.product +++ b/packages/org.eclipse.epp.package.dsl.product/epp.product @@ -1,14 +1,14 @@ - + - -Dosgi.requiredJavaVersion=21 + -Dosgi.requiredJavaVersion=25 -Dosgi.instance.area.default=@user.home/eclipse-workspace -Dosgi.dataAreaRequiresExplicitInit=true -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true @@ -91,9 +91,9 @@ This file should also be easy to compare against all the other epp.product files - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 @@ -249,7 +249,7 @@ United States, other countries, or both. - + @@ -262,7 +262,7 @@ United States, other countries, or both. - + @@ -295,8 +295,8 @@ United States, other countries, or both. - - + + diff --git a/packages/org.eclipse.epp.package.dsl.product/pom.xml b/packages/org.eclipse.epp.package.dsl.product/pom.xml index e820a95f3..f419cd7c5 100644 --- a/packages/org.eclipse.epp.package.dsl.product/pom.xml +++ b/packages/org.eclipse.epp.package.dsl.product/pom.xml @@ -20,7 +20,7 @@ org.eclipse.epp org.eclipse.epp-product-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/product diff --git a/packages/org.eclipse.epp.package.dsl/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.dsl/META-INF/MANIFEST.MF index 837540689..fd63c7881 100644 --- a/packages/org.eclipse.epp.package.dsl/META-INF/MANIFEST.MF +++ b/packages/org.eclipse.epp.package.dsl/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: EPP DSL Bundle Bundle-SymbolicName: org.eclipse.epp.package.dsl;singleton:=true -Bundle-Version: 4.40.0.qualifier +Bundle-Version: 4.41.0.qualifier Bundle-Vendor: Eclipse Packaging Project -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-25 Require-Bundle: org.eclipse.platform, org.eclipse.equinox.app Eclipse-BundleShape: dir diff --git a/packages/org.eclipse.epp.package.dsl/pom.xml b/packages/org.eclipse.epp.package.dsl/pom.xml index 8c98b52a9..3b8652aef 100644 --- a/packages/org.eclipse.epp.package.dsl/pom.xml +++ b/packages/org.eclipse.epp.package.dsl/pom.xml @@ -21,7 +21,7 @@ org.eclipse.epp org.eclipse.epp-bundle-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/bundle 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 a4a80e77a..8c1ca99e3 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.embedcpp.feature/feature.xml b/packages/org.eclipse.epp.package.embedcpp.feature/feature.xml index 208887207..7863e0097 100644 --- a/packages/org.eclipse.epp.package.embedcpp.feature/feature.xml +++ b/packages/org.eclipse.epp.package.embedcpp.feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.epp org.eclipse.epp-feature-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/feature diff --git a/packages/org.eclipse.epp.package.embedcpp.product/epp.p2.inf b/packages/org.eclipse.epp.package.embedcpp.product/epp.p2.inf index 427c4f0ec..d96c65bb5 100644 --- a/packages/org.eclipse.epp.package.embedcpp.product/epp.p2.inf +++ b/packages/org.eclipse.epp.package.embedcpp.product/epp.p2.inf @@ -2,7 +2,7 @@ instructions.configure=\ mkdir(path:${installFolder}/dropins); properties.1.name = org.eclipse.equinox.p2.description -properties.1.value = 2026-06 Release of the Eclipse Embedded C/C++ Developers Developers package. +properties.1.value = 2026-09 Release of the Eclipse Embedded C/C++ Developers Developers package. properties.2.name = org.eclipse.equinox.p2.provider properties.2.value = Eclipse Packaging Project diff --git a/packages/org.eclipse.epp.package.embedcpp.product/epp.product b/packages/org.eclipse.epp.package.embedcpp.product/epp.product index e99dffb58..37ef4ce1f 100644 --- a/packages/org.eclipse.epp.package.embedcpp.product/epp.product +++ b/packages/org.eclipse.epp.package.embedcpp.product/epp.product @@ -1,14 +1,14 @@ - + - -Dosgi.requiredJavaVersion=21 + -Dosgi.requiredJavaVersion=25 -Dosgi.instance.area.default=@user.home/eclipse-workspace -Dosgi.dataAreaRequiresExplicitInit=true -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true @@ -89,9 +89,9 @@ This file should also be easy to compare against all the other epp.product files - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 @@ -247,7 +247,7 @@ United States, other countries, or both. - + @@ -269,7 +269,7 @@ United States, other countries, or both. - + @@ -332,8 +332,8 @@ United States, other countries, or both. - - + + diff --git a/packages/org.eclipse.epp.package.embedcpp.product/pom.xml b/packages/org.eclipse.epp.package.embedcpp.product/pom.xml index 64aec4d6e..db5fd0b68 100644 --- a/packages/org.eclipse.epp.package.embedcpp.product/pom.xml +++ b/packages/org.eclipse.epp.package.embedcpp.product/pom.xml @@ -20,7 +20,7 @@ org.eclipse.epp org.eclipse.epp-product-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/product diff --git a/packages/org.eclipse.epp.package.embedcpp/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.embedcpp/META-INF/MANIFEST.MF index 82e6734ef..33956a253 100644 --- a/packages/org.eclipse.epp.package.embedcpp/META-INF/MANIFEST.MF +++ b/packages/org.eclipse.epp.package.embedcpp/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: EPP Embedded CPP Bundle Bundle-SymbolicName: org.eclipse.epp.package.embedcpp;singleton:=true -Bundle-Version: 4.40.0.qualifier +Bundle-Version: 4.41.0.qualifier Bundle-Vendor: Eclipse Packaging Project -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-25 Require-Bundle: org.eclipse.platform, org.eclipse.equinox.app Eclipse-BundleShape: dir diff --git a/packages/org.eclipse.epp.package.embedcpp/pom.xml b/packages/org.eclipse.epp.package.embedcpp/pom.xml index cbedba316..5561ae3da 100644 --- a/packages/org.eclipse.epp.package.embedcpp/pom.xml +++ b/packages/org.eclipse.epp.package.embedcpp/pom.xml @@ -21,7 +21,7 @@ org.eclipse.epp org.eclipse.epp-bundle-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/bundle 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 6426102b5..546894c4f 100644 --- a/packages/org.eclipse.epp.package.java.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.java.feature/epp.website.xml @@ -22,12 +22,12 @@ - + diff --git a/packages/org.eclipse.epp.package.java.feature/feature.xml b/packages/org.eclipse.epp.package.java.feature/feature.xml index 325746707..8bddcc15e 100644 --- a/packages/org.eclipse.epp.package.java.feature/feature.xml +++ b/packages/org.eclipse.epp.package.java.feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.epp org.eclipse.epp-feature-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/feature diff --git a/packages/org.eclipse.epp.package.java.product/epp.p2.inf b/packages/org.eclipse.epp.package.java.product/epp.p2.inf index d962f880e..6a39abaf9 100644 --- a/packages/org.eclipse.epp.package.java.product/epp.p2.inf +++ b/packages/org.eclipse.epp.package.java.product/epp.p2.inf @@ -2,7 +2,7 @@ instructions.configure=\ mkdir(path:${installFolder}/dropins); properties.1.name = org.eclipse.equinox.p2.description -properties.1.value = 2026-06 Release of the Eclipse Java Developers package. +properties.1.value = 2026-09 Release of the Eclipse Java Developers package. properties.2.name = org.eclipse.equinox.p2.provider properties.2.value = Eclipse Packaging Project diff --git a/packages/org.eclipse.epp.package.java.product/epp.product b/packages/org.eclipse.epp.package.java.product/epp.product index 797c23b3c..d8a295c52 100644 --- a/packages/org.eclipse.epp.package.java.product/epp.product +++ b/packages/org.eclipse.epp.package.java.product/epp.product @@ -1,14 +1,14 @@ - + - -Dosgi.requiredJavaVersion=21 + -Dosgi.requiredJavaVersion=25 -Dosgi.instance.area.default=@user.home/eclipse-workspace -Dosgi.dataAreaRequiresExplicitInit=true -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true @@ -91,9 +91,9 @@ This file should also be easy to compare against all the other epp.product files - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 @@ -249,7 +249,7 @@ United States, other countries, or both. - + @@ -271,7 +271,7 @@ United States, other countries, or both. - + @@ -302,8 +302,8 @@ United States, other countries, or both. - - + + diff --git a/packages/org.eclipse.epp.package.java.product/pom.xml b/packages/org.eclipse.epp.package.java.product/pom.xml index 3ce9be378..23e907cc3 100644 --- a/packages/org.eclipse.epp.package.java.product/pom.xml +++ b/packages/org.eclipse.epp.package.java.product/pom.xml @@ -20,7 +20,7 @@ org.eclipse.epp org.eclipse.epp-product-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/product diff --git a/packages/org.eclipse.epp.package.java/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.java/META-INF/MANIFEST.MF index 2e4cf1f92..205229de2 100644 --- a/packages/org.eclipse.epp.package.java/META-INF/MANIFEST.MF +++ b/packages/org.eclipse.epp.package.java/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: EPP Java Package Bundle-SymbolicName: org.eclipse.epp.package.java;singleton:=true -Bundle-Version: 4.40.0.qualifier +Bundle-Version: 4.41.0.qualifier Bundle-Vendor: Eclipse Packaging Project -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-25 Require-Bundle: org.eclipse.platform, org.eclipse.equinox.app Eclipse-BundleShape: dir diff --git a/packages/org.eclipse.epp.package.java/pom.xml b/packages/org.eclipse.epp.package.java/pom.xml index 4c0cc5969..80c338a94 100644 --- a/packages/org.eclipse.epp.package.java/pom.xml +++ b/packages/org.eclipse.epp.package.java/pom.xml @@ -21,7 +21,7 @@ org.eclipse.epp org.eclipse.epp-bundle-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/bundle 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 d54544622..717c0e7a5 100644 --- a/packages/org.eclipse.epp.package.jee.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.jee.feature/epp.website.xml @@ -29,11 +29,11 @@ Click - + diff --git a/packages/org.eclipse.epp.package.jee.feature/feature.xml b/packages/org.eclipse.epp.package.jee.feature/feature.xml index 186211d19..e518dbfd2 100644 --- a/packages/org.eclipse.epp.package.jee.feature/feature.xml +++ b/packages/org.eclipse.epp.package.jee.feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.epp org.eclipse.epp-feature-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/feature diff --git a/packages/org.eclipse.epp.package.jee.product/epp.p2.inf b/packages/org.eclipse.epp.package.jee.product/epp.p2.inf index 22cd7656c..745dd559f 100644 --- a/packages/org.eclipse.epp.package.jee.product/epp.p2.inf +++ b/packages/org.eclipse.epp.package.jee.product/epp.p2.inf @@ -2,7 +2,7 @@ instructions.configure=\ mkdir(path:${installFolder}/dropins); properties.1.name = org.eclipse.equinox.p2.description -properties.1.value = 2026-06 Release of the Eclipse Enterprise Java and Web Developers package. +properties.1.value = 2026-09 Release of the Eclipse Enterprise Java and Web Developers package. properties.2.name = org.eclipse.equinox.p2.provider properties.2.value = Eclipse Packaging Project diff --git a/packages/org.eclipse.epp.package.jee.product/epp.product b/packages/org.eclipse.epp.package.jee.product/epp.product index a2acc12a6..4c399f5a8 100644 --- a/packages/org.eclipse.epp.package.jee.product/epp.product +++ b/packages/org.eclipse.epp.package.jee.product/epp.product @@ -1,14 +1,14 @@ - + - -Dosgi.requiredJavaVersion=21 + -Dosgi.requiredJavaVersion=25 -Dosgi.instance.area.default=@user.home/eclipse-workspace -Dosgi.dataAreaRequiresExplicitInit=true -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true @@ -93,9 +93,9 @@ This file should also be easy to compare against all the other epp.product files - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 @@ -251,7 +251,7 @@ United States, other countries, or both. - + @@ -273,7 +273,7 @@ United States, other countries, or both. - + @@ -371,8 +371,8 @@ United States, other countries, or both. - - + + diff --git a/packages/org.eclipse.epp.package.jee.product/pom.xml b/packages/org.eclipse.epp.package.jee.product/pom.xml index ae07dc0b8..4ac31519c 100644 --- a/packages/org.eclipse.epp.package.jee.product/pom.xml +++ b/packages/org.eclipse.epp.package.jee.product/pom.xml @@ -20,7 +20,7 @@ org.eclipse.epp org.eclipse.epp-product-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/product diff --git a/packages/org.eclipse.epp.package.jee/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.jee/META-INF/MANIFEST.MF index daff069c6..f4b883b0b 100644 --- a/packages/org.eclipse.epp.package.jee/META-INF/MANIFEST.MF +++ b/packages/org.eclipse.epp.package.jee/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.epp.package.jee;singleton:=true -Bundle-Version: 4.40.0.qualifier +Bundle-Version: 4.41.0.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-25 Require-Bundle: org.eclipse.platform, org.eclipse.equinox.app Eclipse-BundleShape: dir diff --git a/packages/org.eclipse.epp.package.jee/pom.xml b/packages/org.eclipse.epp.package.jee/pom.xml index 463c326d9..639782a32 100644 --- a/packages/org.eclipse.epp.package.jee/pom.xml +++ b/packages/org.eclipse.epp.package.jee/pom.xml @@ -21,7 +21,7 @@ org.eclipse.epp org.eclipse.epp-bundle-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/bundle 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 f3cd7b107..749dab3bd 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.modeling.feature/feature.xml b/packages/org.eclipse.epp.package.modeling.feature/feature.xml index 49e64f377..bf1449857 100644 --- a/packages/org.eclipse.epp.package.modeling.feature/feature.xml +++ b/packages/org.eclipse.epp.package.modeling.feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.epp org.eclipse.epp-feature-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/feature diff --git a/packages/org.eclipse.epp.package.modeling.product/epp.p2.inf b/packages/org.eclipse.epp.package.modeling.product/epp.p2.inf index eaa8ec895..33b680c77 100644 --- a/packages/org.eclipse.epp.package.modeling.product/epp.p2.inf +++ b/packages/org.eclipse.epp.package.modeling.product/epp.p2.inf @@ -2,7 +2,7 @@ instructions.configure=\ mkdir(path:${installFolder}/dropins); properties.1.name = org.eclipse.equinox.p2.description -properties.1.value = 2026-06 Release of the Eclipse Modeling Tools package. +properties.1.value = 2026-09 Release of the Eclipse Modeling Tools package. properties.2.name = org.eclipse.equinox.p2.provider properties.2.value = Eclipse Packaging Project diff --git a/packages/org.eclipse.epp.package.modeling.product/epp.product b/packages/org.eclipse.epp.package.modeling.product/epp.product index a24880122..a54c82e41 100644 --- a/packages/org.eclipse.epp.package.modeling.product/epp.product +++ b/packages/org.eclipse.epp.package.modeling.product/epp.product @@ -1,14 +1,14 @@ - + - -Dosgi.requiredJavaVersion=21 + -Dosgi.requiredJavaVersion=25 -Dosgi.instance.area.default=@user.home/eclipse-workspace -Dosgi.dataAreaRequiresExplicitInit=true -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true @@ -89,9 +89,9 @@ This file should also be easy to compare against all the other epp.product files - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 @@ -247,7 +247,7 @@ United States, other countries, or both. - + @@ -269,7 +269,7 @@ United States, other countries, or both. - + @@ -313,8 +313,8 @@ United States, other countries, or both. - - + + diff --git a/packages/org.eclipse.epp.package.modeling.product/pom.xml b/packages/org.eclipse.epp.package.modeling.product/pom.xml index c69da3108..319549417 100644 --- a/packages/org.eclipse.epp.package.modeling.product/pom.xml +++ b/packages/org.eclipse.epp.package.modeling.product/pom.xml @@ -20,7 +20,7 @@ org.eclipse.epp org.eclipse.epp-product-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/product diff --git a/packages/org.eclipse.epp.package.modeling/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.modeling/META-INF/MANIFEST.MF index 8ddd04131..fd4f40776 100644 --- a/packages/org.eclipse.epp.package.modeling/META-INF/MANIFEST.MF +++ b/packages/org.eclipse.epp.package.modeling/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: EPP Modeling Bundle Bundle-SymbolicName: org.eclipse.epp.package.modeling;singleton:=true -Bundle-Version: 4.40.0.qualifier +Bundle-Version: 4.41.0.qualifier Bundle-Vendor: Eclipse Packaging Project -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-25 Require-Bundle: org.eclipse.platform, org.eclipse.equinox.app, org.eclipse.ui.intro.quicklinks;bundle-version="1.0.0" diff --git a/packages/org.eclipse.epp.package.modeling/pom.xml b/packages/org.eclipse.epp.package.modeling/pom.xml index f124a0e8f..0ec080a7d 100644 --- a/packages/org.eclipse.epp.package.modeling/pom.xml +++ b/packages/org.eclipse.epp.package.modeling/pom.xml @@ -21,7 +21,7 @@ org.eclipse.epp org.eclipse.epp-bundle-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/bundle 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 dba5324d6..845ec5b44 100644 --- a/packages/org.eclipse.epp.package.php.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.php.feature/epp.website.xml @@ -27,11 +27,11 @@ Click - + diff --git a/packages/org.eclipse.epp.package.php.feature/feature.xml b/packages/org.eclipse.epp.package.php.feature/feature.xml index 66ae0ece5..9502d1bab 100644 --- a/packages/org.eclipse.epp.package.php.feature/feature.xml +++ b/packages/org.eclipse.epp.package.php.feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.epp org.eclipse.epp-feature-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/feature diff --git a/packages/org.eclipse.epp.package.php.product/epp.p2.inf b/packages/org.eclipse.epp.package.php.product/epp.p2.inf index 09f16f822..9f618a31a 100644 --- a/packages/org.eclipse.epp.package.php.product/epp.p2.inf +++ b/packages/org.eclipse.epp.package.php.product/epp.p2.inf @@ -2,7 +2,7 @@ instructions.configure=\ mkdir(path:${installFolder}/dropins); properties.1.name = org.eclipse.equinox.p2.description -properties.1.value = 2026-06 Release of the Eclipse PHP Developers package. +properties.1.value = 2026-09 Release of the Eclipse PHP Developers package. properties.2.name = org.eclipse.equinox.p2.provider properties.2.value = Eclipse Packaging Project diff --git a/packages/org.eclipse.epp.package.php.product/epp.product b/packages/org.eclipse.epp.package.php.product/epp.product index ccc55a68e..46a9e8bb5 100644 --- a/packages/org.eclipse.epp.package.php.product/epp.product +++ b/packages/org.eclipse.epp.package.php.product/epp.product @@ -1,14 +1,14 @@ - + - -Dosgi.requiredJavaVersion=21 + -Dosgi.requiredJavaVersion=25 -Dosgi.instance.area.default=@user.home/eclipse-workspace -Dosgi.dataAreaRequiresExplicitInit=true -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true @@ -89,9 +89,9 @@ This file should also be easy to compare against all the other epp.product files - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 @@ -247,7 +247,7 @@ United States, other countries, or both. - + @@ -269,7 +269,7 @@ United States, other countries, or both. - + @@ -301,8 +301,8 @@ United States, other countries, or both. - - + + diff --git a/packages/org.eclipse.epp.package.php.product/pom.xml b/packages/org.eclipse.epp.package.php.product/pom.xml index eeab2ff41..2f65a496f 100644 --- a/packages/org.eclipse.epp.package.php.product/pom.xml +++ b/packages/org.eclipse.epp.package.php.product/pom.xml @@ -19,7 +19,7 @@ org.eclipse.epp org.eclipse.epp-product-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/product diff --git a/packages/org.eclipse.epp.package.php/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.php/META-INF/MANIFEST.MF index 328179ad8..53ec9f3da 100644 --- a/packages/org.eclipse.epp.package.php/META-INF/MANIFEST.MF +++ b/packages/org.eclipse.epp.package.php/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: EPP PHP Package Bundle-SymbolicName: org.eclipse.epp.package.php;singleton:=true -Bundle-Version: 4.40.0.qualifier +Bundle-Version: 4.41.0.qualifier Bundle-Vendor: Eclipse Packaging Project -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-25 Require-Bundle: org.eclipse.platform, org.eclipse.equinox.app, org.eclipse.ui.workbench diff --git a/packages/org.eclipse.epp.package.php/pom.xml b/packages/org.eclipse.epp.package.php/pom.xml index 727e0c691..3e67324ee 100644 --- a/packages/org.eclipse.epp.package.php/pom.xml +++ b/packages/org.eclipse.epp.package.php/pom.xml @@ -21,7 +21,7 @@ org.eclipse.epp org.eclipse.epp-bundle-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/bundle 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 6ea1f959a..e6510e4d6 100644 --- a/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml @@ -22,11 +22,11 @@ - + diff --git a/packages/org.eclipse.epp.package.rcp.feature/feature.xml b/packages/org.eclipse.epp.package.rcp.feature/feature.xml index 19986c2a8..75260d984 100644 --- a/packages/org.eclipse.epp.package.rcp.feature/feature.xml +++ b/packages/org.eclipse.epp.package.rcp.feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.epp org.eclipse.epp-feature-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/feature diff --git a/packages/org.eclipse.epp.package.rcp.product/epp.p2.inf b/packages/org.eclipse.epp.package.rcp.product/epp.p2.inf index 7251d995e..4b93c73a9 100644 --- a/packages/org.eclipse.epp.package.rcp.product/epp.p2.inf +++ b/packages/org.eclipse.epp.package.rcp.product/epp.p2.inf @@ -2,7 +2,7 @@ instructions.configure=\ mkdir(path:${installFolder}/dropins); properties.1.name = org.eclipse.equinox.p2.description -properties.1.value = 2026-06 Release of the Eclipse RCP/RAP Developers package. +properties.1.value = 2026-09 Release of the Eclipse RCP/RAP Developers package. properties.2.name = org.eclipse.equinox.p2.provider properties.2.value = Eclipse Packaging Project diff --git a/packages/org.eclipse.epp.package.rcp.product/epp.product b/packages/org.eclipse.epp.package.rcp.product/epp.product index 9ca3f59d5..34055e593 100644 --- a/packages/org.eclipse.epp.package.rcp.product/epp.product +++ b/packages/org.eclipse.epp.package.rcp.product/epp.product @@ -1,14 +1,14 @@ - + - -Dosgi.requiredJavaVersion=21 + -Dosgi.requiredJavaVersion=25 -Dosgi.instance.area.default=@user.home/eclipse-workspace -Dosgi.dataAreaRequiresExplicitInit=true -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true @@ -91,9 +91,9 @@ This file should also be easy to compare against all the other epp.product files - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 @@ -249,7 +249,7 @@ United States, other countries, or both. - + @@ -271,7 +271,7 @@ United States, other countries, or both. - + @@ -314,8 +314,8 @@ United States, other countries, or both. - - + + diff --git a/packages/org.eclipse.epp.package.rcp.product/pom.xml b/packages/org.eclipse.epp.package.rcp.product/pom.xml index 04821b059..768b508a2 100644 --- a/packages/org.eclipse.epp.package.rcp.product/pom.xml +++ b/packages/org.eclipse.epp.package.rcp.product/pom.xml @@ -20,7 +20,7 @@ org.eclipse.epp org.eclipse.epp-product-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/product diff --git a/packages/org.eclipse.epp.package.rcp/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.rcp/META-INF/MANIFEST.MF index 353438165..e9a60b697 100644 --- a/packages/org.eclipse.epp.package.rcp/META-INF/MANIFEST.MF +++ b/packages/org.eclipse.epp.package.rcp/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: EPP RCP/RAP Bundle Bundle-SymbolicName: org.eclipse.epp.package.rcp;singleton:=true -Bundle-Version: 4.40.0.qualifier +Bundle-Version: 4.41.0.qualifier Bundle-Vendor: Eclipse Packaging Project -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-25 Require-Bundle: org.eclipse.platform, org.eclipse.equinox.app Eclipse-BundleShape: dir diff --git a/packages/org.eclipse.epp.package.rcp/pom.xml b/packages/org.eclipse.epp.package.rcp/pom.xml index d7541c794..947995b50 100644 --- a/packages/org.eclipse.epp.package.rcp/pom.xml +++ b/packages/org.eclipse.epp.package.rcp/pom.xml @@ -21,7 +21,7 @@ org.eclipse.epp org.eclipse.epp-bundle-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/bundle 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 96d169f35..8ecf90740 100644 --- a/packages/org.eclipse.epp.package.scout.feature/epp.website.xml +++ b/packages/org.eclipse.epp.package.scout.feature/epp.website.xml @@ -26,11 +26,11 @@ url="https://eclipsescout.github.io" project="Eclipse Scout" /> - + diff --git a/packages/org.eclipse.epp.package.scout.feature/feature.xml b/packages/org.eclipse.epp.package.scout.feature/feature.xml index 5d60c3761..e4f868997 100644 --- a/packages/org.eclipse.epp.package.scout.feature/feature.xml +++ b/packages/org.eclipse.epp.package.scout.feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.epp org.eclipse.epp-feature-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/feature diff --git a/packages/org.eclipse.epp.package.scout.product/epp.p2.inf b/packages/org.eclipse.epp.package.scout.product/epp.p2.inf index 2b9e577f5..5a439009a 100644 --- a/packages/org.eclipse.epp.package.scout.product/epp.p2.inf +++ b/packages/org.eclipse.epp.package.scout.product/epp.p2.inf @@ -2,7 +2,7 @@ instructions.configure=\ mkdir(path:${installFolder}/dropins); properties.1.name = org.eclipse.equinox.p2.description -properties.1.value = 2026-06 Release of the Eclipse Scout Developers package. +properties.1.value = 2026-09 Release of the Eclipse Scout Developers package. properties.2.name = org.eclipse.equinox.p2.provider properties.2.value = Eclipse Packaging Project diff --git a/packages/org.eclipse.epp.package.scout.product/epp.product b/packages/org.eclipse.epp.package.scout.product/epp.product index 99d40f2b6..293ea4746 100644 --- a/packages/org.eclipse.epp.package.scout.product/epp.product +++ b/packages/org.eclipse.epp.package.scout.product/epp.product @@ -1,14 +1,14 @@ - + - -Dosgi.requiredJavaVersion=21 + -Dosgi.requiredJavaVersion=25 -Dosgi.instance.area.default=@user.home/eclipse-workspace -Dosgi.dataAreaRequiresExplicitInit=true -Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true @@ -89,9 +89,9 @@ This file should also be easy to compare against all the other epp.product files - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25 @@ -247,7 +247,7 @@ United States, other countries, or both. - + @@ -269,7 +269,7 @@ United States, other countries, or both. - + @@ -299,8 +299,8 @@ United States, other countries, or both. - - + + diff --git a/packages/org.eclipse.epp.package.scout.product/pom.xml b/packages/org.eclipse.epp.package.scout.product/pom.xml index d3abc1a99..1b941eab9 100644 --- a/packages/org.eclipse.epp.package.scout.product/pom.xml +++ b/packages/org.eclipse.epp.package.scout.product/pom.xml @@ -20,7 +20,7 @@ org.eclipse.epp org.eclipse.epp-product-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/product diff --git a/packages/org.eclipse.epp.package.scout/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.scout/META-INF/MANIFEST.MF index c0bc95992..7048d7c49 100644 --- a/packages/org.eclipse.epp.package.scout/META-INF/MANIFEST.MF +++ b/packages/org.eclipse.epp.package.scout/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.epp.package.scout;singleton:=true -Bundle-Version: 4.40.0.qualifier +Bundle-Version: 4.41.0.qualifier Bundle-Vendor: %pluginVendor -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-25 Require-Bundle: org.eclipse.platform, org.eclipse.equinox.app Eclipse-BundleShape: dir diff --git a/packages/org.eclipse.epp.package.scout/pom.xml b/packages/org.eclipse.epp.package.scout/pom.xml index cd0514b69..4dca94f22 100644 --- a/packages/org.eclipse.epp.package.scout/pom.xml +++ b/packages/org.eclipse.epp.package.scout/pom.xml @@ -21,7 +21,7 @@ org.eclipse.epp org.eclipse.epp-bundle-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../../releng/org.eclipse.epp.config/parent/bundle diff --git a/pom.xml b/pom.xml index 68ecfd792..f5a27fe90 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.eclipse.epp org.eclipse.epp-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT releng/org.eclipse.epp.config/parent/ diff --git a/releng/org.eclipse.epp.config/aggregation/pom.xml b/releng/org.eclipse.epp.config/aggregation/pom.xml index ed5490178..f11dea35c 100644 --- a/releng/org.eclipse.epp.config/aggregation/pom.xml +++ b/releng/org.eclipse.epp.config/aggregation/pom.xml @@ -14,7 +14,7 @@ org.eclipse.epp org.eclipse.epp-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../parent/ @@ -56,7 +56,7 @@ --action ${simrel.aggregator.build.type} - JavaSE-21 + JavaSE-25 -Xms256M -Xmx2048M diff --git a/releng/org.eclipse.epp.config/oomph/EPP.setup b/releng/org.eclipse.epp.config/oomph/EPP.setup index 144380883..399ad8e52 100644 --- a/releng/org.eclipse.epp.config/oomph/EPP.setup +++ b/releng/org.eclipse.epp.config/oomph/EPP.setup @@ -41,8 +41,8 @@ + version="JavaSE-25" + location="${jre.location-25}"> Define the JRE needed to compile and run the Java projects of ${scope.project.label} + url="https://download.eclipse.org/justj/jres/25/updates/release/latest"/> @@ -384,7 +384,7 @@ + value="https://download.eclipse.org/justj/jres/25/updates/release/latest"> The JustJ JRE p2 repository used to build the packages as used in packaging.aggr - + diff --git a/releng/org.eclipse.epp.config/org.eclipse.epp.releng.updater/.settings/org.eclipse.jdt.core.prefs b/releng/org.eclipse.epp.config/org.eclipse.epp.releng.updater/.settings/org.eclipse.jdt.core.prefs index 23fa13b17..c540a97fc 100644 --- a/releng/org.eclipse.epp.config/org.eclipse.epp.releng.updater/.settings/org.eclipse.jdt.core.prefs +++ b/releng/org.eclipse.epp.config/org.eclipse.epp.releng.updater/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 -org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=25 +org.eclipse.jdt.core.compiler.compliance=25 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=21 +org.eclipse.jdt.core.compiler.source=25 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 76af999d4..a073cfd2d 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,11 +39,11 @@ public class Updater { /** * M1, M2, M3, RC1, RC2 */ - private static final String MILESTONE = "RC2"; + private static final String MILESTONE = "M1"; - private static final String PLATFORM_VERSION = "4.40"; + private static final String PLATFORM_VERSION = "4.41"; - private static final String EXECUTION_ENVIRONMENT = "21"; + private static final String EXECUTION_ENVIRONMENT = "25"; private static final String PLATFORM_VERSION_MATCHER = "(4\\.[3-9][0-9])"; @@ -243,8 +243,11 @@ private void visit(Path file) throws IOException { apply(file, "\n *([^>]+)", MILESTONE.equals("RC2") ? "${RELEASE_NAME} (${RELEASE_VERSION})" : "${RELEASE_NAME} ${RELEASE_MILESTONE} (${RELEASE_VERSION} ${RELEASE_MILESTONE})"); + apply(file, "Used for the variable below to update easily, e.g., to ([0-9]+)\\.", EXECUTION_ENVIRONMENT); apply(file, "([^<]+)", EXECUTION_ENVIRONMENT); + // Not strictly needed for the promotion step. + apply(file, "JavaSE-([0-9]+)", EXECUTION_ENVIRONMENT); } else if (fileName.equals("epp.product")) { apply(file, "]+version=\"" + PLATFORM_VERSION_MATCHER + "\\.0\\.qualifier\"", PLATFORM_VERSION); @@ -254,8 +257,25 @@ private void visit(Path file) throws IOException { + PLATFORM_VERSION_MATCHER + "\"", PLATFORM_VERSION, PLATFORM_VERSION); apply(file, "]+location=\"https://download.eclipse.org/releases/" + SIMREL_VERSION_MATCHER + "\"\\s+name=\"" + SIMREL_VERSION_MATCHER + "\"", SIMREL_VERSION, SIMREL_VERSION); + apply(file, "org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-([0-9]+)", + EXECUTION_ENVIRONMENT); + apply(file, "-Dosgi.requiredJavaVersion=([0-9]+)", EXECUTION_ENVIRONMENT); + } else if (fileName.equals("EPP.setup")) { + apply(file, "version=\"JavaSE-([0-9]+)\"", EXECUTION_ENVIRONMENT); + apply(file, "\\$\\{jre.location-([0-9]+)\\}", EXECUTION_ENVIRONMENT); + apply(file, "jres/([0-9]+)/updates", EXECUTION_ENVIRONMENT); } else if (fileName.equals("MANIFEST.MF")) { apply(file, "Bundle-Version: " + PLATFORM_VERSION_MATCHER + "\\.0\\.qualifier", PLATFORM_VERSION); + apply(file, "Bundle-RequiredExecutionEnvironment: JavaSE-([0-9]+)", EXECUTION_ENVIRONMENT); + } else if (fileName.equals("org.eclipse.jdt.core.prefs")) { + apply(file, "org.eclipse.jdt.core.compiler.(?:codegen.targetPlatform|compliance|source)=([0-9]+)", + EXECUTION_ENVIRONMENT); + } else if (fileName.equals(".classpath")) { + apply(file, "org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-([0-9]+)", + EXECUTION_ENVIRONMENT); + } else if (fileName.equals("build.yml")) { + apply(file, "name: Set up JDK ([0-9]+)", EXECUTION_ENVIRONMENT); + apply(file, "java-version: '([0-9]+)'", EXECUTION_ENVIRONMENT); } else if (fileName.equals("promote-a-build.sh")) { var pattern = Pattern.compile("(?20[2-9][0-9]-(?:03|06|09|12))/R(?\r?\n)EOM"); var content = getContent(file); @@ -311,7 +331,10 @@ 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) || "sanity-check".equals(fileName) || fileName.startsWith(".") + if ("target".equals(fileName) // + || "sanity-check".equals(fileName) // + || (fileName.startsWith(".") && !".settings".equals(fileName) && !".classpath".equals(fileName) + && !".github".equals(fileName)) // || dir.endsWith("META-INF/maven")) { return FileVisitResult.SKIP_SUBTREE; } diff --git a/releng/org.eclipse.epp.config/parent/bundle-feature/pom.xml b/releng/org.eclipse.epp.config/parent/bundle-feature/pom.xml index 6b1ef85f0..770e1a712 100644 --- a/releng/org.eclipse.epp.config/parent/bundle-feature/pom.xml +++ b/releng/org.eclipse.epp.config/parent/bundle-feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.epp org.eclipse.epp-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT .. diff --git a/releng/org.eclipse.epp.config/parent/bundle/pom.xml b/releng/org.eclipse.epp.config/parent/bundle/pom.xml index 401d0c42d..65ce1226d 100644 --- a/releng/org.eclipse.epp.config/parent/bundle/pom.xml +++ b/releng/org.eclipse.epp.config/parent/bundle/pom.xml @@ -17,7 +17,7 @@ org.eclipse.epp org.eclipse.epp-bundle-feature-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../bundle-feature diff --git a/releng/org.eclipse.epp.config/parent/feature/pom.xml b/releng/org.eclipse.epp.config/parent/feature/pom.xml index d93d68738..7d2220397 100644 --- a/releng/org.eclipse.epp.config/parent/feature/pom.xml +++ b/releng/org.eclipse.epp.config/parent/feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.epp org.eclipse.epp-bundle-feature-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../bundle-feature diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml index 7760dbd4e..6f93d8055 100644 --- a/releng/org.eclipse.epp.config/parent/pom.xml +++ b/releng/org.eclipse.epp.config/parent/pom.xml @@ -19,7 +19,7 @@ org.eclipse.epp org.eclipse.epp-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT pom @@ -31,31 +31,30 @@ yyyyMMdd-HHmm ${maven.build.timestamp} - 2026-06 - 2026-03 - 2026-09 + 2026-09 + 2026-06 + 2026-12 - R + M1 - 4.40.0 + 4.41.0 - 202606041000 + 202607091000 - https://download.eclipse.org/staging/2026-06/ + https://download.eclipse.org/staging/2026-09/ ${RELEASE_NAME}-${RELEASE_MILESTONE} - + ${maven.build.timestamp} - - + - ${RELEASE_NAME} (${RELEASE_VERSION}) + ${RELEASE_NAME} ${RELEASE_MILESTONE} (${RELEASE_VERSION} ${RELEASE_MILESTONE}) ${SIMREL_REPO} - - 21 + + 25 https://download.eclipse.org/justj/jres/${execution.environment.version}/updates/milestone/latest diff --git a/releng/org.eclipse.epp.config/parent/product/pom.xml b/releng/org.eclipse.epp.config/parent/product/pom.xml index 4f6e4c884..686deeffe 100644 --- a/releng/org.eclipse.epp.config/parent/product/pom.xml +++ b/releng/org.eclipse.epp.config/parent/product/pom.xml @@ -17,7 +17,7 @@ org.eclipse.epp org.eclipse.epp-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT .. diff --git a/releng/org.eclipse.epp.config/tools/pom.xml b/releng/org.eclipse.epp.config/tools/pom.xml index e9a7a1e3b..b2cf92693 100644 --- a/releng/org.eclipse.epp.config/tools/pom.xml +++ b/releng/org.eclipse.epp.config/tools/pom.xml @@ -13,7 +13,7 @@ org.eclipse.epp org.eclipse.epp-parent - 4.40.0-SNAPSHOT + 4.41.0-SNAPSHOT ../parent diff --git a/releng/org.eclipse.epp.config/tools/promote-a-build.sh b/releng/org.eclipse.epp.config/tools/promote-a-build.sh index 1529ca8ad..72402d4aa 100755 --- a/releng/org.eclipse.epp.config/tools/promote-a-build.sh +++ b/releng/org.eclipse.epp.config/tools/promote-a-build.sh @@ -94,6 +94,7 @@ cat > release.xml <2025-06/R 2025-09/R 2025-12/R +2026-03/R EOM if [ "$RELEASE_MILESTONE" != "R" ]; then cat >> release.xml <