eclipse-kitalpha#23 Migrate to 2021-06

Change-Id: Iee1a271504e3f544fe1b7a2b66801e6ebb8d67ca
arnauddieumegard · Jul 29, 2021 · 6bc5bc5 · 6bc5bc5
1 parent cab7d85
commit 6bc5bc5
Show file tree

Hide file tree

Showing 4 changed files with 136 additions and 50 deletions.
diff --git 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 [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/"
+					}
 				}
 			}
 		}

diff --git a/pom.xml b/pom.xml
@@ -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>
@@ -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>
@@ -125,6 +125,7 @@
 				<artifactId>target-platform-configuration</artifactId>
 				<version>${tycho-version}</version>
 				<configuration>
+					<executionEnvironment>JavaSE-14</executionEnvironment>
 					<target>
 						<artifact>
 							<groupId>org.polarsys</groupId>