From 95fb6ee72e42557571d82d64dffab584cc1b12e4 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@gmail.com>
Date: Sun, 16 Oct 2022 16:51:52 +0100
Subject: [PATCH] [releng] Fix up usages of tycho-source-plugin

Migrate usage of deprecated tycho-source-feature-plugin plugin
to the tycho-source-plugin:feature-source goal.

Eliminate duplicate invokations of the
tycho-source-plugin:plugin-source goal.
---
 pom.xml | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6ea79e75b6b..84880b77846 100644
--- a/pom.xml
+++ b/pom.xml
@@ -456,12 +456,11 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>org.eclipse.tycho.extras</groupId>
-						<artifactId>tycho-source-feature-plugin</artifactId>
-						<version>${tycho-version}</version>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>tycho-source-plugin</artifactId>
 						<executions>
 							<execution>
-								<id>source-feature</id>
+								<id>attach-feature-source</id>
 								<phase>none</phase>
 							</execution>
 						</executions>
@@ -736,23 +735,14 @@
 							<goal>plugin-source</goal>
 						</goals>
 					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<includeBinaryFeature>false</includeBinaryFeature>
-				</configuration>
-				<executions>
 					<execution>
-						<id>source-feature</id>
+						<id>attach-feature-source</id>
 						<phase>package</phase>
 						<goals>
-							<goal>source-feature</goal>
+							<goal>feature-source</goal>
 						</goals>
 						<configuration>
+							<includeBinaryFeature>false</includeBinaryFeature>
 							<excludes>
 								<plugin id="org.eclipse.cdt.autotools.docs"/>
 								<plugin id="org.eclipse.cdt.meson.docs"/>
@@ -846,14 +836,6 @@
 					<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>
-						</execution>
-					</executions>
 				</plugin>
 				<plugin>
 					<groupId>org.eclipse.tycho</groupId>