Skip to content

Commit

Permalink
Upgrade to Karaf 4.4.4 (#3814)
Browse files Browse the repository at this point in the history 
* 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>
  • Loading branch information
@wborn
wborn authored Sep 29, 2023
1 parent af4fce1 commit d4a433a
Show file tree
Hide file tree
Showing 36 changed files with 688 additions and 589 deletions.
10 changes: 5 additions & 5 deletions bom/compile/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

<properties>
<californium.version>2.7.4</californium.version>
<jetty.version>9.4.50.v20221201</jetty.version>
<pax.web.version>8.0.15</pax.web.version>
<jetty.version>9.4.52.v20230823</jetty.version>
<pax.web.version>8.0.22</pax.web.version>
<swagger.version>2.2.15</swagger.version>
</properties>

Expand Down Expand Up @@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.9</version>
<version>3.12.0</version>
<scope>compile</scope>
</dependency>

Expand Down Expand Up @@ -428,13 +428,13 @@
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>5.12.1</version>
<version>5.13.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
<version>5.12.1</version>
<version>5.13.0</version>
<scope>compile</scope>
</dependency>

Expand Down
50 changes: 25 additions & 25 deletions bom/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<californium.version>2.7.4</californium.version>
<cxf.version>3.6.1</cxf.version>
<jackson.version>2.15.2</jackson.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>
<jetty.version>9.4.52.v20230823</jetty.version>
<pax.logging.version>2.2.3</pax.logging.version>
<pax.web.version>8.0.22</pax.web.version>
<swagger.version>2.2.15</swagger.version>
</properties>

Expand Down Expand Up @@ -50,7 +50,7 @@
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>3.17.200</version>
<version>3.18.0</version>
<scope>compile</scope>
</dependency>

Expand All @@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
<version>2.2.4</version>
<version>2.2.6</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -100,27 +100,27 @@
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.event</artifactId>
<version>1.4.300</version>
<version>1.6.200</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.event</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
<scope>compile</scope>
</dependency>

<!-- Log Stream Service -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.log</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.log.stream</artifactId>
<version>1.0.100</version>
<version>1.1.100</version>
<scope>compile</scope>
</dependency>

Expand Down Expand Up @@ -174,7 +174,7 @@
<dependency>
<groupId>org.apache.aries.spec</groupId>
<artifactId>org.apache.aries.javax.jax.rs-api</artifactId>
<version>1.0.1</version>
<version>1.0.4</version>
<scope>compile</scope>
</dependency>

Expand All @@ -188,7 +188,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-osgi</artifactId>
<version>2.3.3</version>
<version>2.3.8</version>
</dependency>

<!-- Activation 1.2 API -->
Expand Down Expand Up @@ -247,7 +247,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.promise</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
<scope>compile</scope>
</dependency>

Expand All @@ -263,43 +263,43 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.converter</artifactId>
<version>1.0.0</version>
<version>1.0.9</version>
<scope>compile</scope>
</dependency>

<!-- OSGi Transaction Control -->
<dependency>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-service-xa</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-provider-jdbc-xa</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.tx-control</groupId>
<artifactId>tx-control-provider-jpa-xa</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
<scope>compile</scope>
</dependency>

<!-- OSGi Configurator -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configurator</artifactId>
<version>1.0.14</version>
<version>1.0.16</version>
<scope>compile</scope>
</dependency>

<!-- OSGi JPA Service -->
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.container</artifactId>
<version>2.7.0</version>
<version>2.7.3</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Expand All @@ -312,7 +312,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.jdbc</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
<scope>compile</scope>
</dependency>

Expand All @@ -331,7 +331,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
<version>4.7.2</version>
<version>4.8.12</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Expand Down Expand Up @@ -398,7 +398,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
<version>2.13.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down Expand Up @@ -775,13 +775,13 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-bundleutils</artifactId>
<version>4.22</version>
<version>4.23</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
<version>4.22</version>
<version>4.23</version>
<scope>compile</scope>
</dependency>

Expand Down Expand Up @@ -1082,13 +1082,13 @@
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>5.12.1</version>
<version>5.13.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
<version>5.12.1</version>
<version>5.13.0</version>
<scope>compile</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions bom/test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-osgi</artifactId>
<version>2.3.3</version>
<version>2.3.8</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
Expand Down Expand Up @@ -60,7 +60,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.11</version>
<version>1.3.11</version>
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.core.test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.11</version>
<version>1.3.11</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions features/karaf/openhab-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
21 changes: 5 additions & 16 deletions features/karaf/openhab-core/src/main/feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>

Expand Down Expand Up @@ -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}">
Expand Down
4 changes: 2 additions & 2 deletions features/karaf/openhab-tp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
40 changes: 10 additions & 30 deletions features/karaf/openhab-tp/src/main/feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}">
Expand All @@ -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>
Expand Down Expand Up @@ -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>

Expand Down
Loading

0 comments on commit d4a433a

Please sign in to comment.