demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Upgrade to Karaf 4.4.4 (#3814)

Browse Source 
* Sync runtime dependencies with Karaf 4.4.4, most notably:
  * Jetty 9.4.52.v20230823
  * JNA 5.13.0
  * SLF4J 2.0.6
  * Pax Logging 2.2.3
  * Pax Web 8.0.22
* Resolve itest runbundles
* Use new Pax Web features to simplify dependency management
* Add specs features because Pax Web now depends on "asm"

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2023-09-29 20:23:31 +02:00
committed by GitHub
parent af4fce1e4f
commit d4a433a4ce
36 changed files with 688 additions and 589 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/karaf/openhab-core/pom.xml
+2 -2
View File
@@ -16,8 +16,8 @@
<description>openHAB Core Features</description>
<properties>
<jetty.version>9.4.50.v20221201</jetty.version>
<jna.version>5.12.1</jna.version>
<jetty.version>9.4.52.v20230823</jetty.version>
<jna.version>5.13.0</jna.version>
</properties>
<build>
features/karaf/openhab-core/src/main/feature/feature.xml
+5 -16
View File
@@ -47,15 +47,13 @@
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.config.dispatch/${project.version}</bundle>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core/${project.version}</bundle>
<bundle>mvn:org.openhab.osgiify/io.methvin.directory-watcher/0.18.0</bundle>
<bundle>mvn:net.java.dev.jna/jna/5.12.1</bundle>
<bundle>mvn:net.java.dev.jna/jna-platform/5.12.1</bundle>
<feature dependency="true">openhab-core-storage-json</feature>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.addon/${project.version}</bundle>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.ephemeris/${project.version}</bundle>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.id/${project.version}</bundle>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.persistence/${project.version}</bundle>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.semantics/${project.version}</bundle>
<feature dependency="true">openhab.tp-asm</feature>
<feature dependency="true">asm</feature>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.thing/${project.version}</bundle>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.transform/${project.version}</bundle>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.audio/${project.version}</bundle>
@@ -183,9 +181,7 @@
<feature name="openhab-core-io-websocket" version="${project.version}">
<feature>openhab-core-base</feature>
<feature dependency="true">openhab-core-io-rest-auth</feature>
<bundle>mvn:org.eclipse.jetty.websocket/websocket-servlet/${jetty.version}</bundle>
<bundle>mvn:org.eclipse.jetty.websocket/websocket-server/${jetty.version}</bundle>
<feature dependency="true">pax-web-jetty-websockets</feature>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.websocket/${project.version}</bundle>
</feature>
@@ -445,16 +441,9 @@
<feature name="openhab-transport-http" description="HTTP Transport" version="${project.version}">
<capability>openhab.tp;feature=httpclient;version=${jetty.version}</capability>
<feature>openhab-core-auth-oauth2client</feature>
<bundle dependency="true">mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty/jetty-client/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty/jetty-http/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty/jetty-util/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty/jetty-io/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty/jetty-proxy/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty.websocket/websocket-api/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty.websocket/websocket-common/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty.websocket/websocket-client/${jetty.version}</bundle>
<feature dependency="true">openhab-core-auth-oauth2client</feature>
<feature dependency="true">pax-web-jetty-extras</feature>
<feature dependency="true">pax-web-jetty-websockets</feature>
</feature>
<feature name="openhab-transport-mdns" description="mDNS Transport" version="${project.version}">
features/karaf/openhab-tp/pom.xml
+2 -2
View File
@@ -15,8 +15,8 @@
<name>openHAB Core :: Features :: Karaf :: Target Platform</name>
<properties>
<jetty.version>9.4.50.v20221201</jetty.version>
<jna.version>5.12.1</jna.version>
<jetty.version>9.4.52.v20230823</jetty.version>
<jna.version>5.13.0</jna.version>
</properties>
<build>
features/karaf/openhab-tp/src/main/feature/feature.xml
+10 -30
View File
@@ -72,20 +72,10 @@
<feature name="openhab.tp-httpclient" version="${project.version}">
<capability>openhab.tp;feature=httpclient;version=${jetty.version}</capability>
<feature dependency="true">pax-web-jetty-extras</feature>
<feature dependency="true">pax-web-jetty-http2</feature>
<feature dependency="true">pax-web-jetty-http2-jdk9</feature>
<bundle dependency="true">mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty/jetty-alpn-client/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty/jetty-alpn-java-client/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty/jetty-client/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty/jetty-http/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty/jetty-util/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty/jetty-io/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty/jetty-proxy/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty.http2/http2-client/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty.websocket/websocket-api/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty.websocket/websocket-common/${jetty.version}</bundle>
<bundle dependency="true">mvn:org.eclipse.jetty.websocket/websocket-client/${jetty.version}</bundle>
<feature dependency="true">pax-web-jetty-http2-extras</feature>
<feature dependency="true">pax-web-jetty-websockets</feature>
</feature>
<feature name="openhab.tp-jackson" description="FasterXML Jackson bundles" version="${project.version}">
@@ -103,25 +93,15 @@
<bundle dependency="true">mvn:org.yaml/snakeyaml/2.1</bundle>
</feature>
<feature name="openhab.tp-asm" description="ASM bundles" version="${project.version}">
<capability>openhab.tp;feature=asm;version=9.4.0</capability>
<bundle dependency="true">mvn:org.ow2.asm/asm/9.4</bundle>
<bundle dependency="true">mvn:org.ow2.asm/asm-analysis/9.4</bundle>
<bundle dependency="true">mvn:org.ow2.asm/asm-commons/9.4</bundle>
<bundle dependency="true">mvn:org.ow2.asm/asm-util/9.4</bundle>
<bundle dependency="true">mvn:org.ow2.asm/asm-tree/9.4</bundle>
</feature>
<feature name="openhab.tp-jax-rs-whiteboard" description="Aries JAX-RS Whiteboard" version="${project.version}">
<capability>openhab.tp;feature=jax-rs-whiteboard;version=2.0.0</capability>
<feature>http-whiteboard</feature>
<feature dependency="true">openhab.tp-asm</feature>
<feature dependency="true">spifly</feature>
<feature dependency="true">http-whiteboard</feature>
<feature dependency="true">openhab.tp-cxf</feature>
<feature dependency="true">openhab.tp-jaxb</feature>
<bundle dependency="true">mvn:org.osgi/org.osgi.util.function/1.1.0</bundle>
<bundle dependency="true">mvn:org.osgi/org.osgi.util.promise/1.1.1</bundle>
<bundle dependency="true">mvn:org.osgi/org.osgi.service.jaxrs/1.0.0</bundle>
<bundle dependency="true">mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.3.6</bundle>
<bundle dependency="true">mvn:org.osgi/org.osgi.util.function/1.2.0</bundle>
<bundle dependency="true">mvn:org.osgi/org.osgi.util.promise/1.3.0</bundle>
<bundle dependency="true">mvn:org.osgi/org.osgi.service.jaxrs/1.0.1</bundle>
<bundle>mvn:org.apache.aries.component-dsl/org.apache.aries.component-dsl.component-dsl/1.2.2</bundle>
<bundle>mvn:org.apache.aries.jax.rs/org.apache.aries.jax.rs.whiteboard/2.0.0</bundle>
</feature>
@@ -176,10 +156,10 @@
</feature>
<feature name="openhab.tp-jaxb" description="JAXB bundles" version="${project.version}">
<capability>openhab.tp;feature=jaxb;version=2.3.3</capability>
<capability>openhab.tp;feature=jaxb;version=2.3.8</capability>
<bundle start-level="10">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.2.1/1.2.1_3</bundle>
<bundle start-level="10">mvn:jakarta.xml.bind/jakarta.xml.bind-api/2.3.3</bundle>
<bundle start-level="20">mvn:com.sun.xml.bind/jaxb-osgi/2.3.3</bundle>
<bundle start-level="20">mvn:com.sun.xml.bind/jaxb-osgi/2.3.8</bundle>
<bundle start-level="20">mvn:org.glassfish.hk2/osgi-resource-locator/1.0.3</bundle>
</feature>
features/karaf/pom.xml
+1
View File
@@ -84,6 +84,7 @@
<!-- Apache Karaf -->
<descriptor>mvn:org.apache.karaf.features/framework/${karaf.tooling.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.karaf.features/standard/${karaf.tooling.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.karaf.features/specs/${karaf.tooling.version}/xml/features</descriptor>
<!-- Current feature under verification -->
<descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
</descriptors>