Emmanuel Bourg pushed to branch master at Debian Java Maintainers / bnd
Commits:
a502e0be by Emmanuel Bourg at 2026-10-23T11:56:21+02:00
Install the Gradle plugin markers
- - - - -
5 changed files:
- debian/bnd.poms
- debian/changelog
- debian/gradle.ignoreRules
- debian/patches/gradle-plugin-subproject.patch
- debian/rules
Changes:
=====================================
debian/bnd.poms
=====================================
@@ -2,6 +2,9 @@
debian/.m2/repository/biz/aQute/bnd/aQute.libg/6.4.1/aQute.libg-6.4.1.pom
debian/.m2/repository/biz/aQute/bnd/biz.aQute.bnd.annotation/6.4.1/biz.aQute.bnd.annotation-6.4.1.pom
--java-lib
--artifact=debian/.m2/repository/biz/aQute/bnd/biz.aQute.bnd.annotation/6.4.1/biz.aQute.bnd.annotation-6.4.1.jar
--usj-name=bnd-annotation
--relocate=biz.aQute:annotation:debian,biz.aQute.bnd:annotation:debian
debian/.m2/repository/biz/aQute/bnd/biz.aQute.bnd/6.4.1/biz.aQute.bnd-6.4.1.pom
--java-lib
--artifact=debian/.m2/repository/biz/aQute/bnd/biz.aQute.bnd/6.4.1/biz.aQute.bnd-6.4.1.jar
--usj-name=bnd
--relocate=biz.aQute:bnd:debian,biz.aQute.bnd:bnd:debian
gradle-plugins/biz.aQute.bnd.gradle/build/debian/biz.aQute.bnd.gradle.pom
--java-lib
--artifact=gradle-plugins/biz.aQute.bnd.gradle/build/libs/biz.aQute.bnd.gradle-6.4.1.jar
--usj-name=bnd-gradle
+gradle-plugins/biz.aQute.bnd.gradle/build/publications/BndPluginMarkerMaven/pom-default.xml
+gradle-plugins/biz.aQute.bnd.gradle/build/publications/BndBuilderPluginMarkerMaven/pom-default.xml
+gradle-plugins/biz.aQute.bnd.gradle/build/publications/BndWorkspacePluginMarkerMaven/pom-default.xml
debian/.m2/repository/biz/aQute/bnd/biz.aQute.bnd.util/6.4.1/biz.aQute.bnd.util-6.4.1.pom
--java-lib
--artifact=debian/.m2/repository/biz/aQute/bnd/biz.aQute.bnd.util/6.4.1/biz.aQute.bnd.util-6.4.1.jar
--usj-name=bnd-util
debian/.m2/repository/biz/aQute/bnd/biz.aQute.bndlib/6.4.1/biz.aQute.bndlib-6.4.1.pom
--java-lib
--artifact=debian/.m2/repository/biz/aQute/bnd/biz.aQute.bndlib/6.4.1/biz.aQute.bndlib-6.4.1.jar
--usj-name=bndlib
--relocate=biz.aQute:bndlib:debian,biz.aQute.bnd:bndlib:debian
debian/.m2/repository/biz/aQute/bnd/biz.aQute.junit/6.4.1/biz.aQute.junit-6.4.1.pom
--java-lib
--artifact=debian/.m2/repository/biz/aQute/bnd/biz.aQute.junit/6.4.1/biz.aQute.junit-6.4.1.jar
--usj-name=bnd-junit
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+bnd (6.4.1-3) unstable; urgency=medium
+
+ * Install the Gradle plugin markers
+
+ -- Emmanuel Bourg <[email protected]> Fri, 23 Oct 2026 11:56:05 +0200
+
bnd (6.4.1-2) unstable; urgency=medium
* Build and install biz.aQute.bnd.maven and biz.aQute.bnd.embedded-repo
=====================================
debian/gradle.ignoreRules
=====================================
@@ -1,3 +1,2 @@
# plugin configuration blocks
com.gradle.plugin-publish pluginBundle
-maven-publish publishing
=====================================
debian/patches/gradle-plugin-subproject.patch
=====================================
@@ -7,7 +7,7 @@ Author: Emmanuel Bourg <[email protected]>
Forwarded: not-needed
--- a/settings.gradle
+++ b/settings.gradle
-@@ -73,5 +73,7 @@
+@@ -63,5 +63,7 @@
apply plugin: "biz.aQute.bnd.workspace"
@@ -18,7 +18,7 @@ Forwarded: not-needed
--- /dev/null
+++ b/gradle-plugins/biz.aQute.bnd.gradle/build.gradle
-@@ -0,0 +1,35 @@
+@@ -0,0 +1,49 @@
+/*
+ * Build script for the bnd Gradle plugin.
+ *
@@ -26,7 +26,8 @@ Forwarded: not-needed
+ * the Gradle of Debian cannot configure. This script builds it as a project
of
+ * the main build, as bnd 5.3.0 did.
+ */
-+apply plugin: 'java'
++apply plugin: 'java-gradle-plugin'
++apply plugin: 'maven-publish'
+
+group = 'biz.aQute.bnd'
+version = System.getenv('VERSION')
@@ -50,7 +51,20 @@ Forwarded: not-needed
+ implementation project(':biz.aQute.resolve')
+}
+
-+/* The plugin descriptors are generated by the gradlePlugin block upstream */
-+jar {
-+ from rootProject.file('debian/gradle-plugins')
++/* Generates the plugin descriptors, and the plugin markers with
maven-publish */
++gradlePlugin {
++ plugins {
++ Bnd {
++ id = 'biz.aQute.bnd'
++ implementationClass = 'aQute.bnd.gradle.BndPlugin'
++ }
++ BndBuilder {
++ id = 'biz.aQute.bnd.builder'
++ implementationClass = 'aQute.bnd.gradle.BndBuilderPlugin'
++ }
++ BndWorkspace {
++ id = 'biz.aQute.bnd.workspace'
++ implementationClass = 'aQute.bnd.gradle.BndWorkspacePlugin'
++ }
++ }
+}
=====================================
debian/rules
=====================================
@@ -137,6 +137,9 @@ override_dh_auto_build:
sed -i -e "s,Timestamp:.*,Timestamp: $(SOURCE_DATE_EPOCH),g"
biz.aQute.bnd.embedded-repo/bnd/embedded-repo.bnd
dh_auto_build -- :biz.aQute.bnd:assemble \
:biz.aQute.bnd.gradle:assemble \
+
:biz.aQute.bnd.gradle:generatePomFileForBndPluginMarkerMavenPublication \
+
:biz.aQute.bnd.gradle:generatePomFileForBndBuilderPluginMarkerMavenPublication \
+
:biz.aQute.bnd.gradle:generatePomFileForBndWorkspacePluginMarkerMavenPublication
\
:biz.aQute.bnd.maven:assemble \
:biz.aQute.launcher:assemble \
:biz.aQute.junit:assemble \
View it on GitLab:
https://salsa.debian.org/java-team/bnd/-/commit/a502e0bee779bda11ad666b72d7f02394f784407
--
View it on GitLab:
https://salsa.debian.org/java-team/bnd/-/commit/a502e0bee779bda11ad666b72d7f02394f784407
You're receiving this email because of your account on salsa.debian.org. Manage
all notifications: https://salsa.debian.org/-/profile/notifications | Help:
https://salsa.debian.org/help
_______________________________________________
pkg-java-commits mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
