Skip to content

Commit

Permalink
#23 Migrate to 2021-06
Browse files Browse the repository at this point in the history
Tycho 2.0.0 => Tycho 2.2.0
Add explicit executionEnvironment
Update deployment script
Update TP to use 6.0.0 stable

Change-Id: Iee1a271504e3f544fe1b7a2b66801e6ebb8d67ca
  • Loading branch information
arnauddieumegard committed Dec 21, 2021
1 parent cab7d85 commit 707c64d
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 45 deletions.
25 changes: 15 additions & 10 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,21 @@ pipeline {
}
steps {
sshagent ( ['projects-storage.eclipse.org-bot-ssh']) {
sh '''
echo "deploy update site"
DST_DIR=/home/data/httpd/download.eclipse.org/kitalpha/addons/introspector/nightly/master
ssh [email protected] rm -rf ${DST_DIR}
ssh [email protected] mkdir -p ${DST_DIR}
ssh [email protected] mkdir -p ${DST_DIR}/updates/
ssh [email protected] mkdir -p ${DST_DIR}/dropins/
scp -r releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.all.site/target/repository/* [email protected]:${DST_DIR}/updates/
scp -r releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.all.site/target/PDTTooling_All-dropins-*.zip [email protected]:${DST_DIR}/dropins/
'''
script {
def VERSION = BRANCH_NAME
if (VERSION.matches("v\\d\\.\\d\\.x")) {
VERSION = VERSION.substring(1)
}
sh "echo 'deploy update site'"
def DST_DIR='/home/data/httpd/download.eclipse.org/kitalpha/addons/introspector/nightly/'+VERSION

sh "ssh [email protected] rm -rf ${DST_DIR}"
sh "ssh [email protected] mkdir -p ${DST_DIR}"
sh "ssh [email protected] mkdir -p ${DST_DIR}/updates/"
sh "ssh [email protected] mkdir -p ${DST_DIR}/dropins/"
sh "scp -r releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.all.site/target/repository/* [email protected]:${DST_DIR}/updates/"
sh "scp -r releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.all.site/target/PDTTooling_All-dropins-*.zip [email protected]:${DST_DIR}/dropins/"
}
}
}
}
Expand Down
9 changes: 5 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<packaging>pom</packaging>

<properties>
<tycho-version>2.0.0</tycho-version>
<tycho-extras-version>2.0.0</tycho-extras-version>
<tycho-version>2.2.0</tycho-version>
<tycho-extras-version>2.2.0</tycho-extras-version>
<tycho.scmUrl>scm:git:https://github.com/eclipse/kitalpha-addons.git/</tycho.scmUrl>
<antrun-version>1.8</antrun-version>
<jacoco-version>0.8.6</jacoco-version>
Expand All @@ -33,7 +33,7 @@
<tycho.testArgLine>-Xms256m -Xmx1024m</tycho.testArgLine>

<!-- for packaging -->
<platform-name>2019-06</platform-name>
<platform-name>2021-06</platform-name>
<eclipse-repo.url>http://download.eclipse.org/releases/${platform-name}</eclipse-repo.url>
<packagedAddonName>PDTTooling</packagedAddonName>
</properties>
Expand Down Expand Up @@ -125,6 +125,7 @@
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
<executionEnvironment>JavaSE-14</executionEnvironment>
<target>
<artifact>
<groupId>org.polarsys</groupId>
Expand Down Expand Up @@ -238,7 +239,7 @@
<artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho-extras-version}</version>
<configuration>
<executionEnvironment>JavaSE-1.8</executionEnvironment>
<executionEnvironment>JavaSE-14</executionEnvironment>
<repositories>
<repository>
<id>eclipse-releases-${platform-name}</id>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="introspector" sequenceNumber="1623830823">
<target name="introspector" sequenceNumber="1633339907">
<locations>
<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"/>
</location>
<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.0" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202107090702/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.m2e.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
Expand All @@ -13,10 +22,6 @@
<unit id="org.eclipse.emf.validation.ocl" version="0.0.0"/>
<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.transaction.doc.feature.group" version="0.0.0"/>
<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.gmf.examples.runtime.feature.group" version="0.0.0"/>
<unit id="org.eclipse.gmf.examples.runtime.ui.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.gef.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ui.ide" version="0.0.0"/>
<unit id="org.eclipse.ui.workbench" version="0.0.0"/>
Expand Down Expand Up @@ -44,13 +49,6 @@
<unit id="org.eclipse.equinox.p2.rcp.feature.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.p2.user.ui.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.gef.source" version="0.0.0"/>
<unit id="org.eclipse.gmf.examples.runtime" version="0.0.0"/>
<unit id="org.eclipse.gmf.examples.runtime.ui.pde" version="0.0.0"/>
<unit id="org.eclipse.gmf.runtime.notation.sdk" version="0.0.0"/>
<unit id="org.eclipse.gmf.runtime.notation.source" version="0.0.0"/>
<unit id="org.eclipse.gmf.runtime.sdk" version="0.0.0"/>
<unit id="org.eclipse.gmf.runtime.thirdparty.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.gmf.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.help.source" version="0.0.0"/>
<unit id="org.eclipse.jdt.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jgit" version="0.0.0"/>
Expand Down Expand Up @@ -78,10 +76,10 @@
<unit id="org.eclipse.emf.ecoretools.design.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.cdo.feature.group" version="0.0.0"/>
<repository id="eclipse-release" location="https://download.eclipse.org/releases/2020-06/"/>
<unit id="org.eclipse.collections.feature.source.feature.group" version="0.0.0"/>
<repository id="Eclipse-2021-06" location="https://download.eclipse.org/releases/2021-06/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.acceleo.feature.group" version="3.7.11.202102190929"/>
<unit id="org.eclipse.acceleo.source.feature.group" version="3.7.11.202102190929"/>
<unit id="org.eclipse.acceleo.doc" version="3.7.11.202102190929"/>
<repository id="acceleo" location="https://download.eclipse.org/acceleo/updates/releases/3.7/"/>
Expand Down Expand Up @@ -114,7 +112,7 @@
<unit id="org.eclipse.sirius.samples.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sirius.specifier.properties.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
<repository id="sirius" location="https://download.eclipse.org/sirius/updates/releases/6.5.1/2020-06/"/>
<repository id="sirius" location="https://download.eclipse.org/sirius/updates/stable/7.0.0-S20210908-102403/2021-06/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.diffmerge.feature.feature.group" version="0.0.0"/>
Expand All @@ -125,19 +123,19 @@
<unit id="org.eclipse.emf.diffmerge.gmf.feature.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.diffmerge.egit.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.diffmerge.egit.feature.source.feature.group" version="0.0.0"/>
<repository id="EMF-DiffMerge" location="https://download.eclipse.org/diffmerge/stable/0.13.1-M3/emf-diffmerge-site/"/>
<repository id="EMF-DiffMerge" location="https://download.eclipse.org/diffmerge/stable/0.14.0-S20210823/emf-diffmerge-site/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.diffmerge.patterns.sdk.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.diffmerge.patterns.sdk.feature.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.diffmerge.patterns.sirius.sdk.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.diffmerge.patterns.sirius.sdk.feature.source.feature.group" version="0.0.0"/>
<repository id="EDM-Patterns" location="https://download.eclipse.org/diffmerge/stable/0.13.1-M3/edm-patterns-site/"/>
<repository id="EDM-Patterns" location="https://download.eclipse.org/diffmerge/stable/0.14.0-S20210823/edm-patterns-site/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.diffmerge.coevolution.sdk.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.diffmerge.coevolution.sdk.feature.source.feature.group" version="0.0.0"/>
<repository id="coevolution" location="https://download.eclipse.org/diffmerge/stable/0.13.1-M3/edm-coevolution-site/"/>
<repository id="coevolution" location="https://download.eclipse.org/diffmerge/stable/0.14.0-S20210823/edm-coevolution-site/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.amalgam.explorer.activity.feature.group" version="0.0.0"/>
Expand All @@ -148,7 +146,7 @@
<unit id="org.eclipse.amalgam.explorer.contextual.sirius.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.amalgam.explorer.contextual.core.feature.group" version="0.0.0"/>
<unit id="org.eclipse.amalgam.explorer.contextual.core.source.feature.group" version="0.0.0"/>
<repository id="amalgam" location="https://download.eclipse.org/modeling/amalgam/updates/stable/1.12.1-S20210330/capella"/>
<repository id="amalgam" location="https://download.eclipse.org/modeling/amalgam/updates/stable/1.13.0-S20210824/capella"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.egf.sdk.feature.feature.group" version="0.0.0"/>
Expand All @@ -158,26 +156,28 @@
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.nebula.widgets.tablecombo.feature.feature.group" version="0.0.0"/>
<repository id="Nebula" location="https://download.eclipse.org/nebula/releases/1.4.0/"/>
<repository id="Nebula" location="https://download.eclipse.org/nebula/releases/2.3.0/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="0.0.0"/>
<repository id="Nattable" location="https://download.eclipse.org/nattable/releases/1.5.0/repository/"/>
<repository id="Nattable" location="https://download.eclipse.org/nattable/releases/2.0.1/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="ca.odell.glazedlists" version="0.0.0"/>
<repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20180206163158/repository"/>
<unit id="org.apache.batik.bridge.source" version="0.0.0"/>
<unit id="org.apache.batik.script.source" version="0.0.0"/>
<repository id="Orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.polarsys.kitalpha.runtime.feature.feature.group" version="0.0.0"/>
<unit id="org.polarsys.kitalpha.runtime.feature.source.feature.group" version="0.0.0"/>
<repository id="kitalpha-runtime" location="https://download.eclipse.org/kitalpha/updates/release/runtime/5.1.0/"/>
<repository id="kitalpha-runtime" location="https://download.eclipse.org/kitalpha/updates/stable/runtime/6.0.0-S202109200942/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.polarsys.kitalpha.common.feature.feature.group" version="0.0.0"/>
<unit id="org.polarsys.kitalpha.common.feature.source.feature.group" version="0.0.0"/>
<repository id="kitalpha-runtimeCore" location="https://download.eclipse.org/kitalpha/updates/release/runtimecore/5.1.0/"/>
<repository id="kitalpha-runtimeCore" location="https://download.eclipse.org/kitalpha/updates/stable/runtimecore/6.0.0-S202109200942/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.polarsys.kitalpha.ad.viewpoint.dsl.generation.feature.feature.group" version="0.0.0"/>
Expand Down Expand Up @@ -290,7 +290,7 @@
<unit id="org.polarsys.kitalpha.richtext.widget.doc.feature.feature.group" version="0.0.0"/>
<unit id="org.polarsys.kitalpha.richtext.widget.feature.feature.group" version="0.0.0"/>
<unit id="org.polarsys.kitalpha.richtext.widget.ext.feature.feature.group" version="0.0.0"/>
<repository id="Kitalpha-SDK" location="https://download.eclipse.org/kitalpha/updates/release/sdk/5.1.0/"/>
<repository id="Kitalpha-SDK" location="https://download.eclipse.org/kitalpha/updates/stable/sdk/6.0.0-S202109200942/"/>
</location>
</locations>
</target>
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@

target "introspector" with source, requirements

include "https://raw.githubusercontent.com/eclipse/kitalpha/master/releng/plugins/org.polarsys.kitalpha.releng.targets/kitalpha.targetplatform"
include "https://raw.githubusercontent.com/arnauddieumegard/kitalpha/master-6.0/releng/plugins/org.polarsys.kitalpha.releng.targets/kitalpha.targetplatform"

//kitalpha core
location kitalpha-runtime "https://download.eclipse.org/kitalpha/updates/release/runtime/5.1.0/" {
location kitalpha-runtime "https://download.eclipse.org/kitalpha/updates/stable/runtime/6.0.0-S202109200942/" {
org.polarsys.kitalpha.runtime.feature.feature.group lazy
org.polarsys.kitalpha.runtime.feature.source.feature.group lazy
}

location kitalpha-runtimeCore "https://download.eclipse.org/kitalpha/updates/release/runtimecore/5.1.0/" {
location kitalpha-runtimeCore "https://download.eclipse.org/kitalpha/updates/stable/runtimecore/6.0.0-S202109200942/" {
org.polarsys.kitalpha.common.feature.feature.group lazy
org.polarsys.kitalpha.common.feature.source.feature.group lazy
}

//kitalpha
location Kitalpha-SDK "https://download.eclipse.org/kitalpha/updates/release/sdk/5.1.0/" {
location Kitalpha-SDK "https://download.eclipse.org/kitalpha/updates/stable/sdk/6.0.0-S202109200942/" {
org.polarsys.kitalpha.ad.viewpoint.dsl.generation.feature.feature.group lazy
org.polarsys.kitalpha.ad.viewpoint.dsl.generation.feature.source.feature.group lazy
org.polarsys.kitalpha.ad.viewpoint.dsl.as.feature.feature.group lazy
Expand Down
2 changes: 0 additions & 2 deletions releng/org.polarsys.kitalpha.pdt.introspector.targets/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@
</licenses>

<properties>
<tycho-version>2.0.0</tycho-version>
<tycho-extras-version>${tycho-version}</tycho-extras-version>
<platform-name>oxygen</platform-name>
<targetPlatform.repository>http://pdulth.github.io/fr.obeo.releng.targetplatform/p2/latest</targetPlatform.repository>
<targetPlatform.name>introspector.targetplatform</targetPlatform.name>
Expand Down

0 comments on commit 707c64d

Please sign in to comment.