Maven build - OSGi Bundle-Version fix (#2232)

Fixes #2221

Signed-off-by: Radek Felcman <[email protected]>

pom.xml

@@ -108,7 +108,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.subdirectory>test-reports</project.build.testReports.subdirectory>
         <project.build.testReports.summaryFile>test-summary</project.build.testReports.summaryFile>
         <project.build.licenceResourceDirectory>${project.build.directory}/license</project.build.licenceResourceDirectory>
@@ -1453,6 +1453,7 @@
                         <Bundle-Version>${release.version}.v${build.date}${build.time}</Bundle-Version>
                         <Automatic-Module-Name>${project.artifactId}</Automatic-Module-Name>
                         <HK2-Bundle-Name>${project.groupId}:${project.artifactId}</HK2-Bundle-Name>
+                        <Bundle-Version>${bundle.version}</Bundle-Version>
                     </instructions>
                 </configuration>
                 <executions>