Upgrade Karaf from 4.4.7 to 4.4.8 (#4932)

* Upgrade Karaf from 4.4.7 to 4.4.8
* Upgrade Xtext/Xtend from 2.37.0 to 2.39.0
* Sync runtime dependencies with Karaf 4.4.7, most notably:
  * PaxWeb 8.0.33
  * commons-fileupload 1.6.0
  * commons-io 2.20.0
  * commons-lang3 3.18.0
  * JNA 5.17.0
  * XBean 4.27
  * Guava 33.4.8
  * ASM 9.8
  * PaxLogging 2.3.0
  * Bouncy Castle 1.81
  * lsp4j 0.24.0
  * emf.common 2.30.0
  * emf.ecore 2.36
  * emf.ecore.change 2.16.0
  * emf.ecore.xmi 2.37.0
  * guava.failureaccess 1.0.3
  * jose4j 0.9.6
  * logback 1.5.18
* Resolve itest runbundles
* Modularize imports

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
This commit is contained in:
Holger Friedrich
2025-08-09 21:25:39 +02:00
committed by GitHub
parent 9cff9f5248
commit b8e3dd047d
37 changed files with 276 additions and 259 deletions
+1 -1
View File
@@ -17,7 +17,7 @@
<properties>
<jetty.version>9.4.57.v20241219</jetty.version>
<jna.version>5.16.0</jna.version>
<jna.version>5.17.0</jna.version>
</properties>
<build>
@@ -28,7 +28,7 @@
<feature dependency="true">openhab.tp-gson</feature>
<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.37.0)(!(version&gt;=2.38.0)))"</requirement>
<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.39.0)(!(version&gt;=2.40.0)))"</requirement>
<feature dependency="true">openhab.tp-xtext</feature>
<requirement>openhab.tp;filter:="(feature=jax-rs-whiteboard)"</requirement>
@@ -406,10 +406,10 @@
<feature name="openhab-core-model-lsp" version="${project.version}">
<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.37.0)(!(version&gt;=2.38.0)))"</requirement>
<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.39.0)(!(version&gt;=2.40.0)))"</requirement>
<feature dependency="true">openhab.tp-xtext-ide</feature>
<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.23.1)(!(version&gt;=0.24.0)))"</requirement>
<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.24.0)(!(version&gt;=0.24.1)))"</requirement>
<feature dependency="true">openhab.tp-lsp4j</feature>
<feature>openhab-core-model-item-ide</feature>
+1 -1
View File
@@ -16,7 +16,7 @@
<properties>
<jetty.version>9.4.57.v20241219</jetty.version>
<jna.version>5.16.0</jna.version>
<jna.version>5.17.0</jna.version>
</properties>
<build>
@@ -23,7 +23,7 @@
<feature>log</feature>
<feature>pax-web-jetty-extras</feature>
<!-- Apache Commons -->
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.17.0</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.18.0</bundle>
<!-- Measurement -->
<bundle dependency="true">mvn:jakarta.annotation/jakarta.annotation-api/2.1.1</bundle>
<bundle dependency="true">mvn:jakarta.inject/jakarta.inject-api/1.0.5</bundle>
@@ -47,7 +47,7 @@
<bundle>mvn:org.eclipse.californium/element-connector/4.0.0-M2</bundle>
<bundle>mvn:org.eclipse.californium/scandium/4.0.0-M2</bundle>
<bundle dependency="true">mvn:org.slf4j/jul-to-slf4j/2.0.16</bundle>
<bundle dependency="true">mvn:org.bouncycastle/bcprov-jdk18on/1.78.1</bundle>
<bundle dependency="true">mvn:org.bouncycastle/bcprov-jdk18on/1.81</bundle>
</feature>
<feature name="openhab.tp-commons-net" description="The Apache Commons Net library" version="${project.version}">
@@ -204,9 +204,9 @@
</feature>
<feature name="openhab.tp-lsp4j" description="Eclipse LSP4J" version="${project.version}">
<capability>openhab.tp;feature=lsp4j;version=0.23.1</capability>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.23.1</bundle>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.23.1</bundle>
<capability>openhab.tp;feature=lsp4j;version=0.24.0</capability>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.24.0</bundle>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.24.0</bundle>
<feature dependency="true">openhab.tp-gson</feature>
<feature dependency="true">openhab.tp-xtext</feature>
@@ -230,10 +230,10 @@
<bundle>mvn:org.eclipse.xtext/org.eclipse.xtext/${xtext.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.common/2.24.0</bundle>
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore/2.26.0</bundle>
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore.change/2.14.0</bundle>
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore.xmi/2.16.0</bundle>
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.common/2.30.0</bundle>
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore/2.36.0</bundle>
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore.change/2.16.0</bundle>
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore.xmi/2.37.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.common.types/${xtext.version}</bundle>
<bundle dependency="true">mvn:javax.annotation/javax.annotation-api/1.3.2</bundle>
@@ -245,8 +245,8 @@
<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib/${xtext.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/${xtext.version}</bundle>
<bundle dependency="true">mvn:com.google.guava/failureaccess/1.0.2</bundle>
<bundle dependency="true">mvn:com.google.guava/guava/33.3.1-jre</bundle>
<bundle dependency="true">mvn:com.google.guava/failureaccess/1.0.3</bundle>
<bundle dependency="true">mvn:com.google.guava/guava/33.4.8-jre</bundle>
<bundle dependency="true">mvn:com.google.inject/guice/7.0.0</bundle>
<bundle dependency="true">mvn:jakarta.inject/jakarta.inject-api/2.0.1</bundle>
@@ -254,12 +254,12 @@
<bundle dependency="true">mvn:io.github.classgraph/classgraph/4.8.176</bundle>
<bundle dependency="true">mvn:org.eclipse.orbit.bundles/org.antlr.runtime/3.2.0.v201101311130</bundle>
<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.common/3.18.0</bundle>
<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.registry/3.9.0</bundle>
<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.common/3.19.0</bundle>
<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.registry/3.12.0</bundle>
<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.supplement/1.9.0</bundle>
<!-- Used for feature verification only because this is already provided by Karaf -->
<bundle dependency="true" start="false">mvn:org.eclipse.platform/org.eclipse.osgi/3.18.0</bundle>
<bundle dependency="true" start="false">mvn:org.eclipse.platform/org.eclipse.osgi/3.19.0</bundle>
</feature>
<feature name="openhab.tp-xtext-ide" description="Xtext - IDE Support" version="${project.version}">