inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
94042: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94000: Merged DEV to 5.0.N (5.0.1)
         91309,91311 : MNT-12705 : Cannot upgrade Xalan to 2.7.2 because DbObjectXMLTransformerTest fails
            - Put STANDALONE to transformet to force newline after xml declaration. pox.xml dependency is changed


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95035 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 15:30:47 +00:00
parent 6744ed5cde
commit 0fc76cf7ca
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pom.xml
View File

@@ -303,9 +303,6 @@
<dependency> <dependency>
<groupId>xalan</groupId> <groupId>xalan</groupId>
<artifactId>xalan</artifactId> <artifactId>xalan</artifactId>
<!-- Need to override xalan version for tests - see ACE-2803 -->
<version>2.7.0</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>

3
source/test-java/org/alfresco/util/schemacomp/DbObjectXMLTransformerTest.java
View File

@@ -94,6 +94,7 @@ public class DbObjectXMLTransformerTest
// It was worth a try // It was worth a try
} }
t.setOutputProperty(OutputKeys.INDENT, "yes"); t.setOutputProperty(OutputKeys.INDENT, "yes");
t.setOutputProperty(OutputKeys.STANDALONE, "no");
writer = new StringWriter(); writer = new StringWriter();
xmlOut.setResult(new StreamResult(writer)); xmlOut.setResult(new StreamResult(writer));
@@ -426,7 +427,7 @@ public class DbObjectXMLTransformerTest
private void assertHasPreamble(BufferedReader reader) throws IOException private void assertHasPreamble(BufferedReader reader) throws IOException
{ {
assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>", reader.readLine()); assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>", reader.readLine());
} }
private void dumpOutput() private void dumpOutput()