Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Le Menez2021-07-22 09:01:23 -0400
committerQuentin Le Menez2021-07-22 09:02:50 -0400
commit551f6714687eba0de4e8f7fc0ada15f32a67e46a (patch)
treef83b708101a4b5dce8e4a45a554f96400dd1c0ef
parenta62e5240d90994dc14d45b4f586d648d9aa770a4 (diff)
downloadorg.eclipse.papyrus-bugs/5.2.0_releng.tar.gz
org.eclipse.papyrus-bugs/5.2.0_releng.tar.xz
org.eclipse.papyrus-bugs/5.2.0_releng.zip
Bug 572017 - [Releng] Update dependencies and releng platformbugs/5.2.0_releng
- Update releng platform to the latest dependencies - Add XWT dependency to the infra.ui feature - Rewire jboss p2 links to feed the XWT update site to the p2 installer Change-Id: I2458908d66f8080517a35213ecf11e06500e5804 Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
-rw-r--r--features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml4
-rw-r--r--releng/main/site/pom.xml37
-rwxr-xr-xreleng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target38
-rwxr-xr-xreleng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.tpd6
4 files changed, 63 insertions, 22 deletions
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml
index 6d5478ca634..c2a0c97585b 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.ui.feature/feature.xml
@@ -19,6 +19,10 @@
%license
</license>
+ <requires>
+ <import feature="org.eclipse.xwt.feature" version="1.6.0" match="greaterOrEqual"/>
+ </requires>
+
<plugin
id="org.eclipse.papyrus.infra.ui"
download-size="0"
diff --git a/releng/main/site/pom.xml b/releng/main/site/pom.xml
index 5b883999123..68547cde516 100644
--- a/releng/main/site/pom.xml
+++ b/releng/main/site/pom.xml
@@ -14,6 +14,17 @@
<version>5.2.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
+ <properties>
+ <jboss.utils.version>1.7.0</jboss.utils.version>
+ </properties>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>org.jboss.tools.tycho-plugins</id>
+ <url>https://repository.jboss.org/</url>
+ </pluginRepository>
+ </pluginRepositories>
+
<build>
<plugins>
<plugin>
@@ -24,6 +35,32 @@
<includePackedArtifacts>true</includePackedArtifacts>
</configuration>
</plugin>
+
+ <!-- workaround https://bugs.eclipse.org/bugs/show_bug.cgi?id=453708 -->
+ <plugin>
+ <groupId>org.jboss.tools.tycho-plugins</groupId>
+ <artifactId>repository-utils</artifactId>
+ <version>${jboss.utils.version}</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>generate-repository-facade</goal>
+ </goals>
+ <configuration>
+ <!-- do not generate the pesky web folder and index.html -->
+ <skipWebContentGeneration>true</skipWebContentGeneration>
+ <!-- p2 update site transitive dependencies repositories -->
+ <associateSites>
+ <!-- Oxygen orbit bundles for batik 1.6.0 -->
+ <site>https://download.eclipse.org/tools/orbit/downloads/drops/R20180206163158/repository/</site>
+ <!-- XWT 1.7.0-S updatesite, remove when train has been rewired -->
+ <site>https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/</site>
+ </associateSites>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target b/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target
index 0548f903a98..bd5eea245ad 100755
--- a/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target
+++ b/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus Releng" sequenceNumber="1615974669">
+<target name="Papyrus Releng" sequenceNumber="1626956247">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -30,11 +30,11 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/>
- <repository id="xwt" location="https://download.eclipse.org/xwt/milestones-1.6.0/1.6.0-M2/"/>
+ <repository id="xwt" location="https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.3.v20210309-1855"/>
- <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.3"/>
+ <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.4.v20210609-1727"/>
+ <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.4"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/>
@@ -43,16 +43,16 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.2.v20210228-1829"/>
- <repository id="uml" location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5milestones"/>
+ <repository id="uml" location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.sdk.feature.group" version="4.19.0.v20210303-1800"/>
- <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.19/R-4.19-202103031800/"/>
+ <unit id="org.eclipse.sdk.feature.group" version="4.20.0.v20210611-1636"/>
+ <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.20/R-4.20-202106111600/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.14.0.v20210310-0557"/>
- <unit id="org.eclipse.ocl.examples.feature.group" version="6.14.0.v20210310-0557"/>
- <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.14.0"/>
+ <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.15.0.v20210609-1442"/>
+ <unit id="org.eclipse.ocl.examples.feature.group" version="6.15.0.v20210609-1442"/>
+ <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.15.0"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="2.25.0.v20210301-1429"/>
@@ -68,7 +68,7 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
- <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.21.0/R-3.21.0-20210304100654/repository/"/>
+ <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.22.0/S-3.22.0.RC3a-20210612170523/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.13.0.202004160913"/>
@@ -79,8 +79,8 @@
<repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.sdk.feature.group" version="2.25.0.v20210114-1734"/>
- <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.25"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="2.26.0.v20210506-1425"/>
+ <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.26"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/>
@@ -117,21 +117,21 @@
<unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.13.0.v20200624-1156"/>
<unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.13.0.v20200624-1156"/>
<unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.13.0.v20200624-1156"/>
- <unit id="org.eclipse.oomph.targlets.feature.group" version="1.17.0.v20201231-0755"/>
+ <unit id="org.eclipse.oomph.targlets.feature.group" version="1.18.0.v20210427-0659"/>
<unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.17.0.v20210221-1019"/>
<unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.14.0.v20200624-1156"/>
<unit id="org.eclipse.oomph.setup.git.feature.group" version="1.18.0.v20200624-1156"/>
<unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.14.0.v20200624-1156"/>
- <unit id="org.eclipse.oomph.p2.feature.group" version="1.18.0.v20201231-0755"/>
- <unit id="org.eclipse.oomph.setup.feature.group" version="1.20.0.v20210223-0655"/>
+ <unit id="org.eclipse.oomph.p2.feature.group" version="1.19.0.v20210428-0629"/>
+ <unit id="org.eclipse.oomph.setup.feature.group" version="1.21.0.v20210601-0619"/>
<unit id="org.eclipse.oomph.preferences.feature.group" version="1.13.0.v20200624-1156"/>
- <repository id="oomph" location="https://download.eclipse.org/oomph/drops/release/1.20.0-a"/>
+ <repository id="oomph" location="https://download.eclipse.org/oomph/drops/release/1.21.0"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <repository id="egit" location="https://download.eclipse.org/egit/updates-5.11"/>
+ <repository id="egit" location="https://download.eclipse.org/egit/updates-5.12"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <repository id="m2e" location="https://download.eclipse.org/technology/m2e/releases/1.17.2/"/>
+ <repository id="m2e" location="https://download.eclipse.org/technology/m2e/releases/1.18.0/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<repository id="mylyn" location="https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956"/>
diff --git a/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.tpd b/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.tpd
index 4a808202c67..a5e0ec4907c 100755
--- a/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.tpd
+++ b/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.tpd
@@ -1,5 +1,5 @@
target "Papyrus Releng" with requirements source
-include "../../main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd"
-include "../../toolsmiths/targetPlatform/portable/org.eclipse.papyrus.toolsmiths.portable.targetplatform.tpd"
-include "../../tests/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.tpd" \ No newline at end of file
+include "../../main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd"
+include "../../toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.tpd"
+include "../../tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.tpd" \ No newline at end of file

Back to the top