From 6d00193ff03e07e4982201affed3bf2b0fc74e57 Mon Sep 17 00:00:00 2001
From: Christian Dietrich <christian.dietrich@itemis.de>
Date: Tue, 4 Apr 2023 12:28:38 +0200
Subject: [PATCH] [#2149] build nightly with tycho 4.0.0-SNAPSHOT

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
---
 Jenkinsfile | 11 +++++------
 pom.xml     | 12 +++++++++---
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e0bab1914ef..d0443615dbf 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,15 +6,14 @@ pipeline {
   }
 
   parameters {
-    choice(name: 'TARGET_PLATFORM', choices: ['r202203', 'r202206', 'r202209', 'r202212', 'r202303', 'r202306', 'r202309', 'latest'], description: 'Which Target Platform should be used?')
+    choice(name: 'TARGET_PLATFORM', choices: ['latest', 'r202203', 'r202206', 'r202209', 'r202212', 'r202303', 'r202306', 'r202309'], description: 'Which Target Platform should be used?')
     // see https://wiki.eclipse.org/Jenkins#JDK
-    choice(name: 'JDK_VERSION', choices: [ '11', '17' ], description: 'Which JDK version should be used?')
+    choice(name: 'JDK_VERSION', choices: ['17', '11'], description: 'Which JDK version should be used?')
   }
 
   triggers {
-    parameterizedCron(env.BRANCH_NAME == 'main' ? '''
-      H H(0-1) * * * %TARGET_PLATFORM=r202203;JDK_VERSION=17
-      H H(3-4) * * * %TARGET_PLATFORM=latest;JDK_VERSION=17
+    parameterizedCron(env.BRANCH_NAME == 'cd_tycho40' ? '''
+      H H(12-13) * * * %TARGET_PLATFORM=latest;JDK_VERSION=17
       ''' : '')
   }
 
@@ -25,7 +24,7 @@ pipeline {
   }
 
   tools {
-     maven "apache-maven-3.8.6"
+     maven "apache-maven-3.9.1"
      jdk "temurin-jdk17-latest"
   }
 
diff --git a/pom.xml b/pom.xml
index c61e477a256..0a180c688aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,8 +125,8 @@
 	</scm>
 
 	<properties>
-		<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
-		<tycho-version>3.0.5</tycho-version>
+		<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>	
+		<tycho-version>4.0.0-SNAPSHOT</tycho-version>
 
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
@@ -219,6 +219,12 @@
 			</releases>
 		</repository>
 	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>tycho-snapshots</id>
+			<url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
+		</pluginRepository>
+	</pluginRepositories>
 
 	<profiles>
 		<profile>
@@ -503,6 +509,7 @@
 					<!--
 					This is not needed now, but will be needed when switching to Tycho 4.0.0
 					see https://github.com/eclipse-tycho/tycho/blob/master/RELEASE_NOTES.md#using-integrationplugin-tests-with-eclipse-plugin-packaging
+					-->
 					<executions>
 						<execution>
 							<id>execute-unit-tests</id>
@@ -511,7 +518,6 @@
 							</goals>
 						</execution>
 					</executions>
-					-->
 					<configuration>
 						<!--
 						The Surefire Plugin excludes nested classes by default: http://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#excludes