tycho-source-feature-plugin has been merged into tycho-source-plugin

eclipse-acceleo · Nov 15, 2022 · e65f305 · e65f305
1 parent 87658b1
commit e65f305
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 39 deletions.
diff --git a/features/org.eclipse.acceleo.aql.launcher-feature/pom.xml b/features/org.eclipse.acceleo.aql.launcher-feature/pom.xml
@@ -29,8 +29,8 @@
   <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>
       </plugin>
     </plugins>
   </build>

diff --git a/features/org.eclipse.acceleo.aql.migration-feature/pom.xml b/features/org.eclipse.acceleo.aql.migration-feature/pom.xml
@@ -29,8 +29,8 @@
   <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>
       </plugin>
     </plugins>
   </build>

diff --git a/pom.xml b/pom.xml
@@ -175,6 +175,10 @@
           <archive>
             <addMavenDescriptor>false</addMavenDescriptor>
           </archive>
+          <excludes>
+            <plugin id="org.eclipse.acceleo.aql.doc"/>
+            <plugin id="org.eclipse.acceleo.aql.tm"/>
+          </excludes>
         </configuration>
         <executions>
           <execution>
@@ -183,28 +187,10 @@
               <goal>plugin-source</goal>
             </goals>
           </execution>
-        </executions>
-      </plugin>
-      <!-- enable source feature generation -->
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-source-feature-plugin</artifactId>
-        <version>${tycho-extras-version}</version>
-        <configuration>
-          <excludes>
-            <plugin id="org.eclipse.acceleo.aql.doc"/>
-            <plugin id="org.eclipse.acceleo.aql.tm"/>
-          </excludes>
-          <archive>
-            <addMavenDescriptor>false</addMavenDescriptor>
-          </archive>
-        </configuration>
-        <executions>
           <execution>
-            <id>source-feature</id>
-            <phase>package</phase>
+            <id>feature-source</id>
             <goals>
-              <goal>source-feature</goal>
+              <goal>feature-source</goal>
             </goals>
           </execution>
         </executions>

diff --git a/query/features/org.eclipse.acceleo.query-feature/pom.xml b/query/features/org.eclipse.acceleo.query-feature/pom.xml
@@ -29,14 +29,13 @@
   <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>
         <executions>
           <execution>
-            <phase>package</phase>
-            <id>source-feature</id>
+            <id>feature-source</id>
             <goals>
-              <goal>source-feature</goal>
+              <goal>feature-source</goal>
             </goals>
             <configuration>
               <excludes>

diff --git a/query/features/org.eclipse.acceleo.query.jdt-feature/pom.xml b/query/features/org.eclipse.acceleo.query.jdt-feature/pom.xml
@@ -29,14 +29,13 @@
   <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>
         <executions>
           <execution>
-            <phase>package</phase>
-            <id>source-feature</id>
+            <id>feature-source</id>
             <goals>
-              <goal>source-feature</goal>
+              <goal>feature-source</goal>
             </goals>
             <configuration>
               <excludes>

diff --git a/query/features/org.eclipse.acceleo.query.ui-feature/pom.xml b/query/features/org.eclipse.acceleo.query.ui-feature/pom.xml
@@ -29,14 +29,13 @@
   <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>
         <executions>
           <execution>
-            <phase>package</phase>
-            <id>source-feature</id>
+            <id>feature-source</id>
             <goals>
-              <goal>source-feature</goal>
+              <goal>feature-source</goal>
             </goals>
             <configuration>
               <excludes>