OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-13 12:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use functionality from XStream2 where possible (#8504)

Browse Source
This commit is contained in:
Basil Crow authored and GitHub committed 2023-09-20 20:48:04 +02:00
1 parent af260cb526
commit 9edaffcf7b
3 files changed
+6 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/jenkins/install/InstallUtil.java
+3 -3
View File
@@ -27,7 +27,6 @@ package jenkins.install;
import static java.util.logging.Level.SEVERE;
import static java.util.logging.Level.WARNING;
import com.thoughtworks.xstream.XStream;
import edu.umd.cs.findbugs.annotations.CheckForNull;
import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Functions;
@@ -37,6 +36,7 @@ import hudson.model.UpdateCenter.DownloadJob.Installing;
import hudson.model.UpdateCenter.InstallationJob;
import hudson.model.UpdateCenter.UpdateCenterJob;
import hudson.util.VersionNumber;
import hudson.util.XStream2;
import jakarta.inject.Provider;
import java.io.File;
import java.io.IOException;
@@ -289,7 +289,7 @@ public class InstallUtil {
if (installingPluginsFile == null || !installingPluginsFile.exists()) {
return null;
}
return (Map<String, String>) new XStream().fromXML(installingPluginsFile);
return (Map<String, String>) new XStream2().fromXML(installingPluginsFile);
}
/**
@@ -319,7 +319,7 @@ public class InstallUtil {
}
}
try {
String installingPluginXml = new XStream().toXML(statuses);
String installingPluginXml = new XStream2().toXML(statuses);
Files.writeString(Util.fileToPath(installingPluginsFile), installingPluginXml, StandardCharsets.UTF_8);
} catch (IOException e) {
LOGGER.log(SEVERE, "Failed to save " + installingPluginsFile.getAbsolutePath(), e);