From efa1f96daf082bc12595e8ec9d207053d355ce60 Mon Sep 17 00:00:00 2001
From: David Edwards <david.edwards@alfresco.com>
Date: Wed, 8 Apr 2020 10:02:20 +0100
Subject: [PATCH 1/3] ATS-702 fix header

---
 .../alfresco/transformer/AIOControllerHttpRequestTest.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerHttpRequestTest.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerHttpRequestTest.java
index 92891db0..0618960b 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerHttpRequestTest.java
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerHttpRequestTest.java
@@ -2,7 +2,7 @@
  * #%L
  * Alfresco Transform Core
  * %%
- * Copyright (C) 2005 - 2019 Alfresco Software Limited
+ * Copyright (C) 2005 - 2020 Alfresco Software Limited
  * %%
  * This file is part of the Alfresco software.
  * -
@@ -49,4 +49,4 @@ public class AIOControllerHttpRequestTest extends  AbstractHttpRequestTest
         return "jpg";
     }
 
-}
\ No newline at end of file
+}

From c85c38baf9d6ca599db99deb873c8c4207a2fd3d Mon Sep 17 00:00:00 2001
From: David Edwards <david.edwards@alfresco.com>
Date: Wed, 8 Apr 2020 10:03:34 +0100
Subject: [PATCH 2/3] ATS-702 fix comments

---
 .../transformer/AIOControllerImageMagickTest.java  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerImageMagickTest.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerImageMagickTest.java
index eb93a8fc..d1d0ef70 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerImageMagickTest.java
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerImageMagickTest.java
@@ -104,7 +104,7 @@ public class AIOControllerImageMagickTest extends ImageMagickControllerTestBase
     @Override
     public void noTargetFileTest()
     {
-        // Ignore the test in super class as the AIO transforms we not be selected .
+        // Ignore the test in super class as the AIO transforms will not be selected .
         // It is the mock that returns a zero length file for other transformers, when we supply an invalid targetExtension.
     }
    
@@ -112,7 +112,7 @@ public class AIOControllerImageMagickTest extends ImageMagickControllerTestBase
     @Override
     public void testGetTransformConfigInfo()
     {
-        // Ignore the test in super class as the AIO transforms we not be selected .
+        // Ignore the test in super class as the AIO transforms will not be selected .
 
     }
 
@@ -120,21 +120,21 @@ public class AIOControllerImageMagickTest extends ImageMagickControllerTestBase
     @Override
     public void testGetInfoFromConfigWithDuplicates()
     {
-        // Ignore the test in super class as the AIO transforms we not be selected .
+        // Ignore the test in super class as the AIO transforms will not be selected .
 
     }
     @Test
     @Override
     public void testGetInfoFromConfigWithEmptyTransformOptions()
     {
-        // Ignore the test in super class as the AIO transforms we not be selected .
+        // Ignore the test in super class as the AIO transforms will not be selected .
 
     }
     @Test
     @Override
     public void testGetInfoFromConfigWithNoTransformOptions()
     {
-        // Ignore the test in super class as the AIO transforms we not be selected .
+        // Ignore the test in super class as the AIO transforms will not be selected .
 
     }
     
@@ -143,7 +143,7 @@ public class AIOControllerImageMagickTest extends ImageMagickControllerTestBase
     public void deprecatedCommandOptionsTest() throws Exception
     {
         // Ignore test in super class as the CommandOptions is not within the imagemagick_engine_config.json
-        // as such it will not be considere a to have a valid transformer.
+        // as such it will not be considered to have a valid transformer.
 
     }
-}
\ No newline at end of file
+}

From 98d77b5ad10339b500df03f6b8622aadaa002c32 Mon Sep 17 00:00:00 2001
From: David Edwards <david.edwards@alfresco.com>
Date: Wed, 8 Apr 2020 10:04:58 +0100
Subject: [PATCH 3/3] AST-702 remove accidental commit

---
 alfresco-transform-tika/alfresco-transform-tika/pom.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/alfresco-transform-tika/alfresco-transform-tika/pom.xml b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
index 25db09a7..80e983c6 100644
--- a/alfresco-transform-tika/alfresco-transform-tika/pom.xml
+++ b/alfresco-transform-tika/alfresco-transform-tika/pom.xml
@@ -49,10 +49,6 @@
                     <groupId>org.quartz-scheduler</groupId>
                     <artifactId>quartz</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>xml-apis</groupId>
-                    <artifactId>xml-apis</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
 
@@ -113,4 +109,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>