[I/Y-Build] Convert Equinox SDK to p2-repository

And prevent the Eclipse OSGi bundle from being listed second time in the
'Other Required Bundles' section at the Equinox build site.

Author: HannesWell

JenkinsJobs/Builds/build.jenkinsfile

@@ -431,8 +431,8 @@ pipeline {
 									popd
 
 									# Gather Equinox SDK
-									pushd ${PRODUCTS_DIR}/equinox-sdk/target
-									cp equinox-sdk-*-SNAPSHOT.zip ${EQUINOX_DROP_DIR}/${BUILD_ID}/equinox-SDK-$BUILD_ID.zip
+									pushd ${SITES_DIR}/equinox-sdk-repository/target
+									cp equinox-sdk-repository.eclipse-repository-*.zip ${EQUINOX_DROP_DIR}/${BUILD_ID}/equinox-SDK-$BUILD_ID.zip
 									popd
 									pushd ${EQUINOX_DROP_DIR}/${BUILD_ID}
 										unzip -o -j equinox-SDK-$BUILD_ID.zip plugins/*.jar -x plugins/*.source_*

products/equinox-sdk/equinox-sdk.product

@@ -33,11 +33,8 @@
 		<module>equinox-launcher</module>
 		<module>equinox-starterkit</module>
 		<module>eclipse-junit-tests</module>
-		<module>equinox-sdk</module>
 	</modules>
 
-	<!-- TODO: Move site like products (e.g. equinox-sdk and junit-tests) into sites folder, which also avoids inheriting (for them) unwanted configuration?-->
-	
 	<properties>
 		<!-- If product.installSources is set to true,
 		repository.includeAllSources must always be true too.
@@ -97,7 +94,7 @@
 			</plugins>
 		</pluginManagement>
 	</build>
-	
+
 	<profiles>
 		<profile>
 			<id>eclipse-sign</id>

products/equinox-sdk/pom.xml

@@ -13,6 +13,8 @@
  *     Hannes Wellmann - initial API and implementation
  *******************************************************************************/
 
+import static java.util.function.Predicate.not;
+
 import java.util.Map.Entry;
 
 import utilities.JSON;
@@ -139,15 +141,16 @@ void mainEquinoxPageData() throws IOException {
 	buildProperties.add("equinoxRepository",
 			collectFileEntries(files, filename -> filename.startsWith("equinox-SDK-")));
 
-	buildProperties.add("equinoxFramework",
-			collectFileEntries(files, filename -> filename.startsWith("org.eclipse.osgi_")));
+	Predicate<String> isOSGiBundle = filename -> filename.startsWith("org.eclipse.osgi_");
+	buildProperties.add("equinoxFramework", collectFileEntries(files, isOSGiBundle));
 
 	Predicate<String> isAddonBundle = filename -> (filename.startsWith("org.eclipse.equinox.")
 			|| filename.startsWith("org.eclipse.osgi.")) && !filename.startsWith("org.eclipse.equinox.p2.");
 	Predicate<String> isJar = filename -> filename.endsWith(".jar");
 
 	buildProperties.add("addonBundles", collectFileEntries(files, isAddonBundle.and(isJar)));
-	buildProperties.add("otherBundles", collectFileEntries(files, isAddonBundle.negate().and(isJar)));
+	buildProperties.add("otherBundles",
+			collectFileEntries(files, not(isAddonBundle).and(not(isOSGiBundle)).and(isJar)));
 
 	buildProperties.add("launchers", collectFileEntries(files, filename -> filename.startsWith("launchers-")));
 

products/pom.xml

@@ -1,3 +1,4 @@
 # Maven/Tycho pom model adjustments, see https://github.com/eclipse/tycho/wiki/Tycho-Pomless
 pom.model.property.repository.name = Eclipse ${releaseVersion}
+pom.model.property.repository.includeAllDependencies = true
 pom.model.property.eclipse.signing.skip = false

scripts/releng/BuildDropDataGenerator.java

@@ -0,0 +1,4 @@
+# Maven/Tycho pom model adjustments, see https://github.com/eclipse-tycho/tycho/wiki/Tycho-Pomless
+pom.model.property.repository.name = Equinox and Eclipse p2 ${releaseVersion}
+pom.model.property.repository.includeAllDependencies = false
+pom.model.property.eclipse.signing.skip = false

sites/eclipse-platform-repository/build.properties

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature id="org.eclipse.equinox.sdk"/>
+   <feature id="org.eclipse.equinox.p2.sdk"/>
+   <feature id="org.eclipse.core.runtime.feature"/>
+</site>

sites/equinox-sdk-repository/build.properties

@@ -16,7 +16,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	
+
 	<parent>
 		<groupId>org.eclipse</groupId>
 		<artifactId>eclipse-platform-parent</artifactId>
@@ -29,6 +29,7 @@
 
 	<modules>
 		<module>eclipse-platform-repository</module>
+		<module>equinox-sdk-repository</module>
 	</modules>
 
 	<build>
@@ -38,15 +39,15 @@
 					<groupId>org.eclipse.tycho</groupId>
 					<artifactId>tycho-p2-repository-plugin</artifactId>
 					<configuration>
-						<includeAllDependencies>true</includeAllDependencies>
+						<includeAllDependencies>${repository.includeAllDependencies}</includeAllDependencies>
 						<includeAllSources>true</includeAllSources>
 						<repositoryName>${repository.name}</repositoryName>
 					</configuration>
 				</plugin>
 			</plugins>
 		</pluginManagement>
 	</build>
-	
+
 	<profiles>
 		<profile>
 			<id>eclipse-sign</id>