From a7b2199201fb826f3954110ca6665e5033509a14 Mon Sep 17 00:00:00 2001
From: Radek Felcman <radek.felcman@oracle.com>
Date: Fri, 9 Aug 2024 09:08:29 +0200
Subject: [PATCH] Maven build - OSGi Bundle-Version fix (#2230) (#2231)

Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
(cherry picked from commit efbce400392c65c9440641ceae74889e157173fd)
---
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 94dc0ccdc6..ad6b61d43a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,7 @@
         <build.type>SNAPSHOT</build.type>
         <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
         <build.qualifier>v${maven.build.timestamp}</build.qualifier>
-        <bundle.version>${project.version}.${build.qualifier}</bundle.version>
+        <bundle.version>${release.version}.${build.qualifier}</bundle.version>
         <project.build.testReports.settings>test-report-settings/surefire-report.properties</project.build.testReports.settings>
         <project.build.testReports.subdirectory>test-reports</project.build.testReports.subdirectory>
         <project.build.testReports.summaryFile>test-summary</project.build.testReports.summaryFile>
@@ -1658,6 +1658,7 @@
                         <_noextraheaders>true</_noextraheaders>
                         <_noimportjava>true</_noimportjava>
                         <HK2-Bundle-Name>${project.groupId}:${project.artifactId}</HK2-Bundle-Name>
+                        <Bundle-Version>${bundle.version}</Bundle-Version>
                     </instructions>
                 </configuration>
                 <executions>