Skip to content

Commit

Permalink
[releng] Update Target platform
Browse files Browse the repository at this point in the history 
Update to eclipse 2023-03
Update to Sirius 7.2.0

Added "with source, requirements" in order to resolve all dependencies
Added eef 1.5

Update to Tycho 2.7.5 in pom

Removed emf-diffmerge-core from target platform, as it is already used in JenkinsFile

Change-Id: I20a039ae89ee3d1779e31c9dd1aad8be0b9792e7
Signed-off-by: Erwann Traisnel <erwann.traisnel@obeo.fr>
  • Loading branch information
@etraisnel2 @pdulth
etraisnel2 authored and pdulth committed May 4, 2023
1 parent 92a05db commit ca002e0
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 29 deletions.
2 changes: 1 addition & 1 deletion releng/org.eclipse.emf.diffmerge.coevolution.configuration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tycho.version>2.0.0</tycho.version>
<tycho.version>2.7.5</tycho.version>
<tycho.extras.version>${tycho.version}</tycho.extras.version>
</properties>

Expand Down
37 changes: 14 additions & 23 deletions ...ipse.emf.diffmerge.coevolution.target/org.eclipse.emf.diffmerge.coevolution.target.target
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="org.eclipse.emf.diffmerge.coevolution" sequenceNumber="1668695369">
<target name="org.eclipse.emf.diffmerge.coevolution" sequenceNumber="1683116767">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
<repository id="GMF-Notation-1.13.0" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913"/>
<repository id="GMF-Notation-1.13.1" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.gmf.runtime.thirdparty.feature.group" version="0.0.0"/>
<repository id="GMF-Runtime-1.14.2" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202204130739"/>
<repository id="GMF-Runtime-1.15.3" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202211041032/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
<repository location="https://download.eclipse.org/cbi/updates/license/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="com.google.guava" version="0.0.0"/>
<unit id="org.apache.log4j" version="0.0.0"/>
<unit id="org.apache.commons.lang" version="0.0.0"/>
Expand All @@ -37,25 +37,16 @@
<unit id="org.eclipse.emf.edit.feature.group" version="0.0.0"/>
<unit id="org.eclipse.gef.feature.group" version="0.0.0"/>
<unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2021-06"/>
<repository location="https://download.eclipse.org/releases/2023-03"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/sirius/updates/releases/7.0.4/2021-06"/>
<unit id="org.eclipse.sirius.specifier.ide.ui.feature.group" version="0.0.0"/>
<repository id="sirius" location="https://download.eclipse.org/sirius/updates/stable/7.2.0-S20230411-075209/2023-03"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.polarsys.kitalpha.ad.metadata.feature.feature.group" version="0.0.0"/>
<unit id="org.polarsys.kitalpha.cadence.feature.feature.group" version="0.0.0"/>
<unit id="org.polarsys.kitalpha.emde.feature.feature.group" version="0.0.0"/>
<unit id="org.polarsys.kitalpha.report.feature.feature.group" version="0.0.0"/>
<unit id="org.polarsys.kitalpha.transposer.feature.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/kitalpha/updates/releases/runtime/6.0.0/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.polarsys.capella.core.common.feature.feature.group" version="0.0.0"/>
<unit id="org.polarsys.capella.common.feature.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/capella/core/updates/releases/6.0.0/org.polarsys.capella.rcp.site/"/>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.eef.runtime" version="0.0.0"/>
<repository id="EEF-1.5" location="https://download.eclipse.org/modeling/emft/eef/updates/releases/1.5/R201601141612"/>
</location>
</locations>
</target>
21 changes: 16 additions & 5 deletions ...eclipse.emf.diffmerge.coevolution.target/org.eclipse.emf.diffmerge.coevolution.target.tpd
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
target "org.eclipse.emf.diffmerge.coevolution"
target "org.eclipse.emf.diffmerge.coevolution" with source, requirements

include "https://download.eclipse.org/sirius/updates/releases/7.0.4/2021-06/targets/modules/gmf-runtime-1.14.tpd"
location GMF-Notation-1.13.1 "https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334" {
org.eclipse.gmf.runtime.notation.sdk.feature.group lazy
}

location GMF-Runtime-1.15.3 "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202211041032/" {
org.eclipse.gmf.runtime.sdk.feature.group lazy
org.eclipse.gmf.runtime.thirdparty.feature.group lazy
}

location "https://download.eclipse.org/cbi/updates/license/" {
org.eclipse.license.feature.group [2.0.2.v20181016-2210,2.0.2.v20181016-2210]
}

location "https://download.eclipse.org/releases/2021-06" {
location "https://download.eclipse.org/releases/2023-03" {
com.google.guava lazy
org.apache.log4j lazy
org.apache.commons.lang lazy
Expand All @@ -29,7 +36,11 @@ location "https://download.eclipse.org/releases/2021-06" {
org.eclipse.uml2.sdk.feature.group lazy
}

location "https://download.eclipse.org/sirius/updates/releases/7.0.4/2021-06" {
location sirius "https://download.eclipse.org/sirius/updates/stable/7.2.0-S20230411-075209/2023-03" {
org.eclipse.sirius.specifier.feature.group lazy
org.eclipse.sirius.runtime.ide.ui.feature.group lazy
org.eclipse.sirius.specifier.ide.ui.feature.group lazy
}

location EEF-1.5 "https://download.eclipse.org/modeling/emft/eef/updates/releases/1.5/R201601141612" {
org.eclipse.emf.eef.runtime lazy
}

0 comments on commit ca002e0

Please sign in to comment.