[FIXED JENKINS-40914] Use Jenkins.XSTREAM2 for deserializing config f…

…iles Switched all XmlFile instances to use Jenkins.XSTREAM2 instead of the default one
jenkinsci · Jan 26, 2017 · e03e9b3 · e03e9b3
2 parents 1e606c9 + b74f78d
commit e03e9b3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/com/cloudbees/plugins/credentials/CredentialsProviderManager.java b/src/main/java/com/cloudbees/plugins/credentials/CredentialsProviderManager.java
@@ -181,7 +181,7 @@ public boolean filter(Object context, Descriptor descriptor) {
      */
     public static XmlFile getConfigFile() {
         // TODO switch to Jenkins.getInstance() once 2.0+ is the baseline
-        return new XmlFile(new File(Jenkins.getActiveInstance().getRootDir(), "credentials-configuration.xml"));
+        return new XmlFile(Jenkins.XSTREAM2, new File(Jenkins.getActiveInstance().getRootDir(), "credentials-configuration.xml"));
     }
 
     /**

diff --git a/src/main/java/com/cloudbees/plugins/credentials/SystemCredentialsProvider.java b/src/main/java/com/cloudbees/plugins/credentials/SystemCredentialsProvider.java
@@ -123,7 +123,7 @@ public SystemCredentialsProvider() {
      */
     public static XmlFile getConfigFile() {
         // TODO switch to Jenkins.getInstance() once 2.0+ is the baseline
-        return new XmlFile(new File(Jenkins.getActiveInstance().getRootDir(), "credentials.xml"));
+        return new XmlFile(Jenkins.XSTREAM2, new File(Jenkins.getActiveInstance().getRootDir(), "credentials.xml"));
     }
 
     /**