[567882] Add support for new package embedcpp to Eclipse Installer

https://bugs.eclipse.org/bugs/show_bug.cgi?id=567882
diff --git a/plugins/org.eclipse.oomph.setup.installer/ProductCatalogGenerator.launch b/plugins/org.eclipse.oomph.setup.installer/ProductCatalogGenerator.launch
index 2efc789..61475e4 100644
--- a/plugins/org.eclipse.oomph.setup.installer/ProductCatalogGenerator.launch
+++ b/plugins/org.eclipse.oomph.setup.installer/ProductCatalogGenerator.launch
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
+    <setAttribute key="additional_plugins"/>
     <booleanAttribute key="append.args" value="true"/>
     <stringAttribute key="application" value="org.eclipse.oomph.setup.installer.ProductCatalogGenerator"/>
     <booleanAttribute key="askclear" value="false"/>
     <booleanAttribute key="automaticAdd" value="false"/>
-    <booleanAttribute key="automaticValidate" value="true"/>
+    <booleanAttribute key="automaticValidate" value="false"/>
     <stringAttribute key="bad_container_name" value="\org.eclipse.oomph.setup.insta"/>
     <stringAttribute key="bootstrap" value=""/>
     <stringAttribute key="checked" value="[NONE]"/>
@@ -14,6 +15,8 @@
     <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/ProductCatalogGenerator"/>
     <booleanAttribute key="default" value="false"/>
     <setAttribute key="deselected_workspace_bundles"/>
+    <stringAttribute key="featureDefaultLocation" value="workspace"/>
+    <stringAttribute key="featurePluginResolution" value="workspace"/>
     <booleanAttribute key="includeOptional" value="false"/>
     <stringAttribute key="location" value="${workspace_loc}/../ws-product-catalog-generator"/>
     <stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>
@@ -23,11 +26,28 @@
     </listAttribute>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
     <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog &#13;&#10;-outputLocation ${file_uri:${resource_loc:/setups/org.eclipse.products.setup}}&#13;&#10;-xstaging 2020-09  &#13;&#10;http://download.eclipse.org/technology/epp/packages/2020-09/202009101200&#13;&#10;http://download.eclipse.org/releases/2020-09/202009161000&#13;&#10;http://download.eclipse.org/eclipse/updates/4.17/R-4.17-202009021800&#13;&#10;-useComposite 2020-12&#13;&#10;-xlatestReleased&#13;&#10;-brandingNotification&#13;&#10;-xsiteURI https://www.eclipse.org/downloads/packages/release/2020-09/r&#13;&#10;-xactual"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog &#13;&#10;-outputLocation ${file_uri:${resource_loc:/setups/org.eclipse.products.setup}}&#13;&#10;-staging 2020-12  &#13;&#10;http://download.eclipse.org/technology/epp/packages/2020-12/202010151200&#13;&#10;http://download.eclipse.org/releases/2020-12/202010161000&#13;&#10;-xuseComposite 2020-12&#13;&#10;-xlatestReleased&#13;&#10;-brandingNotification&#13;&#10;-siteURI https://www.eclipse.org/downloads/packages/release/2020-12/M1&#13;&#10;-actual"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
     <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.p2.mirrors=false&#13;&#10;-Dxorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient45&#13;&#10;-Doomph.p2.repository.retry=2&#13;&#10;-Dxorg.eclipse.ecf.core.util.traceAll=true&#13;&#10;-Dxorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog&#13;&#10;-Dxorg.apache.commons.logging.simplelog.showdatetime=true&#13;&#10;-Dxorg.apache.commons.logging.simplelog.log.org.apache.http=DEBUG&#13;&#10;-Dxorg.apache.commons.logging.simplelog.log.org.apache.http.wire=ERROR&#13;&#10;-Duser.home=${system_property:user.home}"/>
     <stringAttribute key="pde.version" value="3.3"/>
     <stringAttribute key="product" value="org.eclipse.sdk.ide"/>
+    <setAttribute key="selected_features">
+        <setEntry value="org.eclipse.e4.rcp:default"/>
+        <setEntry value="org.eclipse.ecf.core.feature:default"/>
+        <setEntry value="org.eclipse.ecf.core.ssl.feature:default"/>
+        <setEntry value="org.eclipse.ecf.filetransfer.feature:default"/>
+        <setEntry value="org.eclipse.ecf.filetransfer.httpclient45.feature:default"/>
+        <setEntry value="org.eclipse.ecf.filetransfer.ssl.feature:default"/>
+        <setEntry value="org.eclipse.emf.common.ui:default"/>
+        <setEntry value="org.eclipse.emf.common:default"/>
+        <setEntry value="org.eclipse.emf.ecore:default"/>
+        <setEntry value="org.eclipse.emf.edit.ui:default"/>
+        <setEntry value="org.eclipse.emf.edit:default"/>
+        <setEntry value="org.eclipse.equinox.p2.core.feature:default"/>
+        <setEntry value="org.eclipse.oomph.p2:default"/>
+        <setEntry value="org.eclipse.oomph.setup.installer:default"/>
+        <setEntry value="org.eclipse.rcp:default"/>
+    </setAttribute>
     <setAttribute key="selected_target_bundles">
         <setEntry value="com.ibm.icu@default:default"/>
         <setEntry value="com.jcraft.jsch@default:default"/>
@@ -40,7 +60,9 @@
         <setEntry value="org.apache.batik.css@default:default"/>
         <setEntry value="org.apache.batik.i18n@default:default"/>
         <setEntry value="org.apache.batik.util@default:default"/>
-        <setEntry value="org.apache.commons.codec@default:default"/>
+        <setEntry value="org.apache.commons.codec*1.13.0.v20200108-0001@default:default"/>
+        <setEntry value="org.apache.commons.codec*1.14.0.v20200818-1422@default:default"/>
+        <setEntry value="org.apache.commons.httpclient@default:default"/>
         <setEntry value="org.apache.commons.io@default:default"/>
         <setEntry value="org.apache.commons.jxpath@default:default"/>
         <setEntry value="org.apache.commons.logging@default:default"/>
@@ -85,6 +107,7 @@
         <setEntry value="org.eclipse.e4.ui.ide@default:default"/>
         <setEntry value="org.eclipse.e4.ui.model.workbench@default:default"/>
         <setEntry value="org.eclipse.e4.ui.services@default:default"/>
+        <setEntry value="org.eclipse.e4.ui.swt.win32@default:false"/>
         <setEntry value="org.eclipse.e4.ui.widgets@default:default"/>
         <setEntry value="org.eclipse.e4.ui.workbench.addons.swt@default:default"/>
         <setEntry value="org.eclipse.e4.ui.workbench.renderers.swt@default:default"/>
@@ -160,6 +183,7 @@
         <setEntry value="org.eclipse.pde.build@default:default"/>
         <setEntry value="org.eclipse.pde.core@default:default"/>
         <setEntry value="org.eclipse.pde.ds.lib@default:default"/>
+        <setEntry value="org.eclipse.swt.browser.chromium.win32.win32.x86_64@default:false"/>
         <setEntry value="org.eclipse.swt.win32.win32.x86_64@default:false"/>
         <setEntry value="org.eclipse.swt@default:default"/>
         <setEntry value="org.eclipse.team.core@default:default"/>
@@ -217,7 +241,7 @@
     <booleanAttribute key="show_selected_only" value="false"/>
     <stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
     <booleanAttribute key="tracing" value="false"/>
-    <booleanAttribute key="useCustomFeatures" value="false"/>
+    <booleanAttribute key="useCustomFeatures" value="true"/>
     <booleanAttribute key="useDefaultConfig" value="true"/>
     <booleanAttribute key="useDefaultConfigArea" value="true"/>
     <booleanAttribute key="useProduct" value="false"/>
diff --git a/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/ProductCatalogGenerator.java b/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/ProductCatalogGenerator.java
index 1b50cf6..4ea738a 100644
--- a/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/ProductCatalogGenerator.java
+++ b/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/ProductCatalogGenerator.java
@@ -137,10 +137,10 @@
 
   private static final String ECLIPSE_PLATFORM_SDK_PRODUCT_ID = "eclipse.platform.sdk";
 
-  private static final List<String> PRODUCT_IDS = Arrays
-      .asList(new String[] { "epp.package.java", "epp.package.jee", "epp.package.cpp", "epp.package.javascript", "epp.package.php", "epp.package.committers",
-          "epp.package.dsl", "epp.package.modeling", "epp.package.rcp", "epp.package.testing", "epp.package.parallel", "epp.package.scout", "epp.package.rust",
-          "org.eclipse.platform.ide", ECLIPSE_PLATFORM_SDK_PRODUCT_IDE_ID, "epp.package.reporting", "epp.package.android", "epp.package.automotive" });
+  private static final List<String> PRODUCT_IDS = Arrays.asList(new String[] { "epp.package.java", "epp.package.jee", "epp.package.cpp", "epp.package.embedcpp",
+      "epp.package.javascript", "epp.package.php", "epp.package.committers", "epp.package.dsl", "epp.package.modeling", "epp.package.rcp",
+      "epp.package.testing", "epp.package.parallel", "epp.package.scout", "epp.package.rust", "org.eclipse.platform.ide", ECLIPSE_PLATFORM_SDK_PRODUCT_IDE_ID,
+      "epp.package.reporting", "epp.package.android", "epp.package.automotive" });
 
   private static final String ALL_PRODUCT_ID = "all";
 
@@ -1467,8 +1467,17 @@
     return maxJavaVersion;
   }
 
+  /**
+   * Returns a unique key for each product label.
+   * The key's value is arbitrary and not used as anything other than a key into various maps in catalog generator.
+   *
+   * @param productLabel the user visible label of the product.
+   * @return a unique key.
+   */
   private String getKey(String productLabel)
   {
+    // The order of checks in this method is relevant as some product
+    // labels tests may be true for multiple of the ifs below.
     if (productLabel.contains("Eierlegende"))
     {
       return "All";
@@ -1489,6 +1498,10 @@
     {
       return "Mobile";
     }
+    else if (productLabel.contains("Embedded"))
+    {
+      return "EmbedC";
+    }
     else if (productLabel.contains("C/C++"))
     {
       return "C";
@@ -1954,7 +1967,11 @@
                 if (releasePackages.equals(productEntry.getKey()))
                 {
                   System.out.println(releaseEntry.getKey() + " -> " + packageName + " -> " + packageURI);
-                  productEntry.getValue().put(key, packageURI);
+                  URI oldURI = productEntry.getValue().put(key, packageURI);
+                  if (oldURI != null)
+                  {
+                    System.err.println("Conflicting key");
+                  }
                   break LOOP;
                 }
               }
diff --git a/setups/org.eclipse.all.product.setup b/setups/org.eclipse.all.product.setup
index df46942..ecf9d99 100644
--- a/setups/org.eclipse.all.product.setup
+++ b/setups/org.eclipse.all.product.setup
@@ -44,6 +44,10 @@
     <annotation
         source="http://www.eclipse.org/oomph/setup/BrandingInfo">
       <detail
+          key="siteURI">
+        <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1</value>
+      </detail>
+      <detail
           key="shortcut">
         <value>Eclipse Eierlegende Wollmilchsau - Latest</value>
       </detail>
@@ -82,9 +86,9 @@
           name="Web, XML, Java EE and OSGi Enterprise Development"/>
       <requirement
           name="org.eclipse.platform.ide"
-          versionRange="[4.17.0,5.0.0)"/>
+          versionRange="[4.18.0,5.0.0)"/>
       <repository
-          url="http://download.eclipse.org/releases/2020-12">
+          url="http://download.eclipse.org/releases/2020-12/202010161000">
         <annotation
             source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
       </repository>
@@ -152,6 +156,10 @@
     <annotation
         source="http://www.eclipse.org/oomph/setup/BrandingInfo">
       <detail
+          key="siteURI">
+        <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1</value>
+      </detail>
+      <detail
           key="shortcut">
         <value>Eclipse Eierlegende Wollmilchsau - 2020-12</value>
       </detail>
@@ -190,9 +198,9 @@
           name="Web, XML, Java EE and OSGi Enterprise Development"/>
       <requirement
           name="org.eclipse.platform.ide"
-          versionRange="[4.17.0,5.0.0)"/>
+          versionRange="[4.18.0,5.0.0)"/>
       <repository
-          url="http://download.eclipse.org/releases/2020-12">
+          url="http://download.eclipse.org/releases/2020-12/202010161000">
         <annotation
             source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
       </repository>
diff --git a/setups/org.eclipse.platform.sdk.product.setup b/setups/org.eclipse.platform.sdk.product.setup
index f1ebfd9..2b4ee47 100644
--- a/setups/org.eclipse.platform.sdk.product.setup
+++ b/setups/org.eclipse.platform.sdk.product.setup
@@ -53,6 +53,10 @@
     <annotation
         source="http://www.eclipse.org/oomph/setup/BrandingInfo">
       <detail
+          key="siteURI">
+        <value>https://download.eclipse.org/eclipse/downloads/</value>
+      </detail>
+      <detail
           key="shortcut">
         <value>Eclipse SDK - Latest</value>
       </detail>
@@ -97,6 +101,10 @@
     <annotation
         source="http://www.eclipse.org/oomph/setup/BrandingInfo">
       <detail
+          key="siteURI">
+        <value>https://download.eclipse.org/eclipse/downloads/</value>
+      </detail>
+      <detail
           key="shortcut">
         <value>Eclipse SDK - 4.18 - 2020-12</value>
       </detail>
diff --git a/setups/org.eclipse.products.setup b/setups/org.eclipse.products.setup
index 16f2849..76073a5 100644
--- a/setups/org.eclipse.products.setup
+++ b/setups/org.eclipse.products.setup
@@ -67,6 +67,10 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-ide-java-developers</value>
+        </detail>
+        <detail
             key="shortcut">
           <value>Eclipse IDE for Java Developers - Latest</value>
         </detail>
@@ -76,13 +80,13 @@
           label="Eclipse IDE for Java Developers (2020-12)">
         <requirement
             name="epp.package.java"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.buildship.feature.group"/>
         <requirement
@@ -106,11 +110,13 @@
         <requirement
             name="org.eclipse.tips.feature.feature.group"/>
         <requirement
+            name="org.eclipse.tm.terminal.feature.feature.group"/>
+        <requirement
             name="org.eclipse.wildwebdeveloper.xml.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -183,6 +189,10 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-ide-java-developers</value>
+        </detail>
+        <detail
             key="shortcut">
           <value>Eclipse IDE for Java Developers - 2020-12</value>
         </detail>
@@ -192,13 +202,13 @@
           label="Eclipse IDE for Java Developers (2020-12)">
         <requirement
             name="epp.package.java"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.buildship.feature.group"/>
         <requirement
@@ -222,11 +232,13 @@
         <requirement
             name="org.eclipse.tips.feature.feature.group"/>
         <requirement
+            name="org.eclipse.tm.terminal.feature.feature.group"/>
+        <requirement
             name="org.eclipse.wildwebdeveloper.xml.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -1356,6 +1368,10 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-ide-enterprise-java-developers</value>
+        </detail>
+        <detail
             key="shortcut">
           <value>Eclipse IDE for Enterprise Java Developers - Latest</value>
         </detail>
@@ -1365,13 +1381,13 @@
           label="Eclipse IDE for Enterprise Java Developers (2020-12)">
         <requirement
             name="epp.package.jee"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.buildship.feature.group"/>
         <requirement
@@ -1535,9 +1551,9 @@
         <requirement
             name="org.eclipse.wst.xsl.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -1748,6 +1764,10 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-ide-enterprise-java-developers</value>
+        </detail>
+        <detail
             key="shortcut">
           <value>Eclipse IDE for Enterprise Java Developers - 2020-12</value>
         </detail>
@@ -1757,13 +1777,13 @@
           label="Eclipse IDE for Enterprise Java Developers (2020-12)">
         <requirement
             name="epp.package.jee"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.buildship.feature.group"/>
         <requirement
@@ -1927,9 +1947,9 @@
         <requirement
             name="org.eclipse.wst.xsl.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -4567,6 +4587,10 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-ide-cc-developers</value>
+        </detail>
+        <detail
             key="shortcut">
           <value>Eclipse IDE for C/C++ Developers - Latest</value>
         </detail>
@@ -4576,13 +4600,13 @@
           label="Eclipse IDE for C/C++ Developers (2020-12)">
         <requirement
             name="epp.package.cpp"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.cdt.autotools.feature.group"/>
         <requirement
@@ -4646,9 +4670,9 @@
         <requirement
             name="org.eclipse.tracecompass.lttng2.ust.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -4759,6 +4783,10 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-ide-cc-developers</value>
+        </detail>
+        <detail
             key="shortcut">
           <value>Eclipse IDE for C/C++ Developers - 2020-12</value>
         </detail>
@@ -4768,13 +4796,13 @@
           label="Eclipse IDE for C/C++ Developers (2020-12)">
         <requirement
             name="epp.package.cpp"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.cdt.autotools.feature.group"/>
         <requirement
@@ -4838,9 +4866,9 @@
         <requirement
             name="org.eclipse.tracecompass.lttng2.ust.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -6316,6 +6344,277 @@
     </version>
     <description>An IDE for C/C++ developers.</description>
   </product>
+  <product name="epp.package.embedcpp"
+      label="Eclipse IDE for Embedded C/C++ Developers">
+    <annotation
+        source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+      <detail
+          key="imageURI">
+        <value>http://www.eclipse.org/downloads/images/cdt.png</value>
+      </detail>
+      <detail
+          key="notificationTooltip">
+        <value>Donate to the Eclipse Community for the Eclipse IDE for Embedded C/C++ Developers</value>
+      </detail>
+    </annotation>
+    <version
+        name="latest"
+        label="Latest (2020-12)"
+        requiredJavaVersion="11">
+      <annotation
+          source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-ide-embedded-cc-developers</value>
+        </detail>
+        <detail
+            key="shortcut">
+          <value>Eclipse IDE for Embedded C/C++ Developers - Latest</value>
+        </detail>
+      </annotation>
+      <setupTask
+          xsi:type="setup.p2:P2Task"
+          label="Eclipse IDE for Embedded C/C++ Developers (2020-12)">
+        <requirement
+            name="epp.package.embedcpp"
+            versionRange="[4.18.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.platform.feature.group"
+            versionRange="[4.18.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.rcp.feature.group"
+            versionRange="[4.18.0,5.0.0)"/>
+        <requirement
+            name="ilg.gnumcueclipse.codered.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.debug.gdbjtag.jlink.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.debug.gdbjtag.jumper.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.debug.gdbjtag.openocd.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.debug.gdbjtag.pyocd.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.debug.gdbjtag.qemu.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.doc.user.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.managedbuild.cross.arm.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.managedbuild.cross.riscv.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.packs.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.templates.ad.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.templates.cortexm.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.templates.freescale.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.templates.sifive.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.templates.stm.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.autotools.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.build.crossgcc.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.cmake.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.debug.gdbjtag.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.debug.standalone.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.debug.ui.memory.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.docker.launcher.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.launch.remote.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.launch.serial.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.meson.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.qt.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.testsrunner.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.egit.feature.group"/>
+        <requirement
+            name="org.eclipse.epp.mpc.feature.group"/>
+        <requirement
+            name="org.eclipse.launchbar.feature.group"/>
+        <requirement
+            name="org.eclipse.launchbar.remote.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.cdt.libhover.devhelp.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.cdt.libhover.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.changelog.c.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.gcov.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.gprof.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.rpm.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.valgrind.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.wikitext_feature.feature.group"/>
+        <requirement
+            name="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.tm.terminal.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.tracecompass.gdbtrace.feature.group"/>
+        <requirement
+            name="org.eclipse.tracecompass.lttng2.control.feature.group"/>
+        <requirement
+            name="org.eclipse.tracecompass.lttng2.kernel.feature.group"/>
+        <requirement
+            name="org.eclipse.tracecompass.lttng2.ust.feature.group"/>
+        <repository
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
+        <repository
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
+          <annotation
+              source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
+        </repository>
+      </setupTask>
+    </version>
+    <version
+        name="2020-12"
+        label="2020-12"
+        requiredJavaVersion="11">
+      <annotation
+          source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-ide-embedded-cc-developers</value>
+        </detail>
+        <detail
+            key="shortcut">
+          <value>Eclipse IDE for Embedded C/C++ Developers - 2020-12</value>
+        </detail>
+      </annotation>
+      <setupTask
+          xsi:type="setup.p2:P2Task"
+          label="Eclipse IDE for Embedded C/C++ Developers (2020-12)">
+        <requirement
+            name="epp.package.embedcpp"
+            versionRange="[4.18.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.platform.feature.group"
+            versionRange="[4.18.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.rcp.feature.group"
+            versionRange="[4.18.0,5.0.0)"/>
+        <requirement
+            name="ilg.gnumcueclipse.codered.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.debug.gdbjtag.jlink.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.debug.gdbjtag.jumper.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.debug.gdbjtag.openocd.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.debug.gdbjtag.pyocd.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.debug.gdbjtag.qemu.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.doc.user.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.managedbuild.cross.arm.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.managedbuild.cross.riscv.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.packs.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.templates.ad.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.templates.cortexm.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.templates.freescale.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.templates.sifive.feature.feature.group"/>
+        <requirement
+            name="ilg.gnumcueclipse.templates.stm.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.autotools.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.build.crossgcc.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.cmake.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.debug.gdbjtag.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.debug.standalone.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.debug.ui.memory.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.docker.launcher.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.launch.remote.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.launch.serial.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.meson.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.qt.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.testsrunner.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.egit.feature.group"/>
+        <requirement
+            name="org.eclipse.epp.mpc.feature.group"/>
+        <requirement
+            name="org.eclipse.launchbar.feature.group"/>
+        <requirement
+            name="org.eclipse.launchbar.remote.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.cdt.libhover.devhelp.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.cdt.libhover.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.changelog.c.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.gcov.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.gprof.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.rpm.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.valgrind.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.wikitext_feature.feature.group"/>
+        <requirement
+            name="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.tm.terminal.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.tracecompass.gdbtrace.feature.group"/>
+        <requirement
+            name="org.eclipse.tracecompass.lttng2.control.feature.group"/>
+        <requirement
+            name="org.eclipse.tracecompass.lttng2.kernel.feature.group"/>
+        <requirement
+            name="org.eclipse.tracecompass.lttng2.ust.feature.group"/>
+        <repository
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
+        <repository
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
+          <annotation
+              source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
+        </repository>
+      </setupTask>
+    </version>
+    <description>An IDE for Embedded C/C++ developers.</description>
+  </product>
   <product name="epp.package.javascript"
       label="Eclipse IDE for Web and JavaScript Developers">
     <annotation
@@ -6336,6 +6635,10 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-ide-web-and-javascript-developers</value>
+        </detail>
+        <detail
             key="shortcut">
           <value>Eclipse IDE for Web and JavaScript Developers - Latest</value>
         </detail>
@@ -6345,13 +6648,13 @@
           label="Eclipse IDE for JavaScript and Web Developers (2020-12)">
         <requirement
             name="epp.package.javascript"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.egit.feature.group"/>
         <requirement
@@ -6381,9 +6684,9 @@
         <requirement
             name="org.eclipse.wst.server_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -6460,6 +6763,10 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-ide-web-and-javascript-developers</value>
+        </detail>
+        <detail
             key="shortcut">
           <value>Eclipse IDE for Web and JavaScript Developers - 2020-12</value>
         </detail>
@@ -6469,13 +6776,13 @@
           label="Eclipse IDE for JavaScript and Web Developers (2020-12)">
         <requirement
             name="epp.package.javascript"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.egit.feature.group"/>
         <requirement
@@ -6505,9 +6812,9 @@
         <requirement
             name="org.eclipse.wst.server_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -7485,6 +7792,10 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-ide-php-developers</value>
+        </detail>
+        <detail
             key="shortcut">
           <value>Eclipse IDE for PHP Developers - Latest</value>
         </detail>
@@ -7494,13 +7805,13 @@
           label="Eclipse IDE for PHP Developers (2020-12)">
         <requirement
             name="epp.package.php"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.egit.feature.group"/>
         <requirement
@@ -7540,9 +7851,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -7629,6 +7940,10 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-ide-php-developers</value>
+        </detail>
+        <detail
             key="shortcut">
           <value>Eclipse IDE for PHP Developers - 2020-12</value>
         </detail>
@@ -7638,13 +7953,13 @@
           label="Eclipse IDE for PHP Developers (2020-12)">
         <requirement
             name="epp.package.php"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.egit.feature.group"/>
         <requirement
@@ -7684,9 +7999,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -8708,6 +9023,10 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-ide-eclipse-committers</value>
+        </detail>
+        <detail
             key="shortcut">
           <value>Eclipse IDE for Eclipse Committers - Latest</value>
         </detail>
@@ -8717,13 +9036,13 @@
           label="Eclipse IDE for Eclipse Committers (2020-12)">
         <requirement
             name="epp.package.committers"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.buildship.feature.group"/>
         <requirement
@@ -8797,9 +9116,9 @@
         <requirement
             name="org.eclipse.wildwebdeveloper.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -8920,6 +9239,10 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-ide-eclipse-committers</value>
+        </detail>
+        <detail
             key="shortcut">
           <value>Eclipse IDE for Eclipse Committers - 2020-12</value>
         </detail>
@@ -8929,13 +9252,13 @@
           label="Eclipse IDE for Eclipse Committers (2020-12)">
         <requirement
             name="epp.package.committers"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.buildship.feature.group"/>
         <requirement
@@ -9009,9 +9332,9 @@
         <requirement
             name="org.eclipse.wildwebdeveloper.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -10446,6 +10769,10 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-ide-java-and-dsl-developers</value>
+        </detail>
+        <detail
             key="shortcut">
           <value>Eclipse IDE for Java and DSL Developers - Latest</value>
         </detail>
@@ -10455,13 +10782,13 @@
           label="Eclipse DSL Tools (2020-12)">
         <requirement
             name="epp.package.dsl"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.jdt.feature.group"
             versionRange="[3.18.0,4.0.0)"/>
@@ -10481,9 +10808,9 @@
         <requirement
             name="org.eclipse.xtext.sdk.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -10550,6 +10877,10 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-ide-java-and-dsl-developers</value>
+        </detail>
+        <detail
             key="shortcut">
           <value>Eclipse IDE for Java and DSL Developers - 2020-12</value>
         </detail>
@@ -10559,13 +10890,13 @@
           label="Eclipse DSL Tools (2020-12)">
         <requirement
             name="epp.package.dsl"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.jdt.feature.group"
             versionRange="[3.18.0,4.0.0)"/>
@@ -10585,9 +10916,9 @@
         <requirement
             name="org.eclipse.xtext.sdk.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -11491,6 +11822,10 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-modeling-tools</value>
+        </detail>
+        <detail
             key="shortcut">
           <value>Eclipse Modeling Tools - Latest</value>
         </detail>
@@ -11500,13 +11835,13 @@
           label="Eclipse Modeling Tools (2020-12)">
         <requirement
             name="epp.package.modeling"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.e4.core.tools.feature.feature.group"/>
         <requirement
@@ -11526,10 +11861,6 @@
         <requirement
             name="org.eclipse.emf.ecp.emfforms.sdk.feature.feature.group"/>
         <requirement
-            name="org.eclipse.emf.parsley.sdk.feature.group"/>
-        <requirement
-            name="org.eclipse.emf.parsley.sdk.source.feature.group"/>
-        <requirement
             name="org.eclipse.emf.query.sdk.feature.group"/>
         <requirement
             name="org.eclipse.emf.sdk.feature.group"/>
@@ -11560,9 +11891,9 @@
         <requirement
             name="org.eclipse.xsd.sdk.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -11663,6 +11994,10 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-modeling-tools</value>
+        </detail>
+        <detail
             key="shortcut">
           <value>Eclipse Modeling Tools - 2020-12</value>
         </detail>
@@ -11672,13 +12007,13 @@
           label="Eclipse Modeling Tools (2020-12)">
         <requirement
             name="epp.package.modeling"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.e4.core.tools.feature.feature.group"/>
         <requirement
@@ -11698,10 +12033,6 @@
         <requirement
             name="org.eclipse.emf.ecp.emfforms.sdk.feature.feature.group"/>
         <requirement
-            name="org.eclipse.emf.parsley.sdk.feature.group"/>
-        <requirement
-            name="org.eclipse.emf.parsley.sdk.source.feature.group"/>
-        <requirement
             name="org.eclipse.emf.query.sdk.feature.group"/>
         <requirement
             name="org.eclipse.emf.sdk.feature.group"/>
@@ -11732,9 +12063,9 @@
         <requirement
             name="org.eclipse.xsd.sdk.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -13194,6 +13525,10 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-ide-rcp-and-rap-developers</value>
+        </detail>
+        <detail
             key="shortcut">
           <value>Eclipse IDE for RCP and RAP Developers - Latest</value>
         </detail>
@@ -13203,13 +13538,13 @@
           label="Eclipse for RCP and RAP Developers (2020-12)">
         <requirement
             name="epp.package.rcp"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.jdt.feature.group"
             versionRange="[3.18.0,4.0.0)"/>
@@ -13247,9 +13582,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -13334,6 +13669,10 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-ide-rcp-and-rap-developers</value>
+        </detail>
+        <detail
             key="shortcut">
           <value>Eclipse IDE for RCP and RAP Developers - 2020-12</value>
         </detail>
@@ -13343,13 +13682,13 @@
           label="Eclipse for RCP and RAP Developers (2020-12)">
         <requirement
             name="epp.package.rcp"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.jdt.feature.group"
             versionRange="[3.18.0,4.0.0)"/>
@@ -13387,9 +13726,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -14669,6 +15008,10 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-ide-testers</value>
+        </detail>
+        <detail
             key="shortcut">
           <value>Eclipse IDE for Testers - Latest</value>
         </detail>
@@ -14678,13 +15021,13 @@
           label="Eclipse for Testers (2020-12)">
         <requirement
             name="epp.package.testing"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.epp.mpc.feature.group"/>
         <requirement
@@ -14692,9 +15035,9 @@
         <requirement
             name="org.eclipse.mylyn.wikitext_feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -14749,6 +15092,10 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-ide-testers</value>
+        </detail>
+        <detail
             key="shortcut">
           <value>Eclipse IDE for Testers - 2020-12</value>
         </detail>
@@ -14758,13 +15105,13 @@
           label="Eclipse for Testers (2020-12)">
         <requirement
             name="epp.package.testing"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.epp.mpc.feature.group"/>
         <requirement
@@ -14772,9 +15119,9 @@
         <requirement
             name="org.eclipse.mylyn.wikitext_feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -15592,6 +15939,10 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-ide-scientific-computing</value>
+        </detail>
+        <detail
             key="shortcut">
           <value>Eclipse IDE for Scientific Computing - Latest</value>
         </detail>
@@ -15601,13 +15952,13 @@
           label="Eclipse for Scientific Computing (2020-12)">
         <requirement
             name="epp.package.parallel"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.cdt.autotools.feature.group"/>
         <requirement
@@ -15651,9 +16002,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -15744,6 +16095,10 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-ide-scientific-computing</value>
+        </detail>
+        <detail
             key="shortcut">
           <value>Eclipse IDE for Scientific Computing - 2020-12</value>
         </detail>
@@ -15753,13 +16108,13 @@
           label="Eclipse for Scientific Computing (2020-12)">
         <requirement
             name="epp.package.parallel"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.cdt.autotools.feature.group"/>
         <requirement
@@ -15803,9 +16158,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -17127,6 +17482,10 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-ide-scout-developers</value>
+        </detail>
+        <detail
             key="shortcut">
           <value>Eclipse IDE for Scout Developers - Latest</value>
         </detail>
@@ -17136,13 +17495,13 @@
           label="Eclipse for Scout Developers (2020-12)">
         <requirement
             name="epp.package.scout"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.egit.feature.group"/>
         <requirement
@@ -17170,9 +17529,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -17247,6 +17606,10 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-ide-scout-developers</value>
+        </detail>
+        <detail
             key="shortcut">
           <value>Eclipse IDE for Scout Developers - 2020-12</value>
         </detail>
@@ -17256,13 +17619,13 @@
           label="Eclipse for Scout Developers (2020-12)">
         <requirement
             name="epp.package.scout"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.egit.feature.group"/>
         <requirement
@@ -17290,9 +17653,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -18398,6 +18761,10 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-ide-rust-developers</value>
+        </detail>
+        <detail
             key="shortcut">
           <value>Eclipse IDE for Rust Developers - Latest</value>
         </detail>
@@ -18407,13 +18774,13 @@
           label="Eclipse IDE for Rust Developers (2020-12)">
         <requirement
             name="epp.package.rust"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.corrosion.feature.feature.group"/>
         <requirement
@@ -18427,9 +18794,9 @@
         <requirement
             name="org.eclipse.tm.terminal.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -18490,6 +18857,10 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/M1/eclipse-ide-rust-developers</value>
+        </detail>
+        <detail
             key="shortcut">
           <value>Eclipse IDE for Rust Developers - 2020-12</value>
         </detail>
@@ -18499,13 +18870,13 @@
           label="Eclipse IDE for Rust Developers (2020-12)">
         <requirement
             name="epp.package.rust"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.corrosion.feature.feature.group"/>
         <requirement
@@ -18519,9 +18890,9 @@
         <requirement
             name="org.eclipse.tm.terminal.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2020-12"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202010151200"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -19196,15 +19567,15 @@
           label="Eclipse Platform (2020-12)">
         <requirement
             name="org.eclipse.platform.ide"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -19260,15 +19631,15 @@
           label="Eclipse Platform (2020-12)">
         <requirement
             name="org.eclipse.platform.ide"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.17.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <repository
-            url="http://download.eclipse.org/releases/2020-12">
+            url="http://download.eclipse.org/releases/2020-12/202010161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>