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.3 (#3252)

Browse Source 
* Sync runtime dependencies with Karaf 4.4.3, most notably:
  * Jetty 9.4.50.v20221201
  * Pax Logging 2.2.0
  * Pax Web 8.0.15
* Use OSGi R8 as compile dependency
* Rework Servlets to use Http Whiteboard annotations in favor of proprietary `org.openhab.core.io.http.servlet` classes
* Resolve itest runbundles

Also-by: Jan N. Klug <github@klug.nrw>

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2023-03-01 13:09:07 +01:00
committed by GitHub
parent 5544945d48
commit ec3af50f11
48 changed files with 604 additions and 750 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/karaf/openhab-core/pom.xml
+2 -1
View File
@@ -16,7 +16,8 @@
<description>openHAB Core Features</description>
<properties>
<jetty.version>9.4.46.v20220331</jetty.version>
<jetty.version>9.4.50.v20221201</jetty.version>
<jna.version>5.12.1</jna.version>
</properties>
<build>
features/karaf/openhab-core/src/main/feature/feature.xml
+2
View File
@@ -180,6 +180,8 @@
<feature name="openhab-core-io-websocket" version="${project.version}">
<feature>openhab-core-base</feature>
<bundle>mvn:org.eclipse.jetty.websocket/websocket-servlet/${jetty.version}</bundle>
<bundle>mvn:org.eclipse.jetty.websocket/websocket-server/${jetty.version}</bundle>
<bundle>mvn:org.openhab.core.bundles/org.openhab.core.io.websocket/${project.version}</bundle>
</feature>
features/karaf/openhab-tp/pom.xml
+1 -1
View File
@@ -15,7 +15,7 @@
<name>openHAB Core :: Features :: Karaf :: Target Platform</name>
<properties>
<jetty.version>9.4.46.v20220331</jetty.version>
<jetty.version>9.4.50.v20221201</jetty.version>
<jna.version>5.12.1</jna.version>
</properties>
features/karaf/openhab-tp/src/main/feature/feature.xml
+12 -1
View File
@@ -21,7 +21,7 @@
<feature>scr</feature>
<feature>eventadmin</feature>
<feature>log</feature>
<feature>pax-web-jetty-extras</feature>
<!-- Apache Commons -->
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.12.0</bundle>
@@ -97,14 +97,25 @@
<bundle dependency="true">mvn:org.yaml/snakeyaml/1.33</bundle>
</feature>
<feature name="openhab.tp-asm" description="ASM bundles" version="${project.version}">
<capability>openhab.tp;feature=asm;version=9.2.0</capability>
<bundle dependency="true">mvn:org.ow2.asm/asm/9.2</bundle>
<bundle dependency="true">mvn:org.ow2.asm/asm-analysis/9.2</bundle>
<bundle dependency="true">mvn:org.ow2.asm/asm-commons/9.2</bundle>
<bundle dependency="true">mvn:org.ow2.asm/asm-util/9.2</bundle>
<bundle dependency="true">mvn:org.ow2.asm/asm-tree/9.2</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">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.4</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>