Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Upgrade Karaf from 4.4.6 to 4.4.7 #17515

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<properties>
<bnd.importpackage>jdk.dynalink.*;resolution:=optional</bnd.importpackage>
<asm.version>7.3.1</asm.version>
<asm.version>9.7.1</asm.version>
</properties>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,7 @@ public static List<Measure> parseJson(Gson gson, String stringResponse) {
}

if (measures != null) {
List<@Nullable Measure> nullableMeasuresWithoutNulls = measures.stream().filter(Objects::nonNull).toList();
List<Measure> measuresWithoutNulls = new ArrayList<>(nullableMeasuresWithoutNulls.size());
for (@Nullable
Measure m : nullableMeasuresWithoutNulls) {
if (m != null) {
measuresWithoutNulls.add(m);
}
}

return measuresWithoutNulls;
return measures.stream().filter(Objects::nonNull).toList();
}

return Collections.emptyList();
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.binding.amplipi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<name>openHAB Add-ons :: Bundles :: AmpliPi Binding</name>

<properties>
<cxf-version>3.6.2</cxf-version>
<cxf-version>3.6.4</cxf-version>
</properties>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
*/
package org.openhab.binding.boschshc.internal.devices.bridge;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.StringStartsWith.startsWith;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
Expand Down Expand Up @@ -277,8 +279,7 @@ void sendRequestInvalidSyntaxInResponse()
when(response.getContentAsString()).thenReturn("{\"@type\": \"JsonRestExceptionResponseEntity}");
ExecutionException e = assertThrows(ExecutionException.class,
() -> httpClient.sendRequest(request, SubscribeResult.class, sr -> false, null));
assertEquals(
"Received invalid content in response, expected type org.openhab.binding.boschshc.internal.devices.bridge.dto.SubscribeResult: com.google.gson.stream.MalformedJsonException: Unterminated string at line 1 column 44 path $.@type",
e.getMessage());
assertThat(e.getMessage(), startsWith(
"Received invalid content in response, expected type org.openhab.binding.boschshc.internal.devices.bridge.dto.SubscribeResult:"));
}
}
2 changes: 1 addition & 1 deletion bundles/org.openhab.binding.http/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<name>openHAB Add-ons :: Bundles :: HTTP Binding</name>

<properties>
<jetty.version>9.4.55.v20240627</jetty.version>
<jetty.version>9.4.57.v20241219</jetty.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.binding.ihc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.2</version>
<version>1.3.4</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<feature>openhab-runtime-base</feature>
<bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.10</bundle>
<bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.8</bundle>
<bundle dependency="true">mvn:commons-logging/commons-logging/1.2</bundle>
<bundle dependency="true">mvn:commons-logging/commons-logging/1.3.4</bundle>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.ihc/${project.version}</bundle>
</feature>
</features>
2 changes: 1 addition & 1 deletion bundles/org.openhab.binding.ipp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
<version>2.17.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.binding.logreader/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
<version>2.17.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.binding.mqtt.homeassistant/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.3.0-jre</version>
<version>33.3.1-jre</version>
<scope>test</scope>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -716,9 +716,9 @@ private void updateThermostatState(NhcThermostat2 thermostat, List<NhcProperty>
Optional<Integer> ambientTemperatureProperty = deviceProperties.stream().map(p -> p.ambientTemperature)
.map(s -> (!((s == null) || s.isEmpty())) ? Math.round(Float.parseFloat(s) * 10) : null)
.filter(Objects::nonNull).findFirst();
Optional<@Nullable String> demandProperty = deviceProperties.stream().map(p -> p.demand)
.filter(Objects::nonNull).findFirst();
Optional<@Nullable String> operationModeProperty = deviceProperties.stream().map(p -> p.operationMode)
Optional<String> demandProperty = deviceProperties.stream().map(p -> p.demand).filter(Objects::nonNull)
.findFirst();
Optional<String> operationModeProperty = deviceProperties.stream().map(p -> p.operationMode)
.filter(Objects::nonNull).findFirst();

String modeString = deviceProperties.stream().map(p -> p.program).filter(Objects::nonNull).findFirst()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<feature name="openhab-binding-zway" description="Z-Way Binding" version="${project.version}">
<feature>openhab-runtime-base</feature>
<feature dependency="true">openhab.tp-commons-net</feature>
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.4</bundle>
<bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.17.0</bundle>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.zway/${project.version}</bundle>
</feature>
</features>
2 changes: 1 addition & 1 deletion bundles/org.openhab.persistence.dynamodb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dep.noembedding>netty-common,netty-transport,netty-transport-native-epoll,netty-transport-native-unix-common,netty-buffer,netty-resolver,netty-codec,netty-codec-http,netty-codec-http2,netty-handler</dep.noembedding>
<!-- slf4j version matching the version specified in openhab-core/pom.xml -->
<slf4j.version>1.7.32</slf4j.version>
<jetty.version>9.4.54.v20240208</jetty.version>
<jetty.version>9.4.57.v20241219</jetty.version>
</properties>

<!--Custom repository for DynamoDBLocal -->
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.transform.jinja/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.3.0-jre</version>
<version>33.3.1-jre</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.13</bundle>
<bundle dependency="true">mvn:org.openhab.osgiify/com.amazonaws.aws-java-sdk-core/1.12.626</bundle>
<bundle dependency="true">mvn:org.openhab.osgiify/com.amazonaws.aws-java-sdk-polly/1.12.626</bundle>
<bundle dependency="true">mvn:commons-logging/commons-logging/1.2</bundle>
<bundle dependency="true">mvn:commons-logging/commons-logging/1.3.4</bundle>
<bundle dependency="true">mvn:joda-time/joda-time/2.8.1</bundle>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.voice.pollytts/${project.version}</bundle>
</feature>
Expand Down
39 changes: 21 additions & 18 deletions itests/org.openhab.automation.groovyscripting.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ Fragment-Host: org.openhab.automation.groovyscripting
tech.units.indriya;version='[2.2.0,2.2.1)',\
uom-lib-common;version='[2.2.0,2.2.1)',\
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
org.apache.felix.scr;version='[2.2.6,2.2.7)',\
org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.10.1,2.10.2)',\
com.google.gson;version='[2.11.0,2.11.1)',\
junit-jupiter-api;version='[5.10.0,5.10.1)',\
junit-jupiter-engine;version='[5.10.0,5.10.1)',\
junit-platform-commons;version='[1.10.0,1.10.1)',\
Expand All @@ -49,26 +49,29 @@ Fragment-Host: org.openhab.automation.groovyscripting
org.opentest4j;version='[1.3.0,1.3.1)',\
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
ch.qos.logback.core;version='[1.3.14,1.3.15)',\
com.fasterxml.jackson.core.jackson-annotations;version='[2.17.1,2.17.2)',\
org.yaml.snakeyaml;version='[2.2.0,2.2.1)',\
com.fasterxml.jackson.core.jackson-annotations;version='[2.18.2,2.18.3)',\
com.fasterxml.jackson.core.jackson-core;version='[2.18.2,2.18.3)',\
com.fasterxml.jackson.core.jackson-databind;version='[2.18.2,2.18.3)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)',\
org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.18.2,2.18.3)',\
org.threeten.extra;version='[1.8.0,1.8.1)',\
com.sun.jna;version='[5.14.0,5.14.1)',\
com.sun.jna;version='[5.16.0,5.16.1)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
org.eclipse.jetty.http;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.io;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.security;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.server;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.servlet;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.util;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.util.ajax;version='[9.4.54,9.4.55)',\
org.objectweb.asm;version='[9.7.0,9.7.1)',\
org.eclipse.jetty.http;version='[9.4.57,9.4.58)',\
org.eclipse.jetty.io;version='[9.4.57,9.4.58)',\
org.eclipse.jetty.security;version='[9.4.57,9.4.58)',\
org.eclipse.jetty.server;version='[9.4.57,9.4.58)',\
org.eclipse.jetty.servlet;version='[9.4.57,9.4.58)',\
org.eclipse.jetty.util;version='[9.4.57,9.4.58)',\
org.eclipse.jetty.util.ajax;version='[9.4.57,9.4.58)',\
org.objectweb.asm;version='[9.7.1,9.7.2)',\
org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
org.openhab.automation.groovyscripting;version='[5.0.0,5.0.1)',\
org.openhab.automation.groovyscripting.tests;version='[5.0.0,5.0.1)',\
org.openhab.core;version='[5.0.0,5.0.1)',\
Expand All @@ -82,9 +85,9 @@ Fragment-Host: org.openhab.automation.groovyscripting
org.openhab.core.thing;version='[5.0.0,5.0.1)',\
org.openhab.core.transform;version='[5.0.0,5.0.1)',\
stax2-api;version='[4.2.2,4.2.3)',\
com.fasterxml.jackson.core.jackson-core;version='[2.17.2,2.17.3)',\
com.fasterxml.jackson.core.jackson-databind;version='[2.17.2,2.17.3)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.17.2,2.17.3)',\
com.fasterxml.jackson.core.jackson-core;version='[2.18.2,2.18.3)',\
com.fasterxml.jackson.core.jackson-databind;version='[2.18.2,2.18.3)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)',\
biz.aQute.tester.junit-platform;version='[7.1.0,7.1.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)',\
de.focus_shift.jollyday-core;version='[1.4.0,1.4.1)',\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
tech.units.indriya;version='[2.2.0,2.2.1)',\
uom-lib-common;version='[2.2.0,2.2.1)',\
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
org.apache.felix.scr;version='[2.2.6,2.2.7)',\
org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.10.1,2.10.2)',\
com.google.gson;version='[2.11.0,2.11.1)',\
junit-jupiter-api;version='[5.10.0,5.10.1)',\
junit-jupiter-engine;version='[5.10.0,5.10.1)',\
junit-platform-commons;version='[1.10.0,1.10.1)',\
Expand All @@ -50,26 +50,26 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
ch.qos.logback.classic;version='[1.3.14,1.3.15)',\
ch.qos.logback.core;version='[1.3.14,1.3.15)',\
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
com.fasterxml.jackson.core.jackson-annotations;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.core.jackson-core;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.core.jackson-databind;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.17.1,2.17.2)',\
com.fasterxml.jackson.core.jackson-annotations;version='[2.18.2,2.18.3)',\
com.fasterxml.jackson.core.jackson-core;version='[2.18.2,2.18.3)',\
com.fasterxml.jackson.core.jackson-databind;version='[2.18.2,2.18.3)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-xml;version='[2.18.2,2.18.3)',\
org.threeten.extra;version='[1.8.0,1.8.1)',\
com.sun.jna;version='[5.14.0,5.14.1)',\
com.sun.jna;version='[5.16.0,5.16.1)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
org.eclipse.jetty.http;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.io;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.security;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.server;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.servlet;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.util;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.util.ajax;version='[9.4.54,9.4.55)',\
org.objectweb.asm;version='[9.7.0,9.7.1)',\
org.eclipse.jetty.http;version='[9.4.57,9.4.58)',\
org.eclipse.jetty.io;version='[9.4.57,9.4.58)',\
org.eclipse.jetty.security;version='[9.4.57,9.4.58)',\
org.eclipse.jetty.server;version='[9.4.57,9.4.58)',\
org.eclipse.jetty.servlet;version='[9.4.57,9.4.58)',\
org.eclipse.jetty.util;version='[9.4.57,9.4.58)',\
org.eclipse.jetty.util.ajax;version='[9.4.57,9.4.58)',\
org.objectweb.asm;version='[9.7.1,9.7.2)',\
org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
org.objectweb.asm.util;version='[9.6.0,9.6.1)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
org.openhab.automation.jsscriptingnashorn;version='[5.0.0,5.0.1)',\
org.openhab.automation.jsscriptingnashorn.tests;version='[5.0.0,5.0.1)',\
org.openhab.core;version='[5.0.0,5.0.1)',\
Expand Down
24 changes: 12 additions & 12 deletions itests/org.openhab.binding.astro.tests/itest.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ Fragment-Host: org.openhab.binding.astro
tech.units.indriya;version='[2.2.0,2.2.1)',\
uom-lib-common;version='[2.2.0,2.2.1)',\
io.methvin.directory-watcher;version='[0.18.0,0.18.1)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.8,2.3.9)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.9,2.3.10)',\
org.apache.felix.scr;version='[2.2.6,2.2.7)',\
org.eclipse.equinox.event;version='[1.6.200,1.6.201)',\
org.osgi.service.event;version='[1.4.1,1.4.2)',\
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
com.google.gson;version='[2.10.1,2.10.2)',\
com.google.gson;version='[2.11.0,2.11.1)',\
junit-jupiter-api;version='[5.10.0,5.10.1)',\
junit-jupiter-engine;version='[5.10.0,5.10.1)',\
junit-jupiter-params;version='[5.10.0,5.10.1)',\
Expand All @@ -44,8 +44,8 @@ Fragment-Host: org.openhab.binding.astro
junit-platform-launcher;version='[1.10.0,1.10.1)',\
org.opentest4j;version='[1.3.0,1.3.1)',\
org.osgi.service.component.annotations;version='[1.5.1,1.5.2)',\
com.sun.jna;version='[5.14.0,5.14.1)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
com.sun.jna;version='[5.16.0,5.16.1)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
org.openhab.binding.astro;version='[5.0.0,5.0.1)',\
org.openhab.binding.astro.tests;version='[5.0.0,5.0.1)',\
org.openhab.core;version='[5.0.0,5.0.1)',\
Expand All @@ -60,15 +60,15 @@ Fragment-Host: org.openhab.binding.astro
ch.qos.logback.core;version='[1.3.14,1.3.15)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.eclipse.jetty.http;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.io;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.security;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.server;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.servlet;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.util;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.util.ajax;version='[9.4.54,9.4.55)',\
org.eclipse.jetty.http;version='[9.4.57,9.4.58)',\
org.eclipse.jetty.io;version='[9.4.57,9.4.58)',\
org.eclipse.jetty.security;version='[9.4.57,9.4.58)',\
org.eclipse.jetty.server;version='[9.4.57,9.4.58)',\
org.eclipse.jetty.servlet;version='[9.4.57,9.4.58)',\
org.eclipse.jetty.util;version='[9.4.57,9.4.58)',\
org.eclipse.jetty.util.ajax;version='[9.4.57,9.4.58)',\
org.hamcrest;version='[2.2.0,2.2.1)',\
org.objectweb.asm;version='[9.7.0,9.7.1)',\
org.objectweb.asm;version='[9.7.1,9.7.2)',\
org.objectweb.asm.commons;version='[9.6.0,9.6.1)',\
org.objectweb.asm.tree;version='[9.6.0,9.6.1)',\
org.objectweb.asm.tree.analysis;version='[9.6.0,9.6.1)',\
Expand Down
Loading
Loading