use P2Exporter for org.bndtools.p2

.github/workflows/rebuild.yml

@@ -130,3 +130,11 @@ jobs:
           */generated/test-reports/*/TEST-*.xml
           maven/*/target/surefire-reports/TEST-*.xml
           gradle-plugins/*/build/test-results/*/TEST-*.xml
+    - name: Upload Rebuild P2 Repo artifact
+      if: ${{ github.event_name == 'pull_request' }}
+      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
+      with:
+        name: pr-${{ github.event.pull_request.number }}-jdk${{ matrix.java }}-${{ matrix.os }}
+        path: |
+          org.bndtools.p2/generated/org.bndtools.p2.jar
+        retention-days: 7   # keep for 7 days

cnf/build.bnd

@@ -97,3 +97,6 @@ Bundle-Developers: \
 -runproperties.testlauncher0: in.workspace=workspace
 -runproperties.testlauncher1: in.project=workspace
 -runproperties.testlauncher2: in.bndrun=workspace
+
+-plugin \
+    aQute.p2.export.P2Exporter

org.bndtools.p2/.project

@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>bndtools.core.bndbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>bndtools.core.bndnature</nature>
 	</natures>
 </projectDescription>

org.bndtools.p2/bnd.bnd

@@ -39,9 +39,30 @@ pluginnames: ${-dependson},\
 
 plugins: ${map;repo;${template;pluginnames;${@};latest}}
 
--includeresource: ${target}/p2
 -resourceonly: true
-#
-# The p2 tasks must be run from the gradle build
-#
--fixupmessages.p2: "Input file does not exist*${target}/p2";is:=warning;replace:="The ${target}/p2 directory must be created with the gradle build."
+
+-maven-release: 
+-buildrepo: 
+-releaserepo:
+
+# P2 signing:
+# key (name of the key), 
+# passphrase (optional)
+# pubkey (read publickey file e.g. from ~./bnd/ folder)
+# below 
+# The idea is to first check global variables in ~./bnd/settings.json
+# and fallback to environment variables.  
+# For Github Actions you would set the environment variables.
+# fallback is "false" if none is set. 
+sign=${global;p2.sign;${env;P2_SIGN;false}}
+key=${global;p2.sign_key;${env;P2_SIGN_KEY}}
+passphrase=${global;p2.sign_passphrase;${env;P2_SIGN_PASSPHRASE}}
+pubkey="${global;p2.pub_key;${env;P2_PUB_KEY}}"
+
+-export features.bnd; \
+    type=p2; \
+    name=org.bndtools.p2.jar;\
+    sign=${sign};\
+    sign_key=${key};\
+    sign_passphrase=${passphrase};\
+    sign_pubkey=${pubkey};\

org.bndtools.p2/bndtools.ecf.feature.bndrun

@@ -0,0 +1,20 @@
+Bundle-Name:            Bndtools ECF Remote Services
+Bundle-Description:     ECF Remote Services integration for Bndtools
+Bundle-Category         bndtools
+Bundle-Copyright: Copyright Composent, Inc. others, 2025
+update: https://download.eclipse.org/rt/ecf/latest/site.p2/
+update.label: ECF Update Site
+
+Require-Capability \
+    feature;name=org.eclipse.ecf.core.feature;version="[1.7.0,2)",\
+    feature;name=bndtools.main.feature,\
+    feature;name=org.eclipse.ecf.discovery.feature;version="[1.1.0,2)",\
+    feature;name=org.eclipse.ecf.discovery.jmdns.feature;version="[1.1.0,2)",\
+    feature;name=org.eclipse.ecf.osgi.services.feature;version="[2.7.100,3)",\
+    feature;name=org.eclipse.ecf.provider.generic.feature;version="[1.2.0,2)",\
+    feature;name=org.eclipse.ecf.provider.generic.remoteservice.feature;version="[1.3.0,2)",\
+    feature;name=org.eclipse.ecf.remoteservice.feature;version="[2.7.0,3)",\
+    feature;name=org.eclipse.ecf.remoteservice.sdk.bndtools.feature;version="[3.16.5,4)",\
+    feature;name=org.eclipse.ecf.sharedobject.feature;version="[1.2.0,2)"
+
+

org.bndtools.p2/bndtools.m2e.feature.bndrun

@@ -0,0 +1,15 @@
+Bundle-Name:    Bndtools m2e
+Bundle-Description:       m2e integration for Bndtools
+Bundle-Copyright: Copyright Gregory Amerson others, 2016
+
+Bundle-Category bndtools
+
+Require-Capability \
+    feature;name=org.eclipse.m2e.feature;version=2.0.0, \
+    feature;name=bndtools.main.feature
+
+
+-runbundles \
+    bndtools.m2e, \
+    biz.aQute.bnd.maven
+

org.bndtools.p2/bndtools.main.feature.bndrun

@@ -0,0 +1,35 @@
+Bundle-Name:            Bndtools
+Bundle-Description:     OSGi Development Tools for Eclipse based on bnd.
+Bundle-Category         bndtools
+Bundle-Copyright: Copyright Neil Bartlett and others, 2011 \
+	This software uses icons from the FamFamFam \"Silk\" icon set by Mark James (http://www.famfamfam.com/lab/icons/silk/)
+
+Require-Capability \
+    feature;name=org.eclipse.platform;version=4.25.0
+
+-runbundles \
+	biz.aQute.bnd.util, \
+	biz.aQute.bndlib, \
+	biz.aQute.repository, \
+	biz.aQute.resolve, \
+	bndtools.api, \
+	bndtools.core, \
+	bndtools.core.services, \
+	bndtools.builder, \
+	bndtools.jareditor, \
+	bndtools.release, \
+	biz.aQute.bnd.embedded-repo, \
+	org.bndtools.headless.build.manager, \
+	org.bndtools.headless.build.plugin.ant, \
+	org.bndtools.headless.build.plugin.gradle, \
+	org.bndtools.launch, \
+	org.bndtools.remoteinstall, \
+	org.bndtools.versioncontrol.ignores.manager, \
+	org.bndtools.versioncontrol.ignores.plugin.git, \
+	org.bndtools.templating, \
+	org.bndtools.templating.gitrepo, \
+	org.slf4j.api, \
+	org.osgi.service.coordinator, \
+	org.osgi.service.repository, \
+	org.osgi.util.function, \
+	org.osgi.util.promise

org.bndtools.p2/bndtools.pde.feature.bndrun

@@ -0,0 +1,11 @@
+Bundle-Name:            Bndtools PDE
+Bundle-Description:     PDE integration for Bndtools
+Bundle-Category         bndtools
+Bundle-Copyright: Copyright Elias N Vasylenko and others, 2017
+
+Require-Capability \
+    feature;name=org.eclipse.pde;version=3.14.1300, \
+    feature;name=bndtools.main.feature 
+
+-runbundles \
+    bndtools.pde