mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #816 from guusdk/SPARK-2324_Upgrade-xstream-to-1.4.20

Browse Source 
SPARK-2324: Upgrade XStream from 1.4.19 to 1.4.20
This commit is contained in:
ilyaHlevnoy
2023-03-30 19:36:33 +03:00
committed by GitHub
parent c95276a2f1 1e2a86ac55
commit b69ce01941
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/pom.xml
View File

@ -188,7 +188,7 @@
<dependency> <dependency>
<groupId>com.thoughtworks.xstream</groupId> <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId> <artifactId>xstream</artifactId>
<version>1.4.19</version> <version>1.4.20</version>
</dependency> </dependency>
<dependency> <dependency>

3
core/src/main/java/org/jivesoftware/sparkimpl/updater/CheckUpdates.java
View File

@ -84,6 +84,9 @@ public class CheckUpdates {
ProviderManager.addIQProvider("query", "jabber:iq:spark", new SparkVersion.Provider()); ProviderManager.addIQProvider("query", "jabber:iq:spark", new SparkVersion.Provider());
// For simplicity, use an alias for the root xml tag // For simplicity, use an alias for the root xml tag
xstream.allowTypes(new Class[] {
SparkVersion.class,
});
xstream.alias("Version", SparkVersion.class); xstream.alias("Version", SparkVersion.class);
// Specify the main update url for JiveSoftware // Specify the main update url for JiveSoftware

3
plugins/sip/src/main/java/org/jivesoftware/sparkplugin/preferences/SipPreference.java
View File

@ -236,6 +236,9 @@ public class SipPreference implements Preference {
private XStream getXStream() { private XStream getXStream() {
if (xstream == null) { if (xstream == null) {
xstream = new XStream(); xstream = new XStream();
xstream.allowTypes(new Class[] {
SipPreferences.class,
});
xstream.alias("sip", SipPreferences.class); xstream.alias("sip", SipPreferences.class);
} }
return xstream; return xstream;