From 4ccd5ffee65718d5341ce26d296c5a8a0104b096 Mon Sep 17 00:00:00 2001
From: Christian Dietrich <christian.dietrich.opensource@gmail.com>
Date: Fri, 22 Sep 2023 11:08:55 +0200
Subject: [PATCH] dont use extras feature source plugin update to maven 3.9.1

Signed-off-by: Christian Dietrich <christian.dietrich.opensource@gmail.com>
---
 Jenkinsfile                                   |  4 ++--
 .../org.eclipse.emf.mwe.core-feature/pom.xml  | 22 +++++++++++++------
 .../org.eclipse.emf.mwe.doc-feature/pom.xml   | 18 ++++++++++-----
 .../org.eclipse.emf.mwe.sdk-feature/pom.xml   | 18 ++++++++++-----
 .../pom.xml                                   | 18 ++++++++++-----
 .../pom.xml                                   | 18 ++++++++++-----
 features/pom.xml                              |  8 +++----
 7 files changed, 73 insertions(+), 33 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 595cc270..0fbb5503 100644
--- 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
index 754d5573..fc805912 100644
--- 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
index faba60e1..c2332748 100644
--- 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
index 18890f51..5ed31cef 100644
--- 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
index 5584fd95..2fcb1cf4 100644
--- 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
index 37d38c53..68f96c38 100644
--- 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
index 3f252437..7a0f8863 100644
--- 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>