Merge pull request #1390 from basil/default-driver

Use core default driver for XStream
jenkinsci · Sep 27, 2023 · 59f4009 · 59f4009
2 parents b6541e4 + 9cb7af7
commit 59f4009
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/job-dsl-plugin/src/main/java/javaposse/jobdsl/plugin/JenkinsJobManagement.java b/job-dsl-plugin/src/main/java/javaposse/jobdsl/plugin/JenkinsJobManagement.java
@@ -10,7 +10,6 @@
 import com.cloudbees.hudson.plugins.folder.properties.FolderCredentialsProvider.FolderCredentialsProperty;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.Iterables;
-import com.thoughtworks.xstream.io.xml.XppDriver;
 import groovy.util.Node;
 import groovy.util.XmlParser;
 import hudson.FilePath;
@@ -31,6 +30,7 @@
 import hudson.model.ViewGroup;
 import hudson.slaves.Cloud;
 import hudson.util.VersionNumber;
+import hudson.util.XStream2;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -507,7 +507,7 @@ private void checkItemType(AbstractItem item, javaposse.jobdsl.dsl.Item dslItem)
     private boolean viewTypeChanged(View view, InputStream config) throws IOException {
         Class viewType = Jenkins.XSTREAM2
                 .getMapper()
-                .realClass(new XppDriver().createReader(config).getNodeName());
+                .realClass(XStream2.getDefaultDriver().createReader(config).getNodeName());
         config.reset();
         return !viewType.equals(view.getClass());
     }