[Releng] Fix marketplace catalog generator to load one more page of
listings
diff --git a/plugins/org.eclipse.oomph.setup.installer/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.installer/META-INF/MANIFEST.MF
index c1ce453..90934e5 100644
--- a/plugins/org.eclipse.oomph.setup.installer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.installer/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.oomph.setup.installer;singleton:=true
-Bundle-Version: 1.16.0.qualifier
+Bundle-Version: 1.17.0.qualifier
Bundle-ClassPath: .
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
@@ -26,7 +26,7 @@
org.eclipse.oomph.ui;bundle-version="[1.13.0,2.0.0)",
org.eclipse.oomph.p2.ui;bundle-version="[1.13.0,2.0.0)",
org.eclipse.oomph.setup.p2;bundle-version="[1.14.0,2.0.0)",
- org.eclipse.oomph.setup.core;bundle-version="[1.16.0,2.0.0)",
+ org.eclipse.oomph.setup.core;bundle-version="[1.17.0,2.0.0)",
org.eclipse.oomph.jreinfo.ui;bundle-version="[1.11.0,2.0.0)",
org.eclipse.help;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui.net;bundle-version="[1.0.0,2.0.0)",
@@ -35,5 +35,5 @@
org.eclipse.equinox.security.ui;bundle-version="[1.1.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.oomph.setup.internal.installer;version="1.16.0";x-internal:=true
+Export-Package: org.eclipse.oomph.setup.internal.installer;version="1.17.0";x-internal:=true
Automatic-Module-Name: org.eclipse.oomph.setup.installer
diff --git a/plugins/org.eclipse.oomph.setup.installer/pom.xml b/plugins/org.eclipse.oomph.setup.installer/pom.xml
index 9fc23f1..c3ec076 100644
--- a/plugins/org.eclipse.oomph.setup.installer/pom.xml
+++ b/plugins/org.eclipse.oomph.setup.installer/pom.xml
@@ -20,7 +20,7 @@
</parent>
<groupId>org.eclipse.oomph</groupId>
<artifactId>org.eclipse.oomph.setup.installer</artifactId>
- <version>1.16.0-SNAPSHOT</version>
+ <version>1.17.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/MarketplaceCatalogGenerator.java b/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/MarketplaceCatalogGenerator.java
index f8c929d..bec92c5 100644
--- a/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/MarketplaceCatalogGenerator.java
+++ b/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/MarketplaceCatalogGenerator.java
@@ -312,6 +312,7 @@
platformVersions.put("platform.version=4.13", "2019-09");
platformVersions.put("platform.version=4.14", "2019-12");
platformVersions.put("platform.version=4.15", "2020-03");
+ // platformVersions.put("platform.version=4.16", "2020-06");
Set<URI> nodeQueryURIs = new LinkedHashSet<URI>();
{
@@ -336,6 +337,7 @@
Set<String> updateURLs = new LinkedHashSet<String>();
for (URI listingURI : nodeQueryURIs)
{
+ System.err.println("Loading: " + listingURI);
Resource listingResource = resourceSet.getResource(listingURI, true);
EList<EObject> contents = listingResource.getContents();
if (contents.isEmpty())