Remove SourceFeatureMojo

laeubi · akurtakov · commit 4d778544306e · 2026-01-21T08:00:51.000+02:00
diff --git a/tycho-its/projects/automaticSourceGeneration/helloworld.updatesite/category.xml b/tycho-its/projects/automaticSourceGeneration/helloworld.updatesite/category.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature id="helloworld.feature" />
-   <!-- this should be auto generated too ! -->
-   <feature id="helloworld.feature.source" />
+   <feature id="helloworld.feature"/>
 </site>
diff --git a/tycho-its/projects/automaticSourceGeneration/pom.xml b/tycho-its/projects/automaticSourceGeneration/pom.xml
@@ -51,12 +51,6 @@
 							<goal>plugin-source</goal>
 						</goals>
 					</execution>
-					<execution>
-						<id>feature-source</id>
-						<goals>
-							<goal>feature-source</goal>
-						</goals>
-					</execution>
 				</executions>
 			</plugin>
 			<plugin>
diff --git a/tycho-its/projects/feature.attributes.inference/pom.xml b/tycho-its/projects/feature.attributes.inference/pom.xml
@@ -34,14 +34,6 @@
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-source-plugin</artifactId>
 				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>feature-source</id>
-						<goals>
-							<goal>feature-source</goal>
-						</goals>
-					</execution>
-				</executions>
 			</plugin>
             <plugin>
                 <groupId>org.eclipse.tycho</groupId>
diff --git a/tycho-its/projects/reproducible-build/pom.xml b/tycho-its/projects/reproducible-build/pom.xml
@@ -63,15 +63,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>
-							<goal>feature-source</goal>
-						</goals>
-					</execution>
-				</executions>
 			</plugin>
 			
 			<plugin>
diff --git a/tycho-its/projects/sourcePlugin/basic/feature.consumingsourcefeature/feature.xml b/tycho-its/projects/sourcePlugin/basic/feature.consumingsourcefeature/feature.xml
@@ -3,8 +3,4 @@
       id="feature.consumingsourcefeature"
       version="1.0.0.qualifier">
 
-   <includes
-         id="sourcefeature.feature.source"
-         version="0.0.0"/>
-
 </feature>
diff --git a/tycho-its/projects/sourcePlugin/basic/sourcefeature.feature.indirect/pom.xml b/tycho-its/projects/sourcePlugin/basic/sourcefeature.feature.indirect/pom.xml
@@ -17,17 +17,6 @@
           <groupId>org.eclipse.tycho</groupId>
           <artifactId>tycho-source-plugin</artifactId>
           <version>${tycho-version}</version>
-          <executions>
-               <execution>
-                  <id>feature-source</id>
-                  <goals>
-                      <goal>feature-source</goal>
-                  </goals>
-                  <configuration>
-			        <brandingPlugin>sourcefeature.bundle</brandingPlugin>
-			      </configuration>
-              </execution>
-          </executions>
       </plugin>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
diff --git a/tycho-its/projects/sourcePlugin/basic/sourcefeature.feature/pom.xml b/tycho-its/projects/sourcePlugin/basic/sourcefeature.feature/pom.xml
@@ -18,20 +18,6 @@
           <groupId>org.eclipse.tycho</groupId>
           <artifactId>tycho-source-plugin</artifactId>
           <version>${tycho-version}</version>
-          <executions>
-               <execution>
-                  <id>feature-source</id>
-                  <goals>
-                      <goal>feature-source</goal>
-                  </goals>
-                  <configuration>
-		              <reuseBrandingPlugin>false</reuseBrandingPlugin>
-		              <excludes>
-		                <plugin id="sourcefeature.bundle.nosource"/>
-		              </excludes>
-		            </configuration>
-              </execution>
-          </executions>
       </plugin>
     
       <plugin>
diff --git a/tycho-its/projects/sourcePlugin/basic/sourcefeature.repository/sourcefeature.repository.product b/tycho-its/projects/sourcePlugin/basic/sourcefeature.repository/sourcefeature.repository.product
@@ -5,7 +5,6 @@
 
    <features>
       <feature id="sourcefeature.feature" version="1.0.0.qualifier"/>
-      <feature id="sourcefeature.feature.source" version="1.0.0.qualifier"/>
    </features>
 
 </product>
diff --git a/tycho-its/projects/sourcePlugin/extra-source-bundles/sourcefeature.feature/pom.xml b/tycho-its/projects/sourcePlugin/extra-source-bundles/sourcefeature.feature/pom.xml
@@ -34,19 +34,6 @@
           <groupId>org.eclipse.tycho</groupId>
           <artifactId>tycho-source-plugin</artifactId>
           <version>${tycho-version}</version>
-          <executions>
-               <execution>
-                  <id>feature-source</id>
-                  <goals>
-                      <goal>feature-source</goal>
-                  </goals>
-		            <configuration>
-		              <plugins>
-		                <plugin id="extra.sourcefeature.bundle" versionRange="0.0.0" />
-		              </plugins>
-		            </configuration>
-              </execution>
-          </executions>
       </plugin>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
diff --git a/tycho-its/projects/sourcePlugin/license-feature/feature/pom.xml b/tycho-its/projects/sourcePlugin/license-feature/feature/pom.xml
@@ -17,14 +17,6 @@
                 <groupId>org.eclipse.tycho</groupId>
                 <artifactId>tycho-source-plugin</artifactId>
                 <version>${tycho-version}</version>
-                <executions>
-                     <execution>
-                        <id>feature-source</id>
-                        <goals>
-                            <goal>feature-source</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
diff --git a/tycho-its/projects/sourcePlugin/remote-source-bundles/sourcefeature.feature/pom.xml b/tycho-its/projects/sourcePlugin/remote-source-bundles/sourcefeature.feature/pom.xml
@@ -17,14 +17,6 @@
           <groupId>org.eclipse.tycho</groupId>
           <artifactId>tycho-source-plugin</artifactId>
           <version>${tycho-version}</version>
-          <executions>
-               <execution>
-                  <id>feature-source</id>
-                  <goals>
-                      <goal>feature-source</goal>
-                  </goals>
-              </execution>
-          </executions>
       </plugin>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/feature/FeatureAttributesInferenceTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/feature/FeatureAttributesInferenceTest.java
@@ -45,8 +45,6 @@ public void testFeatureAttributesInference() throws Exception {
 		verifier.verifyErrorFreeLog();
 		File featureTargetDir = new File(verifier.getBasedir(), "feature/target");
 		File featureJar = assertFileExists(featureTargetDir, "feature.attributes.inference.test-1.0.0.jar")[0];
-		File featureSourceJar = assertFileExists(featureTargetDir,
-				"feature.attributes.inference.test-1.0.0-sources-feature.jar")[0];
 
 		List<Element> pluginNodes = getPluginElements(featureJar);
 		Assert.assertEquals(3, pluginNodes.size());
@@ -66,25 +64,6 @@ public void testFeatureAttributesInference() throws Exception {
 				"id", equalTo("org.apiguardian.api"), //
 				"version", isSpecificVersion() //
 		), pluginNodes.get(2));
-
-		// Check the feature.xml in the source-feature-jar
-		List<Element> pluginSourceNodes = getPluginElements(featureSourceJar);
-		Assert.assertEquals(3, pluginSourceNodes.size());
-
-		assertAttributesOnlyElementWith(Map.of(//
-				"id", equalTo("junit-jupiter-api.source"), //
-				"version", isSpecificVersion() //
-		), pluginSourceNodes.get(0));
-
-		assertAttributesOnlyElementWith(Map.of(//
-				"id", equalTo("junit-platform-suite-api.source"), //
-				"version", isSpecificVersion() //
-		), pluginSourceNodes.get(1));
-
-		assertAttributesOnlyElementWith(Map.of(//
-				"id", equalTo("org.apiguardian.api.source"), //
-				"version", isSpecificVersion() //
-		), pluginSourceNodes.get(2));
 	}
 
 	private List<Element> getPluginElements(File featureJar) throws Exception {
diff --git a/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/SourceFeatureMojo.java b/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/SourceFeatureMojo.java
diff --git a/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/SourceFeatureP2MetadataProvider.java b/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/SourceFeatureP2MetadataProvider.java
diff --git a/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/SourceInstallableUnitProvider.java b/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/SourceInstallableUnitProvider.java
diff --git a/tycho-source-plugin/src/test/java/org/eclipse/tycho/source/SourceFeatureSkeletonTest.java b/tycho-source-plugin/src/test/java/org/eclipse/tycho/source/SourceFeatureSkeletonTest.java
