Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2021-03-11 16:36:11 -0500
committerAlexander Kurtakov2021-03-12 07:26:47 -0500
commit69d33e0c214174283c2f2ba371fec29ae0fe580b (patch)
tree9acd9de6324163205b305c87ddf401d449b902a0
parent840c90fb18b5a6b8dcb15bcb4fada21bd381d56d (diff)
downloadeclipse.platform.releng.aggregator-69d33e0c214174283c2f2ba371fec29ae0fe580b.tar.gz
eclipse.platform.releng.aggregator-69d33e0c214174283c2f2ba371fec29ae0fe580b.tar.xz
eclipse.platform.releng.aggregator-69d33e0c214174283c2f2ba371fec29ae0fe580b.zip
Bug 571240 - Remove additional mirroring in eclipse.platform.repository
Instead of manually mirroring emf and ecf features put them in the category.xml and let tycho handle it like everything else. Change-Id: I978237ee0a4d9d5648af37518ed1dc352cb16833 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml14
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml153
2 files changed, 14 insertions, 153 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
index b2067c1d2..e4eb6b5ef 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
@@ -20,6 +20,20 @@
<feature id="org.eclipse.tips.feature.source" version="0.0.0"/>
<feature id="org.eclipse.jdt.ui.unittest.junit.feature" version="0.0.0"/>
<feature id="org.eclipse.jdt.ui.unittest.junit.feature.source" version="0.0.0"/>
+ <feature id="org.eclipse.emf.common" version="0.0.0"/>
+ <feature id="org.eclipse.emf.ecore" version="0.0.0"/>
+ <feature id="org.eclipse.emf.common.source" version="0.0.0"/>
+ <feature id="org.eclipse.emf.ecore.source" version="0.0.0"/>
+ <feature id="org.eclipse.ecf.core.feature" version="0.0.0"/>
+ <feature id="org.eclipse.ecf.core.feature.source" version="0.0.0"/>
+ <feature id="org.eclipse.ecf.core.ssl.feature" version="0.0.0"/>
+ <feature id="org.eclipse.ecf.core.ssl.feature.source" version="0.0.0"/>
+ <feature id="org.eclipse.ecf.filetransfer.feature" version="0.0.0"/>
+ <feature id="org.eclipse.ecf.filetransfer.feature.source" version="0.0.0"/>
+ <feature id="org.eclipse.ecf.filetransfer.httpclient45.feature" version="0.0.0"/>
+ <feature id="org.eclipse.ecf.filetransfer.httpclient45.feature.source" version="0.0.0"/>
+ <feature id="org.eclipse.ecf.filetransfer.ssl.feature" version="0.0.0"/>
+ <feature id="org.eclipse.ecf.filetransfer.ssl.feature.source" version="0.0.0"/>
<bundle id="org.eclipse.jdt.core.compiler.batch" version="0.0.0"/>
<bundle id="org.eclipse.e4.ui.progress"/>
<bundle id="org.eclipse.e4.ui.progress.source"/>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml
index d21a62fbf..8d0b3cd5f 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml
@@ -177,160 +177,7 @@
<append>true</append>
</configuration>
</execution>
- <!-- We add emf features to our repo, since we "require" (not "include") them, but are
- required to build (or pull) against "just" the platform repository.
- We specify in a separate step than above because unlike the others, there are
- af few IUs, even the "base" repo, that we do not want.
- -->
- <execution>
- <id>mirror-build-emf</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>mirror</goal>
- </goals>
- <configuration>
- <source>
- <!-- source repositories to mirror from -->
- <repository>
- <url>${emf-repo.url}</url>
- <layout>p2</layout>
- <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
- </repository>
- </source>
- <!-- starting from here all configuration parameters are optional -->
- <!-- they are only shown here with default values for documentation purpose -->
- <!-- List of IUs to mirror. If omitted, allIUs will be mirrored. -->
- <!-- Omitted IU version element means latest version of the IU -->
- <ius>
- <iu>
- <id>org.eclipse.emf.common.feature.group</id>
- <version>2.22.0.v20210114-1734</version>
- </iu>
- <iu>
- <id>org.eclipse.emf.ecore.feature.group</id>
- <version>2.23.0.v20200630-0516</version>
- </iu>
- <iu>
- <id>org.eclipse.emf.common.source.feature.group</id>
- <version>2.22.0.v20210114-1734</version>
- </iu>
- <iu>
- <id>org.eclipse.emf.ecore.source.feature.group</id>
- <version>2.23.0.v20200630-0516</version>
- </iu>
- </ius>
- <!-- The destination directory to mirror to. -->
- <destination>${project.build.directory}/repository</destination>
- <!-- Whether only strict dependencies should be followed. -->
- <!-- "strict" means perfect version match -->
- <followStrictOnly>false</followStrictOnly>
- <!-- Whether or not to follow optional requirements. -->
- <includeOptional>false</includeOptional>
- <!-- Whether or not to follow non-greedy requirements. -->
- <includeNonGreedy>false</includeNonGreedy>
- <!-- Filter properties. E.g. filter only one platform -->
- <!-- Whether to filter the resulting set of IUs to only -->
- <!-- include the latest version of each IU -->
- <latestVersionOnly>true</latestVersionOnly>
- <!-- don't mirror artifacts, only metadata -->
- <mirrorMetadataOnly>false</mirrorMetadataOnly>
- <!-- whether to compress the content.xml/artifacts.xml -->
- <compress>true</compress>
- <!-- whether to append to the target repository content -->
- <append>true</append>
- </configuration>
- </execution>
- <!-- We add ecf features to our repo, since we "require" (not "include") them, but are
- required to build (or pull) against "just" the platform repository.
- We specify in a separate step than above because unlike the others, there are
- a few IUs that we do not want.
- TODO: write tool to specify exact version (for ECF and EMF) during mirroring,
- for safety.
- -->
- <execution>
- <id>mirror-build-ecf</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>mirror</goal>
- </goals>
- <configuration>
- <source>
- <!-- source repositories to mirror from -->
- <repository>
- <url>${ecf-repo.url}</url>
- <layout>p2</layout>
- <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
- </repository>
- </source>
- <!-- starting from here all configuration parameters are optional -->
- <!-- they are only shown here with default values for documentation purpose -->
- <!-- List of IUs to mirror. If omitted, allIUs will be mirrored. -->
- <!-- Omitted IU version element means latest version of the IU -->
- <ius>
- <iu>
- <id>org.eclipse.ecf.core.feature.feature.group</id>
- <version>1.5.701.v20201027-0550</version>
- </iu>
- <iu>
- <id>org.eclipse.ecf.core.feature.source.feature.group</id>
- <version>1.5.701.v20201027-0550</version>
- </iu>
- <iu>
- <id>org.eclipse.ecf.core.ssl.feature.feature.group</id>
- <version>1.1.500.v20200812-2314</version>
- </iu>
- <iu>
- <id>org.eclipse.ecf.core.ssl.feature.source.feature.group</id>
- <version>1.1.500.v20200812-2314</version>
- </iu>
- <iu>
- <id>org.eclipse.ecf.filetransfer.feature.feature.group</id>
- <version>3.14.1702.v20201025-2315</version>
- </iu>
- <iu>
- <id>org.eclipse.ecf.filetransfer.feature.source.feature.group</id>
- <version>3.14.1702.v20201025-2315</version>
- </iu>
- <iu>
- <id>org.eclipse.ecf.filetransfer.httpclient45.feature.feature.group</id>
- <version>1.0.702.v20201025-2303</version>
- </iu>
- <iu>
- <id>org.eclipse.ecf.filetransfer.httpclient45.feature.source.feature.group</id>
- <version>1.0.702.v20201025-2303</version>
- </iu>
- <iu>
- <id>org.eclipse.ecf.filetransfer.ssl.feature.feature.group</id>
- <version>1.1.400.v20200812-2314</version>
- </iu>
- <iu>
- <id>org.eclipse.ecf.filetransfer.ssl.feature.source.feature.group</id>
- <version>1.1.400.v20200812-2314</version>
- </iu>
-
- </ius>
- <!-- The destination directory to mirror to. -->
- <destination>${project.build.directory}/repository</destination>
- <!-- Whether only strict dependencies should be followed. -->
- <!-- "strict" means perfect version match -->
- <followStrictOnly>false</followStrictOnly>
- <!-- Whether or not to follow optional requirements. -->
- <includeOptional>false</includeOptional>
- <!-- Whether or not to follow non-greedy requirements. -->
- <includeNonGreedy>false</includeNonGreedy>
- <!-- Filter properties. E.g. filter only one platform -->
- <!-- Whether to filter the resulting set of IUs to only -->
- <!-- include the latest version of each IU -->
- <latestVersionOnly>true</latestVersionOnly>
- <!-- don't mirror artifacts, only metadata -->
- <mirrorMetadataOnly>false</mirrorMetadataOnly>
- <!-- whether to compress the content.xml/artifacts.xml -->
- <compress>true</compress>
- <!-- whether to append to the target repository content -->
- <append>true</append>
- </configuration>
- </execution>
<execution>
<id>mirror-org.eclipse.platform</id>
<phase>package</phase>

Back to the top