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

[JENKINS-48463] - update jenkins core to use xml v1.1

Browse Source 
- switched to KxmlDriver (needed for xml 1.1 support)
  - updated to create xml v1.1 headers
  - updated test to use KXml2Driver explicitly
  - updated unit tests to support xml v1.1
This commit is contained in:
mike cirioli committed 2018-01-24 09:24:56 -05:00
1 parent 9585f94cfc
commit 9a4a913e38
15 files changed
+38 -38
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/hudson/XmlFile.java
+3 -4
View File
@@ -26,7 +26,7 @@ package hudson;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.converters.Converter;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
import com.thoughtworks.xstream.io.xml.Xpp3Driver;
import com.thoughtworks.xstream.io.xml.KXml2Driver;
import hudson.diagnosis.OldDataMonitor;
import hudson.model.Descriptor;
import hudson.util.AtomicFileWriter;
@@ -39,7 +39,6 @@ import org.xml.sax.Locator;
import org.xml.sax.SAXException;
import org.xml.sax.ext.Locator2;
import org.xml.sax.helpers.DefaultHandler;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;
import java.io.BufferedInputStream;
@@ -172,7 +171,7 @@ public final class XmlFile {
mkdirs();
AtomicFileWriter w = new AtomicFileWriter(file);
try {
w.write("<?xml version='1.0' encoding='UTF-8'?>\n");
w.write("<?xml version='1.1' encoding='UTF-8'?>\n");
beingWritten.put(o, null);
writing.set(file);
try {
@@ -343,7 +342,7 @@ public final class XmlFile {
private static final SAXParserFactory JAXP = SAXParserFactory.newInstance();
private static final Xpp3Driver DEFAULT_DRIVER = new Xpp3Driver();
private static final KXml2Driver DEFAULT_DRIVER = new KXml2Driver();
static {
JAXP.setNamespaceAware(true);