Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMickael Istria2020-06-17 16:09:14 +0000
committerMickael Istria2020-08-21 07:52:57 +0000
commit42fd3720eb53a7deef71013279b9a6eb14185bc9 (patch)
treed185c402d570955bc5ac20805430c329617488ce
parent44af6d3a5b71b2bb78c715a8865bc405fdb5134b (diff)
downloadorg.eclipse.epp.packages-42fd3720eb53a7deef71013279b9a6eb14185bc9.tar.gz
org.eclipse.epp.packages-42fd3720eb53a7deef71013279b9a6eb14185bc9.tar.xz
org.eclipse.epp.packages-42fd3720eb53a7deef71013279b9a6eb14185bc9.zip
Bug 564390 - Directly reference Corrosion release repository
Corrosion plans to move out of SimRel Change-Id: I71208ed84e6ce92ff7c9314db2f97252c9d679c9 Signed-off-by: Mickael Istria <mistria@redhat.com>
-rw-r--r--archive-template/category.xml3
-rw-r--r--packages/org.eclipse.epp.package.rust.feature/p2.inf16
-rw-r--r--pom.xml7
-rw-r--r--releng/org.eclipse.epp.config/parent/pom.xml1
4 files changed, 13 insertions, 14 deletions
diff --git a/archive-template/category.xml b/archive-template/category.xml
index 3eb5bffb..a614acf8 100644
--- a/archive-template/category.xml
+++ b/archive-template/category.xml
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
+ <!-- This file covers the content of packages that are missing in SimRel,
+ so they get available in the EPP repo, so available for updates and installer -->
<feature id="org.eclipse.justj.openjdk.hotspot.jre.full" version="0.0.0"/>
+ <feature id="org.eclipse.corrosion.feature" version="0.0.0"/>
</site>
diff --git a/packages/org.eclipse.epp.package.rust.feature/p2.inf b/packages/org.eclipse.epp.package.rust.feature/p2.inf
index 1ff05eca..f080cd30 100644
--- a/packages/org.eclipse.epp.package.rust.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.rust.feature/p2.inf
@@ -6,16 +6,6 @@ requires.1.namespace=org.eclipse.equinox.p2.iu
requires.1.name=org.eclipse.platform.ide
requires.1.greedy=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.rust.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.addRepository(type:0,location:http${#58}//download.eclipse.org/corrosion/releases/latest,name:Eclipse Corrosion Latest Release,enabled:true);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/corrosion/releases/latest,name:Eclipse Corrosion Latest Release,enabled:true);
diff --git a/pom.xml b/pom.xml
index f4c8c23b..230ab147 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,6 +138,13 @@
<module>packages/org.eclipse.epp.package.rust.feature</module>
<module>packages/org.eclipse.epp.package.rust.product</module>
</modules>
+ <repositories>
+ <repository>
+ <id>corrosion</id>
+ <layout>p2</layout>
+ <url>https://download.eclipse.org/corrosion/releases/0.4.2/</url>
+ </repository>
+ </repositories>
</profile>
</profiles>
diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml
index 7140ce53..a1dc8e82 100644
--- a/releng/org.eclipse.epp.config/parent/pom.xml
+++ b/releng/org.eclipse.epp.config/parent/pom.xml
@@ -202,7 +202,6 @@
<extraArtifactRepositoryProperties>
<p2.statsURI>https://download.eclipse.org/stats/technology/epp/packages/${eclipse.simultaneous.release.id}/</p2.statsURI>
</extraArtifactRepositoryProperties>
- <includeAllDependencies>true</includeAllDependencies>
<compress>true</compress>
<!-- Mirror goal used to aggregate unit seem to ignore the .xz files so let's not generate them to avoid inconsistency between *.jar and *.xz -->
<xzCompress>false</xzCompress>

Back to the top