Update to Tycho 4.0.8-SNAPSHOT to process update.id advice

All the update.id advice was commented because Tycho 4.0.7 throws exception; this re-enables all those. Also, each p2.inf for each product is renamed to epp.p2.inf which avoids a related bug parsing the advice file for the project as a whole as opposed to parse the product-specific advice. Define a file association in the setup so it's easy to open an eep.p2.inf with the properties editor.
eclipse-packaging · Apr 5, 2024 · 8098233 · 8098233
1 parent 6dbf4db
commit 8098233
Show file tree

Hide file tree

Showing 23 changed files with 100 additions and 112 deletions.
diff --git a/packages/org.eclipse.epp.package.committers.feature/p2.inf b/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.
diff --git a/...pse.epp.package.committers.product/p2.inf → ...epp.package.committers.product/epp.p2.inf b/...pse.epp.package.committers.product/p2.inf → ...epp.package.committers.product/epp.p2.inf
@@ -11,10 +11,10 @@ instructions.configure=\
 # upgrades we add an artificial lower limit of the IU to the p2 metadata.
 
 # This is equivalent, but more restrictive than platform's "Restrict range so we are not an automatic update for 3.x."
-# update.id = epp.package.committers
-# 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 = epp.package.committers
+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.
 
 properties.1.name = org.eclipse.equinox.p2.description
 properties.1.value = 2024-06 Release of the Eclipse Committers package.

diff --git a/packages/org.eclipse.epp.package.cpp.feature/p2.inf b/packages/org.eclipse.epp.package.cpp.feature/p2.inf
@@ -30,10 +30,10 @@ requires.5.optional=true
 # 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.cpp.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.cpp.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.
 
 instructions.configure=\
 org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/releases/latest);\

diff --git a/...rg.eclipse.epp.package.cpp.product/p2.inf → ...clipse.epp.package.cpp.product/epp.p2.inf b/...rg.eclipse.epp.package.cpp.product/p2.inf → ...clipse.epp.package.cpp.product/epp.p2.inf
@@ -11,10 +11,10 @@ instructions.configure=\
 # upgrades we add an artificial lower limit of the IU to the p2 metadata.
 
 # This is equivalent, but more restrictive than platform's "Restrict range so we are not an automatic update for 3.x."
-# update.id = epp.package.cpp
-# 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 = epp.package.cpp
+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.
 
 properties.1.name = org.eclipse.equinox.p2.description
 properties.1.value = 2024-06 Release of the Eclipse C/C++ Developers Developers package.

diff --git a/packages/org.eclipse.epp.package.dsl.feature/p2.inf b/packages/org.eclipse.epp.package.dsl.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.dsl.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.dsl.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.
diff --git a/...rg.eclipse.epp.package.dsl.product/p2.inf → ...clipse.epp.package.dsl.product/epp.p2.inf b/...rg.eclipse.epp.package.dsl.product/p2.inf → ...clipse.epp.package.dsl.product/epp.p2.inf
@@ -11,10 +11,10 @@ instructions.configure=\
 # upgrades we add an artificial lower limit of the IU to the p2 metadata.
 
 # This is equivalent, but more restrictive than platform's "Restrict range so we are not an automatic update for 3.x."
-# update.id = epp.package.dsl
-# 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 = epp.package.dsl
+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.
 
 properties.1.name = org.eclipse.equinox.p2.description
 properties.1.value = 2024-06 Release of the Eclipse DSL Tools package.

diff --git a/packages/org.eclipse.epp.package.embedcpp.feature/p2.inf b/packages/org.eclipse.epp.package.embedcpp.feature/p2.inf
@@ -21,20 +21,6 @@ requires.5.namespace=org.eclipse.equinox.p2.iu
 requires.5.name=org.eclipse.linuxtools.callgraph.feature.feature.group
 requires.5.optional=true
 
-# Bug 490515 - Prevent upgrade from old to new EPP package layout
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=490515
-#
-# With Eclipse Neon (4.6.0) all packages changed their structure from a single
-# feature to a product with multiple independent root features. Upgrades from
-# older versions to the new structure would result in an unexpected uninstall
-# 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.embedcpp.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.
-
 instructions.configure=\
 org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/releases/latest);\
 org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/releases/latest);\

diff --git a/packages/org.eclipse.epp.package.embedcpp.product/epp.p2.inf b/packages/org.eclipse.epp.package.embedcpp.product/epp.p2.inf
@@ -0,0 +1,8 @@
+instructions.configure=\
+  mkdir(path:${installFolder}/dropins);
+
+properties.1.name = org.eclipse.equinox.p2.description
+properties.1.value = 2024-06 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/p2.inf b/packages/org.eclipse.epp.package.embedcpp.product/p2.inf
diff --git a/packages/org.eclipse.epp.package.java.feature/p2.inf b/packages/org.eclipse.epp.package.java.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.java.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.java.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.
diff --git a/...g.eclipse.epp.package.java.product/p2.inf → ...lipse.epp.package.java.product/epp.p2.inf b/...g.eclipse.epp.package.java.product/p2.inf → ...lipse.epp.package.java.product/epp.p2.inf
@@ -11,10 +11,10 @@ instructions.configure=\
 # upgrades we add an artificial lower limit of the IU to the p2 metadata.
 
 # This is equivalent, but more restrictive than platform's "Restrict range so we are not an automatic update for 3.x."
-# update.id = epp.package.java
-# 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 = epp.package.java
+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.
 
 properties.1.name = org.eclipse.equinox.p2.description
 properties.1.value = 2024-06 Release of the Eclipse Java Developers package.

diff --git a/packages/org.eclipse.epp.package.jee.feature/p2.inf b/packages/org.eclipse.epp.package.jee.feature/p2.inf
@@ -10,10 +10,10 @@ 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.jee.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.jee.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.
 
 instructions.configure=\
 org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/releases/latest);\

diff --git a/...rg.eclipse.epp.package.jee.product/p2.inf → ...clipse.epp.package.jee.product/epp.p2.inf b/...rg.eclipse.epp.package.jee.product/p2.inf → ...clipse.epp.package.jee.product/epp.p2.inf
@@ -11,10 +11,10 @@ instructions.configure=\
 # upgrades we add an artificial lower limit of the IU to the p2 metadata.
 
 # This is equivalent, but more restrictive than platform's "Restrict range so we are not an automatic update for 3.x."
-# update.id = epp.package.jee
-# 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 = epp.package.jee
+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.
 
 properties.1.name = org.eclipse.equinox.p2.description
 properties.1.value = 2024-06 Release of the Eclipse Enterprise Java and Web Developers package.

diff --git a/packages/org.eclipse.epp.package.modeling.feature/p2.inf b/packages/org.eclipse.epp.package.modeling.feature/p2.inf
@@ -10,9 +10,8 @@ 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.modeling.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.modeling.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.
 
diff --git a/...lipse.epp.package.modeling.product/p2.inf → ...e.epp.package.modeling.product/epp.p2.inf b/...lipse.epp.package.modeling.product/p2.inf → ...e.epp.package.modeling.product/epp.p2.inf
@@ -11,10 +11,10 @@ instructions.configure=\
 # upgrades we add an artificial lower limit of the IU to the p2 metadata.
 
 # This is equivalent, but more restrictive than platform's "Restrict range so we are not an automatic update for 3.x."
-# update.id = epp.package.modeling
-# 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 = epp.package.modeling
+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.
 
 properties.1.name = org.eclipse.equinox.p2.description
 properties.1.value = 2024-06 Release of the Eclipse Modeling Tools package.

diff --git a/packages/org.eclipse.epp.package.php.feature/p2.inf b/packages/org.eclipse.epp.package.php.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.php.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.php.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.
diff --git a/...rg.eclipse.epp.package.php.product/p2.inf → ...clipse.epp.package.php.product/epp.p2.inf b/...rg.eclipse.epp.package.php.product/p2.inf → ...clipse.epp.package.php.product/epp.p2.inf
@@ -11,10 +11,10 @@ instructions.configure=\
 # upgrades we add an artificial lower limit of the IU to the p2 metadata.
 
 # This is equivalent, but more restrictive than platform's "Restrict range so we are not an automatic update for 3.x."
-#update.id = epp.package.php
-#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 = epp.package.php
+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.
 
 properties.1.name = org.eclipse.equinox.p2.description
 properties.1.value = 2024-06 Release of the Eclipse PHP Developers package.

diff --git a/packages/org.eclipse.epp.package.rcp.feature/p2.inf b/packages/org.eclipse.epp.package.rcp.feature/p2.inf
@@ -12,7 +12,7 @@ org.eclipse.pde.build.append.startlevels=false
 #
 # RCP/RAP package had been changed in Eclipse Mars (4.5)
 
-# update.id = org.eclipse.epp.package.rcp.feature.feature.group
-# update.range = [4.5, $version$)
-# update.severity = 0
-# update.description = Eclipse package upgrade from versions before Eclipse Mars (4.5) is not possible. See bug 332989.
+update.id = org.eclipse.epp.package.rcp.feature.feature.group
+update.range = [4.5, $version$)
+update.severity = 0
+update.description = Eclipse package upgrade from versions before Eclipse Mars (4.5) is not possible. See bug 332989.
diff --git a/...rg.eclipse.epp.package.rcp.product/p2.inf → ...clipse.epp.package.rcp.product/epp.p2.inf b/...rg.eclipse.epp.package.rcp.product/p2.inf → ...clipse.epp.package.rcp.product/epp.p2.inf
@@ -11,10 +11,10 @@ instructions.configure=\
 # upgrades we add an artificial lower limit of the IU to the p2 metadata.
 
 # This is equivalent, but more restrictive than platform's "Restrict range so we are not an automatic update for 3.x."
-# update.id = epp.package.rcp
-# 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 = epp.package.rcp
+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.
 
 properties.1.name = org.eclipse.equinox.p2.description
 properties.1.value = 2024-06 Release of the Eclipse RCP/RAP Developers package.

diff --git a/packages/org.eclipse.epp.package.scout.feature/p2.inf b/packages/org.eclipse.epp.package.scout.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.scout.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.scout.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.
diff --git a/....eclipse.epp.package.scout.product/p2.inf → ...ipse.epp.package.scout.product/epp.p2.inf b/....eclipse.epp.package.scout.product/p2.inf → ...ipse.epp.package.scout.product/epp.p2.inf
@@ -11,10 +11,10 @@ instructions.configure=\
 # upgrades we add an artificial lower limit of the IU to the p2 metadata.
 
 # This is equivalent, but more restrictive than platform's "Restrict range so we are not an automatic update for 3.x."
-# update.id = epp.package.scout
-# 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 = epp.package.scout
+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.
 
 properties.1.name = org.eclipse.equinox.p2.description
 properties.1.value = 2024-06 Release of the Eclipse Scout Developers package.

diff --git a/releng/org.eclipse.epp.config/oomph/EPP.setup b/releng/org.eclipse.epp.config/oomph/EPP.setup
@@ -10,8 +10,9 @@
     xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
     xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0"
     xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
+    xmlns:workbench="http://www.eclipse.org/oomph/setup/workbench/1.0"
     xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0"
-    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/JDT.ecore http://www.eclipse.org/oomph/predicates/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/WorkingSets.ecore"
+    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/JDT.ecore http://www.eclipse.org/oomph/predicates/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/setup/workbench/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Workbench.ecore http://www.eclipse.org/oomph/workingsets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/WorkingSets.ecore"
     name="epp.packages"
     label="EPP Packages">
   <annotation
@@ -277,6 +278,15 @@
       value="https://download.eclipse.org/justj/epp/milestone/latest">
     <description>The JustJ EPP JRE p2 repository used to build the packages as used in packaging.aggr</description>
   </setupTask>
+  <setupTask
+      xsi:type="workbench:FileAssociationsTask">
+    <mapping
+        filePattern="*.p2.inf"
+        defaultEditorID="org.eclipse.jdt.ui.PropertiesFileEditor"/>
+    <mapping
+        filePattern="epp.p2.inf"
+        defaultEditorID="org.eclipse.jdt.ui.PropertiesFileEditor"/>
+  </setupTask>
   <stream name="master"
       label="Master">
     <setupTask