[releng] Use Tycho 4.0.9

scosta-obeo · Oct 7, 2024 · d968e2e · d968e2e
1 parent a54c659
commit d968e2e
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 44 deletions.
diff --git a/pom.xml b/pom.xml
@@ -22,8 +22,8 @@
 	<packaging>pom</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<tycho-version>2.7.5</tycho-version>
-		<tycho-extras-version>2.7.5</tycho-extras-version>
+		<tycho-version>4.0.9</tycho-version>
+		<tycho-extras-version>4.0.9</tycho-extras-version>
 		<antrun-version>3.0.0</antrun-version>
 		<rcptt-version>2.5.3</rcptt-version>
 		<rcptt-runner-version>2.5.3</rcptt-runner-version>
@@ -110,50 +110,43 @@
 			</plugin>
 			<!-- enable source feature generation -->
 			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
-				<version>${tycho-extras-version}</version>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
+				<version>${tycho-version}</version>
 				<executions>
 					<execution>
-						<id>source-feature</id>
+						<id>feature-source</id>
 						<phase>package</phase>
 						<goals>
-							<goal>source-feature</goal>
+							<goal>feature-source</goal>
 						</goals>
+						<configuration>
+							<archive>
+								<addMavenDescriptor>false</addMavenDescriptor>
+							</archive>
+							<excludes>
+								<!-- provide bundles not containing any source code -->
+								<plugin id="org.polarsys.capella.core.data.res.edit" />
+								<plugin id="org.polarsys.capella.core.data.res.editor" />
+								<plugin id="org.polarsys.capella.ui.views" />
+								<feature id="org.eclipse.nebula.widgets.richtext.feature" />
+								<feature id="org.polarsys.kitalpha.richtext.widget.feature" />
+								<feature id="org.polarsys.capella.core.mylyn.feature" />
+							</excludes>
+						</configuration>
 					</execution>
-				</executions>
-				<configuration>
-					<archive>
-						<addMavenDescriptor>false</addMavenDescriptor>
-					</archive>
-					<excludes>
-						<!-- provide bundles not containing any source code -->
-						<plugin id="org.polarsys.capella.core.data.res.edit" />
-						<plugin id="org.polarsys.capella.core.data.res.editor" />
-						<plugin id="org.polarsys.capella.ui.views" />
-						<feature id="org.eclipse.nebula.widgets.richtext.feature" />
-						<feature id="org.polarsys.kitalpha.richtext.widget.feature" />
-						<feature id="org.polarsys.capella.core.mylyn.feature" />
-					</excludes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
 					<execution>
 						<id>plugin-source</id>
 						<goals>
 							<goal>plugin-source</goal>
 						</goals>
+						<configuration>
+							<archive>
+								<addMavenDescriptor>false</addMavenDescriptor>
+							</archive>
+						</configuration>
 					</execution>
 				</executions>
-				<configuration>
-					<archive>
-						<addMavenDescriptor>false</addMavenDescriptor>
-					</archive>
-				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>

diff --git a/releng/plugins/org.polarsys.capella.targets/pom.xml b/releng/plugins/org.polarsys.capella.targets/pom.xml
@@ -35,8 +35,7 @@
 
 	<properties>
     	<sonar.skip>true</sonar.skip>
-		<tycho-version>2.7.5</tycho-version>
-		<tycho-extras-version>2.7.5</tycho-extras-version>
+		<tycho-version>4.0.9</tycho-version>
 		<targetPlatform.name>capella.target-definition.targetplatform</targetPlatform.name>
 		<converterApplication.name>org.eclipse.cbi.targetplatform.tpd.converter</converterApplication.name>
 		<targetPlatform.id>full</targetPlatform.id>
@@ -45,9 +44,9 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-eclipserun-plugin</artifactId>
-				<version>${tycho-extras-version}</version>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-eclipse-plugin</artifactId>
+				<version>${tycho-version}</version>
 				<configuration>
 					<repositories>
 						<repository>
@@ -77,12 +76,14 @@
 				<executions>
 					<execution>
 						<id>generate.target</id>
-						<phase>validate</phase>
-						<configuration>
-							<applicationsArgs>
-								<args>-application ${converterApplication.name} ${targetPlatform.id}/${targetPlatform.name}</args>
-							</applicationsArgs>
-							<executionEnvironment>JavaSE-17</executionEnvironment>
+						<phase>validate</phase>
+						<configuration>
+							<applicationArgs>
+								<arg>-application</arg>
+								<arg>${converterApplication.name}</arg>
+								<arg>${targetPlatform.id}/${targetPlatform.name}</arg>
+							</applicationArgs>
+							<executionEnvironment>JavaSE-17</executionEnvironment>
 						</configuration>
 						<goals>
 							<goal>eclipse-run</goal>