From e1fc885327a3a3b610bd85c2eb775b93c96d73f8 Mon Sep 17 00:00:00 2001
From: Raphael Schweikert <Raphael.Schweikert1@swisscom.com>
Date: Fri, 31 May 2024 10:49:35 +0200
Subject: [PATCH] fix: read exported package version from packageinfo file

---
 spi-fly/pom.xml                       |  5 +++++
 spi-fly/spi-fly-static-bundle/pom.xml | 20 +++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/spi-fly/pom.xml b/spi-fly/pom.xml
index b0d1ebc462..b9df751385 100644
--- a/spi-fly/pom.xml
+++ b/spi-fly/pom.xml
@@ -154,6 +154,11 @@
                         </includes>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>properties-maven-plugin</artifactId>
+                    <version>1.2.1</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
diff --git a/spi-fly/spi-fly-static-bundle/pom.xml b/spi-fly/spi-fly-static-bundle/pom.xml
index b7bd110ed3..9c8401d3c2 100644
--- a/spi-fly/spi-fly-static-bundle/pom.xml
+++ b/spi-fly/spi-fly-static-bundle/pom.xml
@@ -78,6 +78,24 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>properties-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>read-project-properties</goal>
+                        </goals>
+                        <configuration>
+                            <files>
+                                <file>../spi-fly-core/src/main/resources/org/apache/aries/spifly/packageinfo</file>
+                            </files>
+                            <keyPrefix>spiFlyPackage.</keyPrefix>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>biz.aQute.bnd</groupId>
                 <artifactId>bnd-maven-plugin</artifactId>
@@ -86,7 +104,7 @@
                     <bnd><![CDATA[
                     Bundle-Activator: org.apache.aries.spifly.staticbundle.StaticWeavingActivator
                     Export-Package: \
-                        org.apache.aries.spifly.*;version=${project.version}
+                        org.apache.aries.spifly.*;version=${spiFlyPackage.version}
                     -conditionalpackage: \
                         aQute.bnd.exceptions,\
                         aQute.bnd.header,\