demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-10 13:21:53 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Upgrade XStream to 1.4.21 (#4457)

Browse Source 
* Upgrade XStream from 1.4.20 to 1.4.21, fixes CVE-2024-47072.
  See changelog at https://x-stream.github.io/changes.html#1.4.21

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
This commit is contained in:
Holger Friedrich 2024-11-18 23:34:06 +01:00 committed by GitHub
parent d7495d26fe
commit 660102e3f9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
25 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bom/compile/pom.xml
View File

@ -357,7 +357,7 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.20</version>
<version>1.4.21</version>
<scope>compile</scope>
</dependency>

2
bom/runtime/pom.xml
View File

@ -544,7 +544,7 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.20</version>
<version>1.4.21</version>
<scope>compile</scope>
</dependency>

2
features/karaf/openhab-tp/src/main/feature/feature.xml
View File

@ -37,7 +37,7 @@
<bundle dependency="true">mvn:org.osgi/org.osgi.service.component.annotations/1.5.1</bundle>
<!-- TODO: Unbundled libraries -->
<bundle dependency="true">mvn:com.thoughtworks.xstream/xstream/1.4.20</bundle>
<bundle dependency="true">mvn:com.thoughtworks.xstream/xstream/1.4.21</bundle>
</feature>
<feature name="openhab.tp-coap" description="Californium CoAP library" version="${project.version}">

2
itests/org.openhab.core.addon.tests/itest.bndrun
View File

@ -26,7 +26,7 @@ Fragment-Host: org.openhab.core.addon
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
xstream;version='[1.4.21,1.4.22)',\
org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\

2
itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
View File

@ -47,7 +47,7 @@ Fragment-Host: org.openhab.core.auth.oauth2client
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)',\
xstream;version='[1.4.20,1.4.21)',\
xstream;version='[1.4.21,1.4.22)',\
com.sun.jna;version='[5.14.0,5.14.1)',\
org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
org.eclipse.jetty.alpn.client;version='[9.4.54,9.4.55)',\

2
itests/org.openhab.core.automation.integration.tests/itest.bndrun
View File

@ -22,7 +22,7 @@ Fragment-Host: org.openhab.core.automation
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
xstream;version='[1.4.21,1.4.22)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\

2
itests/org.openhab.core.automation.module.core.tests/itest.bndrun
View File

@ -22,7 +22,7 @@ Fragment-Host: org.openhab.core.automation
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
xstream;version='[1.4.21,1.4.22)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\

2
itests/org.openhab.core.automation.module.script.tests/itest.bndrun
View File

@ -22,7 +22,7 @@ Fragment-Host: org.openhab.core.automation.module.script
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
xstream;version='[1.4.21,1.4.22)',\
org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\

2
itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
View File

@ -22,7 +22,7 @@ Fragment-Host: org.openhab.core.automation
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
xstream;version='[1.4.21,1.4.22)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\

2
itests/org.openhab.core.automation.tests/itest.bndrun
View File

@ -22,7 +22,7 @@ Fragment-Host: org.openhab.core.automation
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
xstream;version='[1.4.21,1.4.22)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\

2
itests/org.openhab.core.config.core.tests/itest.bndrun
View File

@ -23,7 +23,7 @@ Fragment-Host: org.openhab.core.config.core
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
xstream;version='[1.4.21,1.4.22)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\

2
itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
View File

@ -23,7 +23,7 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
xstream;version='[1.4.21,1.4.22)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\

2
itests/org.openhab.core.config.discovery.tests/itest.bndrun
View File

@ -23,7 +23,7 @@ Fragment-Host: org.openhab.core.config.discovery
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
xstream;version='[1.4.21,1.4.22)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\

2
itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun
View File

@ -22,7 +22,7 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
xstream;version='[1.4.21,1.4.22)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\

2
itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
View File

@ -32,7 +32,7 @@ Provide-Capability: \
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
xstream;version='[1.4.21,1.4.22)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.mockito-core;version='[4.11.0,4.11.1)',\

2
itests/org.openhab.core.ephemeris.tests/itest.bndrun
View File

@ -27,7 +27,7 @@ feature.openhab-config: \
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
xstream;version='[1.4.21,1.4.22)',\
org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\

2
itests/org.openhab.core.io.rest.core.tests/itest.bndrun
View File

@ -29,7 +29,7 @@ Fragment-Host: org.openhab.core.io.rest.core
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
xstream;version='[1.4.21,1.4.22)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\

2
itests/org.openhab.core.model.item.tests/itest.bndrun
View File

@ -26,7 +26,7 @@ Fragment-Host: org.openhab.core.model.item
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
xstream;version='[1.4.21,1.4.22)',\
org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\

2
itests/org.openhab.core.model.rule.tests/itest.bndrun
View File

@ -30,7 +30,7 @@ Fragment-Host: org.openhab.core.model.rule.runtime
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
xstream;version='[1.4.21,1.4.22)',\
org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\

2
itests/org.openhab.core.model.script.tests/itest.bndrun
View File

@ -30,7 +30,7 @@ Fragment-Host: org.openhab.core.model.script
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
xstream;version='[1.4.21,1.4.22)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\

2
itests/org.openhab.core.model.thing.tests/itest.bndrun
View File

@ -27,7 +27,7 @@ Fragment-Host: org.openhab.core.model.thing
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
xstream;version='[1.4.21,1.4.22)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\

2
itests/org.openhab.core.storage.json.tests/itest.bndrun
View File

@ -22,7 +22,7 @@ Fragment-Host: org.openhab.core.storage.json
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
xstream;version='[1.4.21,1.4.22)',\
org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\

2
itests/org.openhab.core.thing.tests/itest.bndrun
View File

@ -26,7 +26,7 @@ Fragment-Host: org.openhab.core.thing
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
xstream;version='[1.4.21,1.4.22)',\
net.bytebuddy.byte-buddy;version='[1.12.19,1.12.20)',\
net.bytebuddy.byte-buddy-agent;version='[1.12.19,1.12.20)',\
org.mockito.junit-jupiter;version='[4.11.0,4.11.1)',\

2
itests/org.openhab.core.voice.tests/itest.bndrun
View File

@ -26,7 +26,7 @@ Fragment-Host: org.openhab.core.voice
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
xstream;version='[1.4.20,1.4.21)',\
xstream;version='[1.4.21,1.4.22)',\
org.openhab.base-fixes;version='[1.0.0,1.0.1)',\
javax.measure.unit-api;version='[2.2.0,2.2.1)',\
org.apiguardian.api;version='[1.1.2,1.1.3)',\

2
tools/i18n-plugin/pom.xml
View File

@ -29,7 +29,7 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.20</version>
<version>1.4.21</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>