mirror of
https://github.com/danieldemus/openhab-core.git
synced 2026-07-29 12:34:22 +02:00
Upgrade to Karaf 4.4.3 (#3252)
* 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
+70
-5
@@ -18,7 +18,8 @@
|
||||
|
||||
<properties>
|
||||
<californium.version>2.7.4</californium.version>
|
||||
<jetty.version>9.4.46.v20220331</jetty.version>
|
||||
<jetty.version>9.4.50.v20221201</jetty.version>
|
||||
<pax.web.version>8.0.15</pax.web.version>
|
||||
<swagger.version>2.1.9</swagger.version>
|
||||
</properties>
|
||||
|
||||
@@ -26,17 +27,37 @@
|
||||
<dependency>
|
||||
<groupId>org.osgi</groupId>
|
||||
<artifactId>osgi.core</artifactId>
|
||||
<version>7.0.0</version>
|
||||
<version>8.0.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.osgi</groupId>
|
||||
<artifactId>osgi.cmpn</artifactId>
|
||||
<version>7.0.0</version>
|
||||
<artifactId>org.osgi.service.cm</artifactId>
|
||||
<version>1.6.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.osgi</groupId>
|
||||
<artifactId>org.osgi.service.component</artifactId>
|
||||
<version>1.5.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.osgi</groupId>
|
||||
<artifactId>org.osgi.service.component.annotations</artifactId>
|
||||
<version>1.5.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.osgi</groupId>
|
||||
<artifactId>org.osgi.service.event</artifactId>
|
||||
<version>1.4.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.osgi</groupId>
|
||||
<artifactId>org.osgi.service.jaxrs</artifactId>
|
||||
<version>1.0.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.osgi</groupId>
|
||||
<artifactId>osgi.annotation</artifactId>
|
||||
<version>7.0.0</version>
|
||||
<version>8.1.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
@@ -148,6 +169,12 @@
|
||||
<version>${jetty.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty.websocket</groupId>
|
||||
<artifactId>websocket-server</artifactId>
|
||||
<version>${jetty.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- JmDNS -->
|
||||
<dependency>
|
||||
@@ -201,6 +228,44 @@
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<!-- Pax Web -->
|
||||
<dependency>
|
||||
<groupId>org.ops4j.pax.web</groupId>
|
||||
<artifactId>pax-web-api</artifactId>
|
||||
<version>${pax.web.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.ops4j.pax.web</groupId>
|
||||
<artifactId>pax-web-extender-whiteboard</artifactId>
|
||||
<version>${pax.web.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.ops4j.pax.web</groupId>
|
||||
<artifactId>pax-web-jetty</artifactId>
|
||||
<version>${pax.web.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.ops4j.pax.web</groupId>
|
||||
<artifactId>pax-web-jsp</artifactId>
|
||||
<version>${pax.web.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.ops4j.pax.web</groupId>
|
||||
<artifactId>pax-web-runtime</artifactId>
|
||||
<version>${pax.web.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.ops4j.pax.web</groupId>
|
||||
<artifactId>pax-web-spi</artifactId>
|
||||
<version>${pax.web.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- Serial Communication -->
|
||||
<dependency>
|
||||
<groupId>org.vesalainen.comm</groupId>
|
||||
|
||||
+22
-11
@@ -18,11 +18,10 @@
|
||||
<properties>
|
||||
<californium.version>2.7.4</californium.version>
|
||||
<cxf.version>3.4.5</cxf.version>
|
||||
<!-- revert version of jackson-databind to ${jackson.version} when versions are in-line again -->
|
||||
<jackson.version>2.14.1</jackson.version>
|
||||
<jetty.version>9.4.46.v20220331</jetty.version>
|
||||
<pax.logging.version>2.0.16</pax.logging.version>
|
||||
<pax.web.version>7.3.25</pax.web.version>
|
||||
<jetty.version>9.4.50.v20221201</jetty.version>
|
||||
<pax.logging.version>2.2.0</pax.logging.version>
|
||||
<pax.web.version>8.0.15</pax.web.version>
|
||||
<swagger.version>2.1.9</swagger.version>
|
||||
</properties>
|
||||
|
||||
@@ -56,10 +55,16 @@
|
||||
</dependency>
|
||||
|
||||
<!-- Declarative Services -->
|
||||
<dependency>
|
||||
<groupId>org.osgi</groupId>
|
||||
<artifactId>org.osgi.service.component</artifactId>
|
||||
<version>1.5.0</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>org.apache.felix.scr</artifactId>
|
||||
<version>2.1.30</version>
|
||||
<version>2.2.4</version>
|
||||
<scope>compile</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
@@ -73,7 +78,7 @@
|
||||
<dependency>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>org.apache.felix.configadmin</artifactId>
|
||||
<version>1.9.24</version>
|
||||
<version>1.9.26</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
@@ -123,7 +128,7 @@
|
||||
<dependency>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>org.apache.felix.http.servlet-api</artifactId>
|
||||
<version>1.1.2</version>
|
||||
<version>1.2.0</version>
|
||||
<scope>compile</scope>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
@@ -315,7 +320,7 @@
|
||||
<dependency>
|
||||
<groupId>org.apache.aries.spifly</groupId>
|
||||
<artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
|
||||
<version>1.3.2</version>
|
||||
<version>1.3.4</version>
|
||||
</dependency>
|
||||
|
||||
<!-- END: Slightly modified EnRoute implementation index artifacts -->
|
||||
@@ -331,7 +336,7 @@
|
||||
<dependency>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>org.apache.felix.webconsole.plugins.ds</artifactId>
|
||||
<version>2.1.0</version>
|
||||
<version>2.2.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
@@ -574,6 +579,12 @@
|
||||
<version>${pax.web.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.ops4j.pax.web</groupId>
|
||||
<artifactId>pax-web-tomcat-common</artifactId>
|
||||
<version>${pax.web.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- Jetty -->
|
||||
<dependency>
|
||||
@@ -743,13 +754,13 @@
|
||||
<dependency>
|
||||
<groupId>org.apache.xbean</groupId>
|
||||
<artifactId>xbean-bundleutils</artifactId>
|
||||
<version>4.21</version>
|
||||
<version>4.22</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.xbean</groupId>
|
||||
<artifactId>xbean-finder</artifactId>
|
||||
<version>4.21</version>
|
||||
<version>4.22</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user