From 0fc76cf7cae95961faf62b2b364f55afdf93ac0e Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Sat, 31 Jan 2015 15:30:47 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)    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
---
 pom.xml                                                        | 3 ---
 .../alfresco/util/schemacomp/DbObjectXMLTransformerTest.java   | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6428ef0237..9c1677cc06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -303,9 +303,6 @@
         <dependency>
             <groupId>xalan</groupId>
             <artifactId>xalan</artifactId>
-            <!-- Need to override xalan version for tests - see ACE-2803 -->
-            <version>2.7.0</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
diff --git a/source/test-java/org/alfresco/util/schemacomp/DbObjectXMLTransformerTest.java b/source/test-java/org/alfresco/util/schemacomp/DbObjectXMLTransformerTest.java
index 589c71459f..f5a7225083 100644
--- a/source/test-java/org/alfresco/util/schemacomp/DbObjectXMLTransformerTest.java
+++ b/source/test-java/org/alfresco/util/schemacomp/DbObjectXMLTransformerTest.java
@@ -94,6 +94,7 @@ public class DbObjectXMLTransformerTest
             // It was worth a try
         }
         t.setOutputProperty(OutputKeys.INDENT, "yes");
+        t.setOutputProperty(OutputKeys.STANDALONE, "no");
     
         writer = new StringWriter();
         xmlOut.setResult(new StreamResult(writer));
@@ -426,7 +427,7 @@ public class DbObjectXMLTransformerTest
 
     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()