Update to Tycho 4.0.7

Eliminate all the filtered requirements from every product p2.inf.
Use the CBI p2 aggregator for aggregating the EPP update site from the
various product update sites.
Eliminate the use of ant tasks and mirror activities and all related
infrastructure.
Update the splash and branding.
Update versions to 4.32 for 2024-06.
Use https://projects.eclipse.org/projects/technology.packaging instead
of https://www.eclipse.org/epp for about.properties
Comment out update.id advice until the fix from
eclipse-tycho/tycho#3725 is available.
Use the JustJ execution environment to eliminate all the product
target-platform-configuration specializations.
Update the setup to install the CBI p2 aggregrator and add string
substitution tasks to populate the variables used by packaging.aggr.

eclipse-packaging#111

.gitignore

@@ -16,3 +16,5 @@ target/
 /archive
 email.txt
 workspace/
+build.log
+.tycho-consumer-pom.xml

Jenkinsfile

@@ -24,9 +24,9 @@ pipeline {
     }
     stage('Build p2') {
       steps {
-        sh "mvn verify -Depp.p2.all -Depp.product.all --batch-mode --show-version -Dmaven.repo.local=.repository -Dtycho.disableP2Mirrors=true -Peclipse-sign-jar"
+        sh "mvn verify -Depp.p2.all -Depp.product.all --batch-mode --show-version -Dmaven.repo.local=.repository -Dtycho.disableP2Mirrors=true -Peclipse-sign-jar -Pepp.p2.aggregation"
         sshagent ( ['projects-storage.eclipse.org-bot-ssh']) {
-          sh "scp -rpv archive/repository/* ${SSHUSER}:${BUILDING}/repository/"
+          sh "scp -rpv releng/org.eclipse.epp.config/aggregation/target/repository/final/* ${SSHUSER}:${BUILDING}/repository/"
         }
       }
     }

README.md

@@ -1,7 +1,7 @@
 The EPP Build
 =============
 
-The [Eclipse Packaging Project (EPP)](https://www.eclipse.org/epp/) provides the download packages based on the content of the yearly Simultaneous Release.
+The [Eclipse Packaging Project (EPP)](https://projects.eclipse.org/projects/technology.packaging/) provides the download packages based on the content of the yearly Simultaneous Release.
 The download packages are provided from [www.eclipse.org/downloads/eclipse-packages/](https://www.eclipse.org/downloads/eclipse-packages/).
 
 ## Creating and releasing packages
@@ -73,14 +73,14 @@ internal signing service and can be activated only if the build is running there
 ### Additional Configuration Possibilities
 
 By default, the EPP build uses the content of the Eclipse Simultaneous Release *Staging*
-repository at <https://download.eclipse.org/staging/2024-03/> as input. Sometimes it is
+repository at <https://download.eclipse.org/staging/2024-06/> 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 2024-03 repository:
+composite Eclipse 2024-06 repository:
 
-    -Declipse.simultaneous.release.repository="https://download.eclipse.org/releases/2024-03"
+    -Declipse.simultaneous.release.repository="https://download.eclipse.org/releases/2024-06"
 
 ### EPP Configuration File format
 

RELEASING.md

@@ -88,7 +88,7 @@ This checklist is only used once per release cycle. Scroll down for the per-mile
   - [ ] Help -> About says expected build name and milestone, e.g. `2020-03-M2`
   - [ ] `org.eclipse.epp.package.*` features and bundles have the timestamp of the forced qualifier update or later
   - [ ] Upgrade from previous release works. 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 (Such as JDT, Platform) have been upgraded.
-    - `https://download.eclipse.org/staging/2024-03/` - _NOTE_ Use `SIMREL_REPO` if the staging repo has been updated since the `SIMREL_REPO` location was created.
+    - `https://download.eclipse.org/staging/2024-06/` - _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/`
   - [ ] Verify no non-EPP content is in the p2 repo (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/)

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

@@ -29,11 +29,11 @@ Click <a href="https://github.com/eclipse-egit/egit/issues">here</a> to open a b
   </packageMetaData>
   <MoreInfo>
   <NewAndNoteworthy
-    url="https://eclipse.dev/eclipse/news/4.31/"
+    url="https://eclipse.dev/eclipse/news/4.32/"
     project="Eclipse Platform" />
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-committers-2024-03-R" />
+  <product name="eclipse-committers-2024-06-M1" />
 
 </configuration>

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

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.committers.feature"
       label="EPP Eclipse IDE for Eclipse Committers Feature"
-      version="4.31.0.qualifier"
+      version="4.32.0.qualifier"
       provider-name="Eclipse Packaging Project"
       plugin="org.eclipse.epp.package.committers"
       license-feature="org.eclipse.license"

packages/org.eclipse.epp.package.committers.feature/p2.inf

@@ -10,7 +10,7 @@ org.eclipse.pde.build.append.startlevels=false
 # of everything below the old main package feature. In order to prevent such
 # upgrades we add an artificial lower limit of the IU to the p2 metadata.
 
-update.id = org.eclipse.epp.package.committers.feature.feature.group
-update.range = [4.6.0.20160301-1200, $version$)
-update.severity = 0
-update.description = Eclipse package upgrade from versions before Eclipse Neon (4.6) is not possible. See bug 332989.
+# update.id = org.eclipse.epp.package.committers.feature.feature.group
+# update.range = [4.6.0.20160301-1200, $version$)
+# update.severity = 0
+# update.description = Eclipse package upgrade from versions before Eclipse Neon (4.6) is not possible. See bug 332989.

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

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.eclipse.epp</groupId>
     <artifactId>org.eclipse.epp-feature-parent</artifactId>
-    <version>4.31.0-SNAPSHOT</version>
+    <version>4.32.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.epp.config/parent/feature</relativePath>
   </parent>
 

packages/org.eclipse.epp.package.committers.product/epp.product

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse IDE for Eclipse Committers" uid="epp.package.committers" id="org.eclipse.epp.package.committers.product" application="org.eclipse.ui.ide.workbench" version="4.31.0.qualifier" type="mixed" includeLaunchers="true" autoIncludeRequirements="true">
+<product name="Eclipse IDE for Eclipse Committers" uid="epp.package.committers" id="org.eclipse.epp.package.committers.product" application="org.eclipse.ui.ide.workbench" version="4.32.0.qualifier" type="mixed" includeLaunchers="true" autoIncludeRequirements="true">
 
    <aboutInfo>
       <image path="/org.eclipse.epp.package.committers/eclipse_lg.png"/>
@@ -228,7 +228,7 @@ United States, other countries, or both.
       <!-- all features added here as installMode="root" need to be added to p2.inf as well -->
 
       <!-- common features that all products have -->
-      <feature id="org.eclipse.epp.package.common.feature" version="4.31.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.common.feature" version="4.32.0.qualifier"/>
       <feature id="org.eclipse.platform"/>
       <feature id="org.eclipse.equinox.p2.user.ui"/>
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
@@ -249,7 +249,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.mylyn.reviews.feature" installMode="root"/>
 
       <!-- product specific contents -->
-      <feature id="org.eclipse.epp.package.committers.feature" version="4.31.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.committers.feature" version="4.32.0.qualifier"/>
       <feature id="org.eclipse.help"/>
       <feature id="org.eclipse.jdt" installMode="root"/>
       <feature id="org.eclipse.jdt.bcoview.feature" installMode="root"/>
@@ -280,8 +280,8 @@ United States, other countries, or both.
    </plugins>
 
    <repositories>
-      <repository location="https://download.eclipse.org/eclipse/updates/4.31" name="The Eclipse Project Updates" enabled="true" />
-      <repository location="https://download.eclipse.org/releases/2024-03" name="2024-03" enabled="true" />
+      <repository location="https://download.eclipse.org/eclipse/updates/4.32" name="The Eclipse Project Updates" enabled="true" />
+      <repository location="https://download.eclipse.org/releases/2024-06" name="2024-06" enabled="true" />
    </repositories>
 
 </product>