This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.4.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.4.x by this push:
new 734e36bbfe Upgrade org.eclipse.osgi from 3.18.0 to 3.18.600 (#2893)
734e36bbfe is described below
commit 734e36bbfec9d7a16b4e2d709a4c941ec62f866a
Author: Holger Friedrich <[email protected]>
AuthorDate: Sun Sep 13 07:32:37 2026 +0200
Upgrade org.eclipse.osgi from 3.18.0 to 3.18.600 (#2893)
---
main/src/main/java/org/apache/karaf/main/Main.java | 9 ++++++++-
pom.xml | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/main/src/main/java/org/apache/karaf/main/Main.java
b/main/src/main/java/org/apache/karaf/main/Main.java
index 0793861883..2fe5717216 100644
--- a/main/src/main/java/org/apache/karaf/main/Main.java
+++ b/main/src/main/java/org/apache/karaf/main/Main.java
@@ -537,7 +537,14 @@ public class Main {
if (factoryClass == null) {
InputStream is =
classLoader.getResourceAsStream("META-INF/services/" +
FrameworkFactory.class.getName());
BufferedReader br = new BufferedReader(new InputStreamReader(is,
StandardCharsets.UTF_8));
- factoryClass = br.readLine();
+ String line;
+ while ((line = br.readLine()) != null) {
+ line = line.trim();
+ if (!line.isEmpty() && !line.startsWith("#")) {
+ factoryClass = line;
+ break;
+ }
+ }
br.close();
}
FrameworkFactory factory = (FrameworkFactory)
classLoader.loadClass(factoryClass).newInstance();
diff --git a/pom.xml b/pom.xml
index b50f07a710..8932c64389 100644
--- a/pom.xml
+++ b/pom.xml
@@ -202,7 +202,7 @@
<easymock.version>5.7.0</easymock.version>
<equinox.groupId>org.eclipse.platform</equinox.groupId>
<equinox.artifactId>org.eclipse.osgi</equinox.artifactId>
- <equinox.version>3.18.0</equinox.version>
+ <equinox.version>3.18.600</equinox.version>
<equinox.region.version>1.5.800</equinox.region.version>
<equinox.coordinator.version>1.5.500</equinox.coordinator.version>
