From 6bc5bc56333970b036cd1d77b96e81aebbbdc2ec Mon Sep 17 00:00:00 2001 From: Arnaud Dieumegard Date: Thu, 29 Jul 2021 16:15:01 +0200 Subject: [PATCH] #23 Migrate to 2021-06 Change-Id: Iee1a271504e3f544fe1b7a2b66801e6ebb8d67ca --- Jenkinsfile | 25 +-- pom.xml | 7 +- .../introspector.target | 146 ++++++++++++++---- .../introspector.targetplatform | 8 +- 4 files changed, 136 insertions(+), 50 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0286727..de897c0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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 genie.kitalpha@projects-storage.eclipse.org rm -rf ${DST_DIR} - ssh genie.kitalpha@projects-storage.eclipse.org mkdir -p ${DST_DIR} - ssh genie.kitalpha@projects-storage.eclipse.org mkdir -p ${DST_DIR}/updates/ - ssh genie.kitalpha@projects-storage.eclipse.org mkdir -p ${DST_DIR}/dropins/ - scp -r releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.all.site/target/repository/* genie.kitalpha@projects-storage.eclipse.org:${DST_DIR}/updates/ - scp -r releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.all.site/target/PDTTooling_All-dropins-*.zip genie.kitalpha@projects-storage.eclipse.org:${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 genie.kitalpha@projects-storage.eclipse.org rm -rf ${DST_DIR}" + sh "ssh genie.kitalpha@projects-storage.eclipse.org mkdir -p ${DST_DIR}" + sh "ssh genie.kitalpha@projects-storage.eclipse.org mkdir -p ${DST_DIR}/updates/" + sh "ssh genie.kitalpha@projects-storage.eclipse.org mkdir -p ${DST_DIR}/dropins/" + sh "scp -r releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.all.site/target/repository/* genie.kitalpha@projects-storage.eclipse.org:${DST_DIR}/updates/" + sh "scp -r releng/sites/introspector/org.polarsys.kitalpha.pdt.introspector.all.site/target/PDTTooling_All-dropins-*.zip genie.kitalpha@projects-storage.eclipse.org:${DST_DIR}/dropins/" + } } } } diff --git a/pom.xml b/pom.xml index f2177c2..75efac0 100644 --- a/pom.xml +++ b/pom.xml @@ -20,8 +20,8 @@ pom - 2.0.0 - 2.0.0 + 2.2.0 + 2.2.0 scm:git:https://github.com/eclipse/kitalpha-addons.git/ 1.8 0.8.6 @@ -33,7 +33,7 @@ -Xms256m -Xmx1024m - 2019-06 + 2021-06 http://download.eclipse.org/releases/${platform-name} PDTTooling @@ -125,6 +125,7 @@ target-platform-configuration ${tycho-version} + JavaSE-14 org.polarsys diff --git a/releng/org.polarsys.kitalpha.pdt.introspector.targets/introspector.target b/releng/org.polarsys.kitalpha.pdt.introspector.targets/introspector.target index e7c7fa2..8395b23 100644 --- a/releng/org.polarsys.kitalpha.pdt.introspector.targets/introspector.target +++ b/releng/org.polarsys.kitalpha.pdt.introspector.targets/introspector.target @@ -1,23 +1,73 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + @@ -30,7 +80,6 @@ - @@ -44,17 +93,9 @@ - - - - - - - - @@ -67,7 +108,6 @@ - @@ -76,12 +116,38 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -114,7 +180,7 @@ - + @@ -125,19 +191,19 @@ - + - + - + @@ -158,26 +224,40 @@ - + - + - + + + + + + + + + + + + + + + - + - + @@ -290,7 +370,7 @@ - + diff --git a/releng/org.polarsys.kitalpha.pdt.introspector.targets/introspector.targetplatform b/releng/org.polarsys.kitalpha.pdt.introspector.targets/introspector.targetplatform index 4c42e4f..bb5e7ec 100644 --- a/releng/org.polarsys.kitalpha.pdt.introspector.targets/introspector.targetplatform +++ b/releng/org.polarsys.kitalpha.pdt.introspector.targets/introspector.targetplatform @@ -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://ci.eclipse.org/kitalpha/job/Kitalpha/view/change-requests/job/PR-676/28/artifact/releng/plugins/org.polarsys.kitalpha.releng.runtime.updatesite/target/repository/" { 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://ci.eclipse.org/kitalpha/job/Kitalpha/view/change-requests/job/PR-676/28/artifact/releng/plugins/org.polarsys.kitalpha.releng.runtime.core.updatesite/target/repository/" { 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://ci.eclipse.org/kitalpha/job/Kitalpha/view/change-requests/job/PR-676/28/artifact/releng/plugins/org.polarsys.kitalpha.releng.sdk.updatesite/target/repository/" { 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