Adjust tests for source feature removal

Author: akurtakov

tycho-its/projects/reproducible-build/pom.xml

@@ -63,22 +63,17 @@
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-source-plugin</artifactId>
 				<version>${tycho-version}</version>
-			</plugin>
-			
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-p2-plugin</artifactId>
-				<version>${tycho-version}</version>
 				<executions>
 					<execution>
-						<id>attach-p2-metadata</id>
-						<phase>package</phase>
+						<id>attach-source</id>
 						<goals>
-							<goal>p2-metadata</goal>
+						<goal>plugin-source</goal>
 						</goals>
+					<phase>package</phase>
 					</execution>
 				</executions>
 			</plugin>
+			
 		</plugins>
 	</build>
 

tycho-its/projects/reproducible-build/reproducible.repository/pom.xml

@@ -27,6 +27,9 @@
 						</goals>
 					</execution>
 				</executions>
+				<configuration>
+					<includeAllSources>true</includeAllSources>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>

tycho-its/projects/sourcePlugin/extra-source-bundles/pom.xml

@@ -22,9 +22,9 @@
 	</repositories>
 
 	<modules>
+		<module>extra.sourcefeature.bundle</module>
 		<module>sourcefeature.feature</module>
 		<module>sourcefeature.repository</module>
-		<module>extra.sourcefeature.bundle</module>
 	</modules>
 
 	<build>
@@ -57,6 +57,19 @@
 					<referencedRepositoryMode>ignore</referencedRepositoryMode>
 				</configuration>
 			</plugin>
+			<plugin>
+				<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>
 		</plugins>
 	</build>
 

tycho-its/projects/sourcePlugin/extra-source-bundles/sourcefeature.feature/pom.xml

@@ -30,28 +30,6 @@
           </dependency-resolution>
         </configuration>
       </plugin>
-      <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-source-plugin</artifactId>
-          <version>${tycho-version}</version>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-p2-plugin</artifactId>
-        <version>${tycho-version}</version>
-        <configuration>
-          <defaultP2Metadata>false</defaultP2Metadata>
-        </configuration>
-        <executions>
-          <execution>
-            <id>attached-p2-metadata</id>
-            <phase>package</phase>
-            <goals>
-              <goal>p2-metadata</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>

tycho-its/projects/sourcePlugin/extra-source-bundles/sourcefeature.repository/pom.xml

@@ -11,5 +11,17 @@
 
   <artifactId>sourcefeature.repository</artifactId>
   <packaging>eclipse-repository</packaging>
+  <build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-repository-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<includeAllSources>true</includeAllSources>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 
 </project>

tycho-its/projects/sourcePlugin/extra-source-bundles/sourcefeature.repository/sourcefeature.repository.product

@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product uid="sourcefeature.repository" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="false">
+<product uid="sourcefeature.repository" version="1.0.0.qualifier" type="mixed" includeLaunchers="false" autoIncludeRequirements="true">
+
+   <plugins>
+   </plugins>
 
    <features>
       <feature id="sourcefeature.feature" version="1.0.0.qualifier"/>
-      <feature id="sourcefeature.feature.source" version="1.0.0.qualifier"/>
    </features>
 
+
 </product>