From 21364d413615d474b25d62969a1ed5a9b6740510 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <laeubi@laeubi-soft.de>
Date: Mon, 17 Jul 2023 07:37:30 +0200
Subject: [PATCH] Generate a manifest for all tycho jars

Currently we sometimes generate a manifest and sometimes not using
different settings, this should be unified to simply generate a manifest
for any jar we produce in Tycho.
---
 pom.xml            | 31 +++++++++++++++++++++++++++++++
 tycho-core/pom.xml | 16 ++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/pom.xml b/pom.xml
index 5d8e712c7f..43d833aeaf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -322,6 +322,37 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>biz.aQute.bnd</groupId>
+				<artifactId>bnd-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>bnd-process</id>
+						<goals>
+							<goal>bnd-process</goal>
+						</goals>
+						<configuration>
+							<packagingTypes>jar,maven-plugin</packagingTypes>
+							<bnd>
+							<![CDATA[ 
+								Import-Package: *
+								Export-Package: org.eclipse.tycho.*;-noimport:=true
+								-noimportjava: true
+							]]>
+							</bnd>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+					</archive>
+				</configuration>
+			</plugin>
 		</plugins>
 		<pluginManagement>
 			<plugins>
diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml
index 8a9d309e7a..c536c04dc8 100644
--- a/tycho-core/pom.xml
+++ b/tycho-core/pom.xml
@@ -85,6 +85,22 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>biz.aQute.bnd</groupId>
+				<artifactId>bnd-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>system-packages-companion-bnd-process</id>
+						<phase>generate-resources</phase>
+						<goals>
+							<goal>bnd-process</goal>
+						</goals>
+						<configuration>
+							<packagingTypes>jar,maven-plugin</packagingTypes>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<artifactId>maven-jar-plugin</artifactId>
 				<executions>