Skip to content

Commit 0ee65e7

Browse files
yndtrudyndtrud
authored
Merge branch 'openhab:main' into updateps1-fix
2 parents 8101e27 + 9fbc376 commit 0ee65e7

6 files changed

Lines changed: 33 additions & 31 deletions

File tree

‎distributions/openhab/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@
211211
<groupId>org.apache.karaf.tooling</groupId>
212212
<artifactId>karaf-maven-plugin</artifactId>
213213
<configuration>
214+
<javase>${oh.java.version}</javase>
214215
<installedFeatures>
215216
<feature>wrapper</feature>
216217
<feature>wrap</feature>

‎distributions/openhab/src/main/resources/bin/karaf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,8 @@ run() {
304304
${KARAF_EXEC} "${JAVA}" ${JAVA_OPTS} \
305305
--add-reads=java.xml=java.logging \
306306
--add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED \
307-
--patch-module java.base="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.locator-4.4.7.jar" \
308-
--patch-module java.xml="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.java.xml-4.4.7.jar" \
307+
--patch-module java.base="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.locator-4.4.8.jar" \
308+
--patch-module java.xml="${KARAF_HOME}/lib/endorsed/org.apache.karaf.specs.java.xml-4.4.8.jar" \
309309
--add-opens java.base/java.security=ALL-UNNAMED \
310310
--add-opens java.base/java.net=ALL-UNNAMED \
311311
--add-opens java.base/java.lang=ALL-UNNAMED \

‎distributions/openhab/src/main/resources/bin/karaf.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,8 @@ if "%KARAF_PROFILER%" == "" goto :RUN
412412
"%JAVA%" %JAVA_OPTS% %OPTS% ^
413413
--add-reads=java.xml=java.logging ^
414414
--add-exports=java.base/org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED ^
415-
--patch-module java.base="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.locator-4.4.7.jar" ^
416-
--patch-module java.xml="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.java.xml-4.4.7.jar" ^
415+
--patch-module java.base="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.locator-4.4.8.jar" ^
416+
--patch-module java.xml="%KARAF_HOME%\lib\endorsed\org.apache.karaf.specs.java.xml-4.4.8.jar" ^
417417
--add-opens java.base/java.security=ALL-UNNAMED ^
418418
--add-opens java.base/java.net=ALL-UNNAMED ^
419419
--add-opens java.base/java.lang=ALL-UNNAMED ^

‎distributions/openhab/src/main/resources/bin/update.lst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ ALERT;Tibber Binding: All channels have been renamed and restructured into group
176176

177177
[5.1.0]
178178
ALERT;Automower Binding: Implementation of Automower WebSocket API causes several channels to be removed, changed or added. New channels will need to be linked, existing items need to be adjusted.
179+
ALERT;Freebox Binding: The binding has been removed from the distribution. You should consider migrating to the FreeboxOS binding.
179180

180181
[[PRE]]
181182
[2.2.0]

‎launch/app/app.bndrun‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ feature.openhab-model-runtime-all: \
124124
# done
125125
#
126126
-runbundles: \
127-
org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
128-
org.ops4j.pax.logging.pax-logging-log4j2;version='[2.2.8,2.2.9)',\
127+
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
128+
org.ops4j.pax.logging.pax-logging-log4j2;version='[2.3.0,2.3.1)',\
129129
com.fasterxml.jackson.core.jackson-annotations;version='[2.19.2,2.19.3)',\
130130
com.fasterxml.jackson.core.jackson-core;version='[2.19.2,2.19.3)',\
131131
com.fasterxml.jackson.core.jackson-databind;version='[2.19.2,2.19.3)',\
@@ -134,10 +134,10 @@ feature.openhab-model-runtime-all: \
134134
com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.19.2,2.19.3)',\
135135
com.fasterxml.woodstox.woodstox-core;version='[6.6.2,6.6.3)',\
136136
com.google.gson;version='[2.11.0,2.11.1)',\
137-
com.google.guava;version='[33.3.1,33.3.2)',\
138-
com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
137+
com.google.guava;version='[33.4.8,33.4.9)',\
138+
com.google.guava.failureaccess;version='[1.0.3,1.0.4)',\
139139
com.google.inject;version='[7.0.0,7.0.1)',\
140-
com.sun.jna;version='[5.16.0,5.16.1)',\
140+
com.sun.jna;version='[5.17.0,5.17.1)',\
141141
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
142142
io.github.classgraph.classgraph;version='[4.8.176,4.8.177)',\
143143
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
@@ -156,9 +156,9 @@ feature.openhab-model-runtime-all: \
156156
org.apache.aries.javax.jax.rs-api;version='[1.0.4,1.0.5)',\
157157
org.apache.aries.jax.rs.whiteboard;version='[2.0.2,2.0.3)',\
158158
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
159-
org.apache.commons.commons-fileupload;version='[1.5.0,1.5.1)',\
160-
org.apache.commons.commons-io;version='[2.18.0,2.18.1)',\
161-
org.apache.commons.lang3;version='[3.17.0,3.17.1)',\
159+
org.apache.commons.commons-fileupload;version='[1.6.0,1.6.1)',\
160+
org.apache.commons.commons-io;version='[2.20.0,2.20.1)',\
161+
org.apache.commons.lang3;version='[3.18.0,3.18.1)',\
162162
org.apache.cxf.cxf-core;version='[3.6.5,3.6.6)',\
163163
org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.6.5,3.6.6)',\
164164
org.apache.cxf.cxf-rt-rs-client;version='[3.6.5,3.6.6)',\
@@ -178,10 +178,10 @@ feature.openhab-model-runtime-all: \
178178
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
179179
org.apache.ws.xmlschema.core;version='[2.3.1,2.3.2)',\
180180
org.bitbucket.b_c.jose4j;version='[0.9.6,0.9.7)',\
181-
org.eclipse.emf.common;version='[2.24.0,2.24.1)',\
182-
org.eclipse.emf.ecore;version='[2.26.0,2.26.1)',\
183-
org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
184-
org.eclipse.equinox.common;version='[3.17.100,3.17.101)',\
181+
org.eclipse.emf.common;version='[2.30.0,2.30.1)',\
182+
org.eclipse.emf.ecore;version='[2.36.0,2.36.1)',\
183+
org.eclipse.emf.ecore.xmi;version='[2.37.0,2.37.1)',\
184+
org.eclipse.equinox.common;version='[3.19.0,3.19.1)',\
185185
org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\
186186
org.eclipse.equinox.metatype;version='[1.4.500,1.4.501)',\
187187
org.eclipse.jetty.alpn.client;version='[9.4.57,9.4.58)',\
@@ -204,26 +204,26 @@ feature.openhab-model-runtime-all: \
204204
org.eclipse.jetty.websocket.server;version='[9.4.57,9.4.58)',\
205205
org.eclipse.jetty.websocket.servlet;version='[9.4.57,9.4.58)',\
206206
org.eclipse.jetty.xml;version='[9.4.57,9.4.58)',\
207-
org.eclipse.xtend.lib;version='[2.37.0,2.37.1)',\
208-
org.eclipse.xtend.lib.macro;version='[2.37.0,2.37.1)',\
209-
org.eclipse.xtext;version='[2.37.0,2.37.1)',\
210-
org.eclipse.xtext.common.types;version='[2.37.0,2.37.1)',\
211-
org.eclipse.xtext.util;version='[2.37.0,2.37.1)',\
212-
org.eclipse.xtext.xbase;version='[2.37.0,2.37.1)',\
213-
org.eclipse.xtext.xbase.lib;version='[2.37.0,2.37.1)',\
207+
org.eclipse.xtend.lib;version='[2.39.0,2.39.1)',\
208+
org.eclipse.xtend.lib.macro;version='[2.39.0,2.39.1)',\
209+
org.eclipse.xtext;version='[2.39.0,2.39.1)',\
210+
org.eclipse.xtext.common.types;version='[2.39.0,2.39.1)',\
211+
org.eclipse.xtext.util;version='[2.39.0,2.39.1)',\
212+
org.eclipse.xtext.xbase;version='[2.39.0,2.39.1)',\
213+
org.eclipse.xtext.xbase.lib;version='[2.39.0,2.39.1)',\
214214
org.glassfish.hk2.external.aopalliance-repackaged;version='[3.1.1,3.1.2)',\
215215
org.glassfish.hk2.osgi-resource-locator;version='[3.0.0,3.0.1)',\
216-
org.objectweb.asm;version='[9.7.1,9.7.2)',\
216+
org.objectweb.asm;version='[9.8.0,9.8.1)',\
217217
org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
218218
org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
219219
org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
220220
org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
221-
org.ops4j.pax.web.pax-web-api;version='[8.0.30,8.0.31)',\
222-
org.ops4j.pax.web.pax-web-extender-whiteboard;version='[8.0.30,8.0.31)',\
223-
org.ops4j.pax.web.pax-web-jetty;version='[8.0.30,8.0.31)',\
224-
org.ops4j.pax.web.pax-web-runtime;version='[8.0.30,8.0.31)',\
225-
org.ops4j.pax.web.pax-web-spi;version='[8.0.30,8.0.31)',\
226-
org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.30,8.0.31)',\
221+
org.ops4j.pax.web.pax-web-api;version='[8.0.33,8.0.34)',\
222+
org.ops4j.pax.web.pax-web-extender-whiteboard;version='[8.0.33,8.0.34)',\
223+
org.ops4j.pax.web.pax-web-jetty;version='[8.0.33,8.0.34)',\
224+
org.ops4j.pax.web.pax-web-runtime;version='[8.0.33,8.0.34)',\
225+
org.ops4j.pax.web.pax-web-spi;version='[8.0.33,8.0.34)',\
226+
org.ops4j.pax.web.pax-web-tomcat-common;version='[8.0.33,8.0.34)',\
227227
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
228228
org.osgi.service.component;version='[1.5.1,1.5.2)',\
229229
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<ohc.version>5.1.0-SNAPSHOT</ohc.version>
6262
<oha.version>5.1.0-SNAPSHOT</oha.version>
6363

64-
<karaf.version>4.4.7</karaf.version>
64+
<karaf.version>4.4.8</karaf.version>
6565

6666
<oh.java.version>21</oh.java.version>
6767
<maven.compiler.release>${oh.java.version}</maven.compiler.release>

0 commit comments

Comments
 (0)