The Unified and Autonomous Development Platform
Fix issue #1038 - Upgrade failure (7.6.0 -> 7.7.0 or 7.8.8)
Robin Shen17d3410d2604
diff --git a/server-core/src/main/java/io/onedev/server/migration/VersionedXmlDoc.java b/server-core/src/main/java/io/onedev/server/migration/VersionedXmlDoc.javaindex 815b930a5a..d9ef0a1c5d 100644--- a/server-core/src/main/java/io/onedev/server/migration/VersionedXmlDoc.java+++ b/server-core/src/main/java/io/onedev/server/migration/VersionedXmlDoc.java@@ -402,7 +402,12 @@ public final class VersionedXmlDoc implements Document, Externalizable {public static VersionedXmlDoc fromXML(String xml) {try {// May contain some invalid characters, parse with 1.1- xml = StringUtils.replace(xml, "<?xml version=\"1.0\"", "<?xml version=\"1.1\"");++ // This is added originally due to issue #177, but writing XML with 1.0 and+ // reading with 1.1 resulting the issue #1038. Now input "" in an issue comment+ // and it seems that the sequence is escaped as "&#27;" in the backup, and+ // restore can run successfully without any issues. So just revert back+ // xml = StringUtils.replace(xml, "<?xml version=\"1.0\"", "<?xml version=\"1.1\"");return new VersionedXmlDoc(new SAXReader().read(new StringReader(xml)));} catch (Exception e) {throw ExceptionUtils.unchecked(e);diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.javaindex 12b0ab1a4a..066be5dd6a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java@@ -5,7 +5,6 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.server.web.asset.mermaid.MermaidResourceReference;import io.onedev.server.web.page.base.BasePage;@SuppressWarnings("serial")@@ -24,7 +23,6 @@ public class TestPage extends BasePage {public void renderHead(IHeaderResponse response) {super.renderHead(response);response.render(JavaScriptHeaderItem.forReference(new TestResourceReference()));- response.render(JavaScriptHeaderItem.forReference(new MermaidResourceReference()));response.render(OnDomReadyHeaderItem.forScript("onedev.server.test.onDomReady();"));}