This is an automated email from the ASF dual-hosted git repository.
holgerfriedrich pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new a2bcdf4567 Finish upgrade to felix.framework 7 (#2642)
a2bcdf4567 is described below
commit a2bcdf45672bf734c1bc85df3a9965923d748164
Author: Holger Friedrich <[email protected]>
AuthorDate: Wed May 6 12:52:55 2026 +0200
Finish upgrade to felix.framework 7 (#2642)
- adapt version in tests
- copy jre.properties to make tests work in Windows
---
main/pom.xml | 29 ++++++++++++++++++++--
.../test-karaf-home/etc/config.properties | 2 +-
2 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/main/pom.xml b/main/pom.xml
index 28fd35c805..02e92022e3 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -100,6 +100,31 @@
</resource>
</resources>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-test-jre-properties</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.build.testOutputDirectory}/test-karaf-home/etc</outputDirectory>
+ <resources>
+ <resource>
+
<directory>${project.basedir}/../assemblies/features/base/src/main/filtered-resources/resources/etc</directory>
+ <includes>
+ <include>jre.properties</include>
+ </includes>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -130,8 +155,8 @@
<artifactItem>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>5.6.10</version>
-
<outputDirectory>${project.build.testOutputDirectory}/test-karaf-home/system/org/apache/felix/org.apache.felix.framework/5.6.10</outputDirectory>
+ <version>${felix.framework.version}</version>
+
<outputDirectory>${project.build.testOutputDirectory}/test-karaf-home/system/org/apache/felix/org.apache.felix.framework/${felix.framework.version}</outputDirectory>
</artifactItem>
</artifactItems>
<excludeTransitive>true</excludeTransitive>
diff --git a/main/src/test/resources/test-karaf-home/etc/config.properties
b/main/src/test/resources/test-karaf-home/etc/config.properties
index 38f00e857c..eb723102b2 100755
--- a/main/src/test/resources/test-karaf-home/etc/config.properties
+++ b/main/src/test/resources/test-karaf-home/etc/config.properties
@@ -31,7 +31,7 @@ karaf.framework=felix
#
# Location of the OSGi frameworks
#
-karaf.framework.felix=mvn:org.apache.felix/org.apache.felix.framework/5.6.10
+karaf.framework.felix=mvn:org.apache.felix/org.apache.felix.framework/7.0.5
karaf.shutdown.port.file=${karaf.data}/port
karaf.pid.file=${karaf.base}/karaf.pid
