Update flatpak nightly products to 4.22 I-builds Change-Id: I2a52345c7af71c759c97477c283c2a433fbde29e Reviewed-on: https://git.eclipse.org/r/c/linuxtools/org.eclipse.linuxtools.eclipse-build/+/185763 Tested-by: Alexander Kurtakov <akurtako@redhat.com> Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/flatpak/eclipse-extra-prereqs/eclipse-extra-prereqs.target b/flatpak/eclipse-extra-prereqs/eclipse-extra-prereqs.target index 540c406..7b37962 100644 --- a/flatpak/eclipse-extra-prereqs/eclipse-extra-prereqs.target +++ b/flatpak/eclipse-extra-prereqs/eclipse-extra-prereqs.target
@@ -2,21 +2,21 @@ <locations> <!-- Marketplace Client --> <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit"> - <unit id="org.eclipse.epp.mpc.feature.group" version="1.9.1.v20210204-1408"/> - <unit id="org.eclipse.epp.mpc.source.feature.group" version="1.9.1.v20210204-1408"/> - <repository location="https://download.eclipse.org/mpc/drops/1.9.1/v20210204-1408/"/> + <unit id="org.eclipse.epp.mpc.feature.group" version="1.9.2.v20210826-0851"/> + <unit id="org.eclipse.epp.mpc.source.feature.group" version="1.9.2.v20210826-0851"/> + <repository location="https://download.eclipse.org/mpc/drops/1.9.2/v20210826-0851/"/> </location> <!-- Deps of Marketplace Client --> <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit"> - <unit id="org.eclipse.userstorage.feature.group" version="1.2.0.v20191120-1614"/> - <unit id="org.eclipse.userstorage.sdk.feature.group" version="1.2.0.v20191120-1614"/> - <repository location="https://download.eclipse.org/usssdk/drops/release/1.2.1"/> + <unit id="org.eclipse.userstorage.feature.group" version="1.2.0.v20210517-0327"/> + <unit id="org.eclipse.userstorage.sdk.feature.group" version="1.2.0.v20210518-1310"/> + <repository location="https://download.eclipse.org/usssdk/drops/release/1.2.2"/> </location> <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit"> - <unit id="org.eclipse.justj.openjdk.hotspot.jre.full.feature.group" version="16.0.1.v20210528-1205"/> - <repository location="https://download.eclipse.org/justj/jres/16/updates/release/16.0.1"/> + <unit id="org.eclipse.justj.openjdk.hotspot.jre.full.feature.group" version="16.0.2.v20210721-1149"/> + <repository location="https://download.eclipse.org/justj/jres/16/updates/release/16.0.2"/> </location> </locations> </target>
diff --git a/flatpak/eclipse-extra-prereqs/pom.xml b/flatpak/eclipse-extra-prereqs/pom.xml index 765d946..29418df 100644 --- a/flatpak/eclipse-extra-prereqs/pom.xml +++ b/flatpak/eclipse-extra-prereqs/pom.xml
@@ -7,7 +7,7 @@ <parent> <groupId>org.eclipse</groupId> <artifactId>eclipse-flatpak-parent</artifactId> - <version>4.21.0-SNAPSHOT</version> + <version>4.22.0-SNAPSHOT</version> </parent> <artifactId>eclipse-extra-prereqs</artifactId>
diff --git a/flatpak/platform/platform.p2.inf b/flatpak/platform/platform.p2.inf index e795275..e2edf0a 100644 --- a/flatpak/platform/platform.p2.inf +++ b/flatpak/platform/platform.p2.inf
@@ -1,8 +1,8 @@ instructions.configure=\ -addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.21,name:The Eclipse Project Updates);\ -addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.21,name:The Eclipse Project Updates);\ -addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2021-09,name:2021-09);\ -addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2021-09,name:2021-09);\ +addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.22,name:The Eclipse Project Updates);\ +addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.22,name:The Eclipse Project Updates);\ +addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2021-12,name:2021-12);\ +addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2021-12,name:2021-12);\ mkdir(path:${installFolder}/dropins); requires.1.namespace=org.eclipse.equinox.p2.iu requires.1.name=toolingorg.eclipse.platform.configuration.macosx @@ -51,7 +51,7 @@ properties.0.value = true properties.1.name = org.eclipse.equinox.p2.description -properties.1.value = 4.21 Release of the Eclipse Platform. +properties.1.value = 4.22 Release of the Eclipse Platform. properties.2.name = org.eclipse.equinox.p2.provider properties.2.value = Eclipse.org
diff --git a/flatpak/platform/platform.product b/flatpak/platform/platform.product index d61b2ab..cb29606 100644 --- a/flatpak/platform/platform.product +++ b/flatpak/platform/platform.product
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="Eclipse Platform" uid="org.eclipse.platform.ide" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.21.0.qualifier" useFeatures="true" includeLaunchers="true"> +<product name="Eclipse Platform" uid="org.eclipse.platform.ide" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.22.0.qualifier" useFeatures="true" includeLaunchers="true"> <configIni use="default"> </configIni> @@ -68,7 +68,7 @@ include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features"). - Each Plug-in or Fragment may be packaged as a sub-directory or JAR - (Java™ ARchive) in a directory named "plugins". + (Java™ ARchive) in a directory named "plugins". - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may
diff --git a/flatpak/platform/pom.xml b/flatpak/platform/pom.xml index 460cfee..9e7483c 100644 --- a/flatpak/platform/pom.xml +++ b/flatpak/platform/pom.xml
@@ -7,7 +7,7 @@ <parent> <groupId>org.eclipse</groupId> <artifactId>eclipse-flatpak-parent</artifactId> - <version>4.21.0-SNAPSHOT</version> + <version>4.22.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.platform.ide</artifactId>
diff --git a/flatpak/pom-aggregator.xml b/flatpak/pom-aggregator.xml index 6996072..4b38bf4 100644 --- a/flatpak/pom-aggregator.xml +++ b/flatpak/pom-aggregator.xml
@@ -5,7 +5,7 @@ <groupId>org.eclipse</groupId> <artifactId>platform-flatpak-aggregator</artifactId> - <version>4.21.0-SNAPSHOT</version> + <version>4.22.0-SNAPSHOT</version> <packaging>pom</packaging> <modules>
diff --git a/flatpak/pom.xml b/flatpak/pom.xml index 99b0ce8..d633772 100644 --- a/flatpak/pom.xml +++ b/flatpak/pom.xml
@@ -7,7 +7,7 @@ <parent> <groupId>org.eclipse</groupId> <artifactId>eclipse-platform-parent</artifactId> - <version>4.21.0-SNAPSHOT</version> + <version>4.22.0-SNAPSHOT</version> </parent> <groupId>org.eclipse</groupId>
diff --git a/flatpak/sdk/pom.xml b/flatpak/sdk/pom.xml index 79fca1b..b182966 100644 --- a/flatpak/sdk/pom.xml +++ b/flatpak/sdk/pom.xml
@@ -7,7 +7,7 @@ <parent> <groupId>org.eclipse</groupId> <artifactId>eclipse-flatpak-parent</artifactId> - <version>4.21.0-SNAPSHOT</version> + <version>4.22.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.sdk.ide</artifactId>
diff --git a/flatpak/sdk/sdk.p2.inf b/flatpak/sdk/sdk.p2.inf index 4972999..636f3c3 100644 --- a/flatpak/sdk/sdk.p2.inf +++ b/flatpak/sdk/sdk.p2.inf
@@ -1,8 +1,8 @@ instructions.configure=\ -addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.21,name:The Eclipse Project Updates);\ -addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.21,name:The Eclipse Project Updates);\ -addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2021-09,name:2021-09);\ -addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2021-09,name:2021-09);\ +addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/4.22,name:The Eclipse Project Updates);\ +addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/4.22,name:The Eclipse Project Updates);\ +addRepository(type:0,location:http${#58}//download.eclipse.org/releases/2021-12,name:2021-12);\ +addRepository(type:1,location:http${#58}//download.eclipse.org/releases/2021-12,name:2021-12);\ mkdir(path:${installFolder}/dropins); requires.1.namespace=org.eclipse.equinox.p2.iu requires.1.name=toolingorg.eclipse.sdk.configuration.macosx @@ -49,7 +49,7 @@ properties.0.value = true properties.1.name = org.eclipse.equinox.p2.description -properties.1.value = 4.21 Release of the Eclipse SDK. +properties.1.value = 4.22 Release of the Eclipse SDK. properties.2.name = org.eclipse.equinox.p2.provider properties.2.value = Eclipse.org
diff --git a/flatpak/sdk/sdk.product b/flatpak/sdk/sdk.product index 519b7c0..3036e7c 100644 --- a/flatpak/sdk/sdk.product +++ b/flatpak/sdk/sdk.product
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="Eclipse SDK" uid="org.eclipse.sdk.ide" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="4.21.0.qualifier" useFeatures="true" includeLaunchers="true"> +<product name="Eclipse SDK" uid="org.eclipse.sdk.ide" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="4.22.0.qualifier" useFeatures="true" includeLaunchers="true"> <configIni use="default"> </configIni> @@ -68,7 +68,7 @@ include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features"). - Each Plug-in or Fragment may be packaged as a sub-directory or JAR - (Java™ ARchive) in a directory named "plugins". + (Java™ ARchive) in a directory named "plugins". - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may @@ -198,9 +198,9 @@ <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" /> <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" /> <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" /> - <property name="osgi.bundles.defaultStartLevel" value="4" /> - <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" /> <property name="org.eclipse.update.reconcile" value="false" /> + <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" /> + <property name="osgi.bundles.defaultStartLevel" value="4" /> </configurations> </product>