Skip to content

Commit 50e83c5

Browse files
Upgrade Karaf to 4.4.8 and Xtext/Xtend to 2.39.0
* 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.32 * commons-fileupload 1.16.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 * Resolve itest runbundles Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
1 parent 6f7d46c commit 50e83c5

32 files changed

Lines changed: 198 additions & 199 deletions

File tree

bom/compile/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<properties>
2020
<californium.version>4.0.0-M2</californium.version>
2121
<jetty.version>9.4.57.v20241219</jetty.version>
22-
<pax.web.version>8.0.30</pax.web.version>
22+
<pax.web.version>8.0.32</pax.web.version>
2323
<swagger.version>2.2.28</swagger.version>
2424
</properties>
2525

@@ -83,7 +83,7 @@
8383
<dependency>
8484
<groupId>org.apache.commons</groupId>
8585
<artifactId>commons-lang3</artifactId>
86-
<version>3.17.0</version>
86+
<version>3.18.0</version>
8787
<scope>compile</scope>
8888
</dependency>
8989

@@ -413,13 +413,13 @@
413413
<dependency>
414414
<groupId>net.java.dev.jna</groupId>
415415
<artifactId>jna</artifactId>
416-
<version>5.16.0</version>
416+
<version>5.17.0</version>
417417
<scope>compile</scope>
418418
</dependency>
419419
<dependency>
420420
<groupId>net.java.dev.jna</groupId>
421421
<artifactId>jna-platform</artifactId>
422-
<version>5.16.0</version>
422+
<version>5.17.0</version>
423423
<scope>compile</scope>
424424
</dependency>
425425
<!-- transitive dependency of junit, required by javadoc in compile bom! -->

bom/runtime/pom.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<cxf.version>3.6.5</cxf.version>
2222
<jackson.version>2.18.2</jackson.version>
2323
<jetty.version>9.4.57.v20241219</jetty.version>
24-
<pax.logging.version>2.2.8</pax.logging.version>
25-
<pax.web.version>8.0.30</pax.web.version>
24+
<pax.logging.version>2.3.0</pax.logging.version>
25+
<pax.web.version>8.0.32</pax.web.version>
2626
<swagger.version>2.2.28</swagger.version>
2727
</properties>
2828

@@ -405,18 +405,18 @@
405405
<dependency>
406406
<groupId>commons-fileupload</groupId>
407407
<artifactId>commons-fileupload</artifactId>
408-
<version>1.5</version>
408+
<version>1.6.0</version>
409409
<scope>compile</scope>
410410
</dependency>
411411
<dependency>
412412
<groupId>commons-io</groupId>
413413
<artifactId>commons-io</artifactId>
414-
<version>2.18.0</version>
414+
<version>2.20.0</version>
415415
</dependency>
416416
<dependency>
417417
<groupId>org.apache.commons</groupId>
418418
<artifactId>commons-lang3</artifactId>
419-
<version>3.17.0</version>
419+
<version>3.18.0</version>
420420
<scope>compile</scope>
421421
</dependency>
422422
<dependency>
@@ -455,7 +455,7 @@
455455
<dependency>
456456
<groupId>org.bouncycastle</groupId>
457457
<artifactId>bcprov-jdk18on</artifactId>
458-
<version>1.78.1</version>
458+
<version>1.81</version>
459459
</dependency>
460460

461461
<!-- Gson -->
@@ -785,21 +785,21 @@
785785
<dependency>
786786
<groupId>org.apache.xbean</groupId>
787787
<artifactId>xbean-bundleutils</artifactId>
788-
<version>4.26</version>
788+
<version>4.27</version>
789789
<scope>compile</scope>
790790
</dependency>
791791
<dependency>
792792
<groupId>org.apache.xbean</groupId>
793793
<artifactId>xbean-finder</artifactId>
794-
<version>4.26</version>
794+
<version>4.27</version>
795795
<scope>compile</scope>
796796
</dependency>
797797

798798
<!-- Google Commons / Guava -->
799799
<dependency>
800800
<groupId>com.google.guava</groupId>
801801
<artifactId>guava</artifactId>
802-
<version>33.3.1-jre</version>
802+
<version>33.4.8-jre</version>
803803
<scope>compile</scope>
804804
</dependency>
805805

@@ -911,7 +911,7 @@
911911
<dependency>
912912
<groupId>org.ow2.asm</groupId>
913913
<artifactId>asm</artifactId>
914-
<version>9.7.1</version>
914+
<version>9.8</version>
915915
<scope>compile</scope>
916916
</dependency>
917917
<dependency>
@@ -1074,13 +1074,13 @@
10741074
<dependency>
10751075
<groupId>net.java.dev.jna</groupId>
10761076
<artifactId>jna</artifactId>
1077-
<version>5.16.0</version>
1077+
<version>5.17.0</version>
10781078
<scope>compile</scope>
10791079
</dependency>
10801080
<dependency>
10811081
<groupId>net.java.dev.jna</groupId>
10821082
<artifactId>jna-platform</artifactId>
1083-
<version>5.16.0</version>
1083+
<version>5.17.0</version>
10841084
<scope>compile</scope>
10851085
</dependency>
10861086
</dependencies>

bundles/org.openhab.core.semantics/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>org.ow2.asm</groupId>
3131
<artifactId>asm</artifactId>
32-
<version>9.7.1</version>
32+
<version>9.8</version>
3333
<scope>provided</scope>
3434
</dependency>
3535
</dependencies>

features/karaf/openhab-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<properties>
1919
<jetty.version>9.4.57.v20241219</jetty.version>
20-
<jna.version>5.16.0</jna.version>
20+
<jna.version>5.17.0</jna.version>
2121
</properties>
2222

2323
<build>

features/karaf/openhab-core/src/main/feature/feature.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
<feature dependency="true">openhab.tp-gson</feature>
3030

31-
<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.37.0)(!(version&gt;=2.38.0)))"</requirement>
31+
<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.39.0)(!(version&gt;=2.40.0)))"</requirement>
3232
<feature dependency="true">openhab.tp-xtext</feature>
3333

3434
<requirement>openhab.tp;filter:="(feature=jax-rs-whiteboard)"</requirement>
@@ -406,10 +406,10 @@
406406

407407
<feature name="openhab-core-model-lsp" version="${project.version}">
408408

409-
<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.37.0)(!(version&gt;=2.38.0)))"</requirement>
409+
<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.39.0)(!(version&gt;=2.40.0)))"</requirement>
410410
<feature dependency="true">openhab.tp-xtext-ide</feature>
411411

412-
<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.23.1)(!(version&gt;=0.24.0)))"</requirement>
412+
<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.24.0)(!(version&gt;=0.24.1)))"</requirement>
413413
<feature dependency="true">openhab.tp-lsp4j</feature>
414414

415415
<feature>openhab-core-model-item-ide</feature>

features/karaf/openhab-tp/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<properties>
1818
<jetty.version>9.4.57.v20241219</jetty.version>
19-
<jna.version>5.16.0</jna.version>
19+
<jna.version>5.17.0</jna.version>
2020
</properties>
2121

2222
<build>

features/karaf/openhab-tp/src/main/feature/feature.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<feature>log</feature>
2424
<feature>pax-web-jetty-extras</feature>
2525
<!-- Apache Commons -->
26-
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.17.0</bundle>
26+
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.18.0</bundle>
2727
<!-- Measurement -->
2828
<bundle dependency="true">mvn:jakarta.annotation/jakarta.annotation-api/2.1.1</bundle>
2929
<bundle dependency="true">mvn:jakarta.inject/jakarta.inject-api/1.0.5</bundle>
@@ -47,7 +47,7 @@
4747
<bundle>mvn:org.eclipse.californium/element-connector/4.0.0-M2</bundle>
4848
<bundle>mvn:org.eclipse.californium/scandium/4.0.0-M2</bundle>
4949
<bundle dependency="true">mvn:org.slf4j/jul-to-slf4j/2.0.16</bundle>
50-
<bundle dependency="true">mvn:org.bouncycastle/bcprov-jdk18on/1.78.1</bundle>
50+
<bundle dependency="true">mvn:org.bouncycastle/bcprov-jdk18on/1.81</bundle>
5151
</feature>
5252

5353
<feature name="openhab.tp-commons-net" description="The Apache Commons Net library" version="${project.version}">
@@ -203,9 +203,9 @@
203203
</feature>
204204

205205
<feature name="openhab.tp-lsp4j" description="Eclipse LSP4J" version="${project.version}">
206-
<capability>openhab.tp;feature=lsp4j;version=0.23.1</capability>
207-
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.23.1</bundle>
208-
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.23.1</bundle>
206+
<capability>openhab.tp;feature=lsp4j;version=0.24.0</capability>
207+
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.24.0</bundle>
208+
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.24.0</bundle>
209209

210210
<feature dependency="true">openhab.tp-gson</feature>
211211
<feature dependency="true">openhab.tp-xtext</feature>
@@ -229,10 +229,10 @@
229229

230230
<bundle>mvn:org.eclipse.xtext/org.eclipse.xtext/${xtext.version}</bundle>
231231

232-
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.common/2.24.0</bundle>
233-
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore/2.26.0</bundle>
234-
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore.change/2.14.0</bundle>
235-
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore.xmi/2.16.0</bundle>
232+
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.common/2.30.0</bundle>
233+
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore/2.36.0</bundle>
234+
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore.change/2.16.0</bundle>
235+
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore.xmi/2.37.0</bundle>
236236
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.common.types/${xtext.version}</bundle>
237237

238238
<bundle dependency="true">mvn:javax.annotation/javax.annotation-api/1.3.2</bundle>
@@ -244,21 +244,21 @@
244244
<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib/${xtext.version}</bundle>
245245
<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/${xtext.version}</bundle>
246246

247-
<bundle dependency="true">mvn:com.google.guava/failureaccess/1.0.2</bundle>
248-
<bundle dependency="true">mvn:com.google.guava/guava/33.3.1-jre</bundle>
247+
<bundle dependency="true">mvn:com.google.guava/failureaccess/1.0.3</bundle>
248+
<bundle dependency="true">mvn:com.google.guava/guava/33.4.8-jre</bundle>
249249
<bundle dependency="true">mvn:com.google.inject/guice/7.0.0</bundle>
250250
<bundle dependency="true">mvn:jakarta.inject/jakarta.inject-api/2.0.1</bundle>
251251

252252
<bundle dependency="true">mvn:org.eclipse.orbit.bundles/org.aopalliance/1.0.0.v201105210816</bundle>
253253
<bundle dependency="true">mvn:io.github.classgraph/classgraph/4.8.176</bundle>
254254
<bundle dependency="true">mvn:org.eclipse.orbit.bundles/org.antlr.runtime/3.2.0.v201101311130</bundle>
255255

256-
<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.common/3.18.0</bundle>
257-
<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.registry/3.9.0</bundle>
256+
<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.common/3.19.0</bundle>
257+
<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.registry/3.12.0</bundle>
258258
<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.supplement/1.9.0</bundle>
259259

260260
<!-- Used for feature verification only because this is already provided by Karaf -->
261-
<bundle dependency="true" start="false">mvn:org.eclipse.platform/org.eclipse.osgi/3.18.0</bundle>
261+
<bundle dependency="true" start="false">mvn:org.eclipse.platform/org.eclipse.osgi/3.19.0</bundle>
262262
</feature>
263263

264264
<feature name="openhab.tp-xtext-ide" description="Xtext - IDE Support" version="${project.version}">

itests/org.openhab.core.addon.tests/itest.bndrun

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Fragment-Host: org.openhab.core.addon
4545
org.opentest4j;version='[1.3.0,1.3.1)',\
4646
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
4747
ch.qos.logback.core;version='[1.3.14,1.3.15)',\
48-
com.sun.jna;version='[5.16.0,5.16.1)',\
48+
com.sun.jna;version='[5.17.0,5.17.1)',\
4949
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
5050
org.eclipse.jetty.http;version='[9.4.57,9.4.58)',\
5151
org.eclipse.jetty.io;version='[9.4.57,9.4.58)',\
@@ -58,11 +58,11 @@ Fragment-Host: org.openhab.core.addon
5858
org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
5959
org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
6060
org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
61-
org.objectweb.asm;version='[9.7.1,9.7.2)',\
61+
org.objectweb.asm;version='[9.8.0,9.8.1)',\
6262
org.openhab.core;version='[5.1.0,5.1.1)',\
6363
org.openhab.core.addon;version='[5.1.0,5.1.1)',\
6464
org.openhab.core.addon.tests;version='[5.1.0,5.1.1)',\
6565
org.openhab.core.config.core;version='[5.1.0,5.1.1)',\
6666
org.openhab.core.test;version='[5.1.0,5.1.1)',\
6767
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
68-
org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)'
68+
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)'

itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Fragment-Host: org.openhab.core.auth.oauth2client
4545
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
4646
ch.qos.logback.core;version='[1.3.14,1.3.15)',\
4747
xstream;version='[1.4.21,1.4.22)',\
48-
com.sun.jna;version='[5.16.0,5.16.1)',\
48+
com.sun.jna;version='[5.17.0,5.17.1)',\
4949
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
5050
org.eclipse.jetty.alpn.client;version='[9.4.57,9.4.58)',\
5151
org.eclipse.jetty.client;version='[9.4.57,9.4.58)',\
@@ -62,7 +62,7 @@ Fragment-Host: org.openhab.core.auth.oauth2client
6262
org.eclipse.jetty.websocket.api;version='[9.4.57,9.4.58)',\
6363
org.eclipse.jetty.websocket.client;version='[9.4.57,9.4.58)',\
6464
org.eclipse.jetty.websocket.common;version='[9.4.57,9.4.58)',\
65-
org.objectweb.asm;version='[9.7.1,9.7.2)',\
65+
org.objectweb.asm;version='[9.8.0,9.8.1)',\
6666
org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
6767
org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
6868
org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
@@ -77,4 +77,4 @@ Fragment-Host: org.openhab.core.auth.oauth2client
7777
org.openhab.core.test;version='[5.1.0,5.1.1)',\
7878
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
7979
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
80-
org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)'
80+
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)'

itests/org.openhab.core.automation.integration.tests/itest.bndrun

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Fragment-Host: org.openhab.core.automation
5151
com.fasterxml.jackson.core.jackson-core;version='[2.18.2,2.18.3)',\
5252
com.fasterxml.jackson.core.jackson-databind;version='[2.18.2,2.18.3)',\
5353
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.18.2,2.18.3)',\
54-
com.sun.jna;version='[5.16.0,5.16.1)',\
54+
com.sun.jna;version='[5.17.0,5.17.1)',\
5555
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
5656
org.eclipse.jetty.http;version='[9.4.57,9.4.58)',\
5757
org.eclipse.jetty.io;version='[9.4.57,9.4.58)',\
@@ -60,7 +60,7 @@ Fragment-Host: org.openhab.core.automation
6060
org.eclipse.jetty.servlet;version='[9.4.57,9.4.58)',\
6161
org.eclipse.jetty.util;version='[9.4.57,9.4.58)',\
6262
org.eclipse.jetty.util.ajax;version='[9.4.57,9.4.58)',\
63-
org.objectweb.asm;version='[9.7.1,9.7.2)',\
63+
org.objectweb.asm;version='[9.8.0,9.8.1)',\
6464
org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
6565
org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
6666
org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
@@ -78,7 +78,7 @@ Fragment-Host: org.openhab.core.automation
7878
stax2-api;version='[4.2.2,4.2.3)',\
7979
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
8080
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
81-
org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
81+
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
8282
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)',\
8383
org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\
8484
org.openhab.core.semantics;version='[5.1.0,5.1.1)',\

0 commit comments

Comments
 (0)