From 493cfa5a62383579e8256f5f4602b7076f30438b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20R=C3=BCtter?= <paul@blueconic.com>
Date: Thu, 5 Nov 2026 10:36:48 +0100
Subject: [PATCH] FELIX-6872 - Dependency Manager: tag every released bundle

The release plugin only makes one tag for the whole reactor
(dependencymanager-parent-x.y.z). While performing a release, also tag each
released bundle as <artifactId>-<version> on the release commit and push the
tag, like the earlier releases did.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 .../pom.xml                                   |  5 ++
 .../pom.xml                                   |  5 ++
 .../pom.xml                                   |  5 ++
 .../pom.xml                                   |  5 ++
 .../pom.xml                                   |  5 ++
 dependencymanager/pom.xml                     | 62 +++++++++++++++++++
 6 files changed, 87 insertions(+)

diff --git a/dependencymanager/org.apache.felix.dependencymanager.annotation/pom.xml b/dependencymanager/org.apache.felix.dependencymanager.annotation/pom.xml
index 977c15508e..531634a63f 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.annotation/pom.xml
+++ b/dependencymanager/org.apache.felix.dependencymanager.annotation/pom.xml
@@ -83,6 +83,11 @@
                     </instructions>
                 </configuration>
             </plugin>
+            <plugin>
+                <!-- tags this bundle as <artifactId>-<version> when a release is performed, see the parent pom -->
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/dependencymanager/org.apache.felix.dependencymanager.lambda/pom.xml b/dependencymanager/org.apache.felix.dependencymanager.lambda/pom.xml
index 9806760294..fc161eeeee 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.lambda/pom.xml
+++ b/dependencymanager/org.apache.felix.dependencymanager.lambda/pom.xml
@@ -88,6 +88,11 @@
                     </instructions>
                 </configuration>
             </plugin>
+            <plugin>
+                <!-- tags this bundle as <artifactId>-<version> when a release is performed, see the parent pom -->
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime/pom.xml b/dependencymanager/org.apache.felix.dependencymanager.runtime/pom.xml
index 4ade11c2c8..788bcf33f0 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.runtime/pom.xml
+++ b/dependencymanager/org.apache.felix.dependencymanager.runtime/pom.xml
@@ -84,6 +84,11 @@
                     </instructions>
                 </configuration>
             </plugin>
+            <plugin>
+                <!-- tags this bundle as <artifactId>-<version> when a release is performed, see the parent pom -->
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/dependencymanager/org.apache.felix.dependencymanager.shell/pom.xml b/dependencymanager/org.apache.felix.dependencymanager.shell/pom.xml
index a17330d1d0..9c576b1e5b 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.shell/pom.xml
+++ b/dependencymanager/org.apache.felix.dependencymanager.shell/pom.xml
@@ -96,6 +96,11 @@
                     </instructions>
                 </configuration>
             </plugin>
+            <plugin>
+                <!-- tags this bundle as <artifactId>-<version> when a release is performed, see the parent pom -->
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/dependencymanager/org.apache.felix.dependencymanager/pom.xml b/dependencymanager/org.apache.felix.dependencymanager/pom.xml
index b22744ab5b..2e9a1c9a18 100644
--- a/dependencymanager/org.apache.felix.dependencymanager/pom.xml
+++ b/dependencymanager/org.apache.felix.dependencymanager/pom.xml
@@ -105,6 +105,11 @@
                     </instructions>
                 </configuration>
             </plugin>
+            <plugin>
+                <!-- tags this bundle as <artifactId>-<version> when a release is performed, see the parent pom -->
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/dependencymanager/pom.xml b/dependencymanager/pom.xml
index a03dcd0d19..11ce9f12cd 100644
--- a/dependencymanager/pom.xml
+++ b/dependencymanager/pom.xml
@@ -80,6 +80,8 @@
         <log.version>1.3.2</log.version>
         <metatype.version>1.2.4</metatype.version>
         <servicemix.junit.version>4.13.2_1</servicemix.junit.version>
+        <!-- set to false by the performRelease profile, see tag-bundles below -->
+        <dependencymanager.tag.skip>true</dependencymanager.tag.skip>
     </properties>
 
     <dependencyManagement>
@@ -190,7 +192,67 @@
                         </execution>
                     </executions>
                 </plugin>
+                <!--
+                    The release plugin makes one tag for the whole reactor (dependencymanager-parent-x.y.z). On top
+                    of that every released bundle gets its own tag, <artifactId>-<version>, like the earlier releases.
+                    Only the bundles that list this plugin in their build are tagged, and only while performing a
+                    release: release:perform builds the tag that was just made, so HEAD of its checkout is the release.
+                -->
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>exec-maven-plugin</artifactId>
+                    <version>3.5.0</version>
+                    <configuration>
+                        <skip>${dependencymanager.tag.skip}</skip>
+                        <executable>git</executable>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>tag-bundle</id>
+                            <phase>deploy</phase>
+                            <goals>
+                                <goal>exec</goal>
+                            </goals>
+                            <configuration>
+                                <arguments>
+                                    <argument>tag</argument>
+                                    <argument>${project.artifactId}-${project.version}</argument>
+                                </arguments>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>push-bundle-tag</id>
+                            <phase>deploy</phase>
+                            <goals>
+                                <goal>exec</goal>
+                            </goals>
+                            <configuration>
+                                <arguments>
+                                    <argument>push</argument>
+                                    <argument>origin</argument>
+                                    <argument>refs/tags/${project.artifactId}-${project.version}</argument>
+                                </arguments>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>
+
+    <profiles>
+        <profile>
+            <!-- release:perform sets performRelease -->
+            <id>tag-bundles</id>
+            <activation>
+                <property>
+                    <name>performRelease</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <properties>
+                <dependencymanager.tag.skip>false</dependencymanager.tag.skip>
+            </properties>
+        </profile>
+    </profiles>
 </project>