Fix build

engines/aio/pom.xml

@@ -5,10 +5,10 @@
     <name>- All-In-One</name>
 
     <parent>
-        <artifactId>alfresco-transform-core</artifactId>
         <groupId>org.alfresco</groupId>
-        <version>2.6.1-SNAPSHOT</version>
+        <artifactId>alfresco-transform-core</artifactId>
         <relativePath>../../pom.xml</relativePath>
+        <version>2.6.1-SNAPSHOT</version>
     </parent>
 
     <properties>

engines/aio/src/test/java/org/alfresco/transform/aio/AIOTikaTest.java

@@ -6,13 +6,13 @@
  * %%
  * This file is part of the Alfresco software.
  * -
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
+ * If the software was purchased under a paid Alfresco license", "the terms of
+ * the paid license agreement will prevail.  Otherwise", "the software is
  * provided under the following open source license terms:
  * -
  * Alfresco is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation", "either version 3 of the License", "or
  * (at your option) any later version.
  * -
  * Alfresco is distributed in the hope that it will be useful,
@@ -21,16 +21,54 @@
  * GNU Lesser General Public License for more details.
  * -
  * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * along with Alfresco. If not", "see <http://www.gnu.org/licenses/>.
  * #L%
  */
 package org.alfresco.transform.aio;
 
+import com.google.common.collect.ImmutableSet;
 import org.alfresco.transform.tika.TikaTest;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Test Tika functionality in All-In-One.
  */
 public class AIOTikaTest extends TikaTest
 {
+    @Test
+    public void optionListTest()
+    {
+        assertEquals(ImmutableSet.of(
+                "allowEnlargement",
+                "allowPdfEnlargement",
+                "alphaRemove",
+                "autoOrient",
+                "commandOptions",
+                "cropGravity",
+                "cropHeight",
+                "cropPercentage",
+                "cropWidth",
+                "cropXOffset",
+                "cropYOffset",
+                "endPage",
+                "extractMapping",
+                "height",
+                "includeContents",
+                "maintainAspectRatio",
+                "maintainPdfAspectRatio",
+                "metadata",
+                "notExtractBookmarksText",
+                "page",
+                "pageLimit",
+                "resizeHeight",
+                "resizePercentage",
+                "resizeWidth",
+                "startPage",
+                "targetEncoding",
+                "thumbnail",
+                "width"),
+            optionLister.getOptionNames(controller.transformConfig(0).getBody().getTransformOptions()));
+    }
 }

engines/base/pom.xml

@@ -7,6 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-transform-core</artifactId>
+        <relativePath>../../pom.xml</relativePath>
         <version>2.6.1-SNAPSHOT</version>
     </parent>
 

engines/example/pom.xml

@@ -5,10 +5,10 @@
     <name>- Example</name>
 
     <parent>
-        <artifactId>alfresco-transform-core</artifactId>
         <groupId>org.alfresco</groupId>
-        <version>2.6.1-SNAPSHOT</version>
+        <artifactId>alfresco-transform-core</artifactId>
         <relativePath>../../pom.xml</relativePath>
+        <version>2.6.1-SNAPSHOT</version>
     </parent>
 
     <properties>

engines/imagemagick/pom.xml

@@ -5,10 +5,10 @@
     <name>- ImageMagick</name>
 
     <parent>
-        <artifactId>alfresco-transform-core</artifactId>
         <groupId>org.alfresco</groupId>
-        <version>2.6.1-SNAPSHOT</version>
+        <artifactId>alfresco-transform-core</artifactId>
         <relativePath>../../pom.xml</relativePath>
+        <version>2.6.1-SNAPSHOT</version>
     </parent>
 
     <properties>

engines/libreoffice/pom.xml

@@ -5,10 +5,10 @@
     <name>- LibreOffice</name>
 
     <parent>
-        <artifactId>alfresco-transform-core</artifactId>
         <groupId>org.alfresco</groupId>
-        <version>2.6.1-SNAPSHOT</version>
+        <artifactId>alfresco-transform-core</artifactId>
         <relativePath>../../pom.xml</relativePath>
+        <version>2.6.1-SNAPSHOT</version>
     </parent>
 
     <properties>

engines/misc/pom.xml

@@ -5,10 +5,10 @@
     <name>- Misc</name>
 
     <parent>
-        <artifactId>alfresco-transform-core</artifactId>
         <groupId>org.alfresco</groupId>
-        <version>2.6.1-SNAPSHOT</version>
+        <artifactId>alfresco-transform-core</artifactId>
         <relativePath>../../pom.xml</relativePath>
+        <version>2.6.1-SNAPSHOT</version>
     </parent>
 
     <properties>

engines/misc/src/test/java/org/alfresco/transform/misc/MiscTest.java

@@ -26,14 +26,11 @@
  */
 package org.alfresco.transform.misc;
 
-import com.google.common.collect.ImmutableSet;
 import org.alfresco.transform.base.AbstractBaseTest;
-import org.alfresco.transform.base.html.OptionLister;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.text.PDFTextStripper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
@@ -65,8 +62,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
  */
 public class MiscTest extends AbstractBaseTest
 {
-    @Autowired OptionLister optionLister;
-
     protected final String sourceEncoding = "UTF-8";
     protected final String targetEncoding = "UTF-8";
     protected final String targetMimetype = MIMETYPE_TEXT_PLAIN;
@@ -503,14 +498,4 @@ public class MiscTest extends AbstractBaseTest
         super.targetMimetype = this.targetMimetype;
         super.queueTransformRequestUsingDirectAccessUrlTest();
     }
-
-    @Test
-    public void optionListTest()
-    {
-        assertEquals(ImmutableSet.of(
-                "pageLimit",
-                "targetEncoding",
-                "extractMapping"),
-        optionLister.getOptionNames(controller.transformConfig(0).getBody().getTransformOptions()));
-    }
 }

engines/pdfrenderer/pom.xml

@@ -7,8 +7,8 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-transform-core</artifactId>
-        <version>2.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
+        <version>2.6.1-SNAPSHOT</version>
     </parent>
 
     <properties>

engines/tika/pom.xml

@@ -5,10 +5,10 @@
     <name>- Tika</name>
 
     <parent>
-        <artifactId>alfresco-transform-core</artifactId>
         <groupId>org.alfresco</groupId>
-        <version>2.6.1-SNAPSHOT</version>
+        <artifactId>alfresco-transform-core</artifactId>
         <relativePath>../../pom.xml</relativePath>
+        <version>2.6.1-SNAPSHOT</version>
     </parent>
 
     <properties>

engines/tika/src/test/java/org/alfresco/transform/tika/TikaTest.java

@@ -119,7 +119,7 @@ public class TikaTest extends AbstractBaseTest
                                                                 "The quick brown fox jumps over the lazy dogs";
     private static final String EXPECTED_CSV_CONTENT_CONTAINS = "\"The\",\"quick\",\"brown\",\"fox\"";
 
-    @Autowired OptionLister optionLister;
+    protected @Autowired OptionLister optionLister;
 
     @Mock
     private RuntimeExec.ExecutionResult mockExecutionResult;

pom.xml

@@ -3,8 +3,8 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.alfresco</groupId>
     <artifactId>alfresco-transform-core</artifactId>
-    <name>Alfresco Transform Core</name>
     <version>2.6.1-SNAPSHOT</version>
+    <name>Alfresco Transform Core</name>
     <packaging>pom</packaging>
 
     <parent>