Merge pull request #266 from eclipse/cd_fsp

dont use extras feature source plugin
eclipse-mwe · Sep 22, 2023 · b4baf8a · b4baf8a
2 parents d80f454 + 4ccd5ff
commit b4baf8a
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 33 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -78,7 +78,7 @@ pipeline {
     stage ('Build') {
       steps {
         wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) {
-          withMaven(jdk: 'temurin-jdk11-latest', maven: 'apache-maven-3.8.6', options: [junitPublisher(disabled: true), openTasksPublisher(disabled: true)]) {
+          withMaven(jdk: 'temurin-jdk11-latest', maven: 'apache-maven-3.9.1', options: [junitPublisher(disabled: true), openTasksPublisher(disabled: true)]) {
             dir ('git-repo') {
               buildProject("org.eclipse.emf.mwe2.target")
             }
@@ -96,7 +96,7 @@ pipeline {
       steps {
         wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) {
           catchError(buildResult: 'UNSTABLE', stageResult: 'UNSTABLE') {
-            withMaven(jdk: 'temurin-jdk17-latest', maven: 'apache-maven-3.8.6', options: [junitPublisher(disabled: true), openTasksPublisher(disabled: true)]) {
+            withMaven(jdk: 'temurin-jdk17-latest', maven: 'apache-maven-3.9.1', options: [junitPublisher(disabled: true), openTasksPublisher(disabled: true)]) {
               dir ('git-repo-nightly') {
                 buildProject("org.eclipse.emf.mwe2.target.nightly", true)
               }

diff --git a/features/org.eclipse.emf.mwe.core-feature/pom.xml b/features/org.eclipse.emf.mwe.core-feature/pom.xml
@@ -12,14 +12,22 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
 				<version>${tycho-version}</version>
-				<configuration>
-					<excludes>
-						<plugin id="org.apache.commons.cli" />
-					</excludes>
-				</configuration>
+				<executions>
+					<execution>
+						<id>feature-source</id>
+						<goals>
+							<goal>feature-source</goal>
+						</goals>
+						<configuration>
+							<excludes>
+								<plugin id="org.apache.commons.cli" />
+							</excludes>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
 	</build>

diff --git a/features/org.eclipse.emf.mwe.doc-feature/pom.xml b/features/org.eclipse.emf.mwe.doc-feature/pom.xml
@@ -15,12 +15,20 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
 				<version>${tycho-version}</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
+				<executions>
+					<execution>
+						<id>feature-source</id>
+						<goals>
+							<goal>feature-source</goal>
+						</goals>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
 	</build>

diff --git a/features/org.eclipse.emf.mwe.sdk-feature/pom.xml b/features/org.eclipse.emf.mwe.sdk-feature/pom.xml
@@ -12,12 +12,20 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
 				<version>${tycho-version}</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
+				<executions>
+					<execution>
+						<id>feature-source</id>
+						<goals>
+							<goal>feature-source</goal>
+						</goals>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
 	</build>

diff --git a/features/org.eclipse.emf.mwe2.language.sdk-feature/pom.xml b/features/org.eclipse.emf.mwe2.language.sdk-feature/pom.xml
@@ -11,12 +11,20 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
 				<version>${tycho-version}</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
+				<executions>
+					<execution>
+						<id>feature-source</id>
+						<goals>
+							<goal>feature-source</goal>
+						</goals>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
 	</build>

diff --git a/features/org.eclipse.emf.mwe2.runtime.sdk-feature/pom.xml b/features/org.eclipse.emf.mwe2.runtime.sdk-feature/pom.xml
@@ -11,12 +11,20 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
 				<version>${tycho-version}</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
+				<executions>
+					<execution>
+						<id>feature-source</id>
+						<goals>
+							<goal>feature-source</goal>
+						</goals>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 		</plugins>
 	</build>

diff --git a/features/pom.xml b/features/pom.xml
@@ -26,14 +26,14 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
 				<version>${tycho-version}</version>
 				<executions>
 					<execution>
-						<id>generate-source-feature</id>
+						<id>feature-source</id>
 						<goals>
-							<goal>source-feature</goal>
+							<goal>feature-source</goal>
 						</goals>
 					</execution>
 				</executions>