[#2149] build nightly with tycho 4.0.0-SNAPSHOT

Signed-off-by: Christian Dietrich <[email protected]>
eclipse-xtext · May 31, 2023 · 3c946fb · 3c946fb
1 parent 752e859
commit 3c946fb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -6,15 +6,14 @@ pipeline {
   }
 
   parameters {
-    choice(name: 'TARGET_PLATFORM', choices: ['r202203', 'r202206', 'r202209', 'r202212', 'r202303', 'latest'], description: 'Which Target Platform should be used?')
+    choice(name: 'TARGET_PLATFORM', choices: ['latest', 'r202203', 'r202206', 'r202209', 'r202212', 'r202303'], 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
@@ -125,8 +125,8 @@
 	</scm>
 
 	<properties>
-		<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
-		<tycho-version>3.0.4</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