ATS-829 Release T-Engines 2.3.6 (#307)

ATS-829: Release T-Core (T-Engines) 2.3.6 [trigger release]

Linked to REPO-5219 Allow AGS AMP to specify metadata extract mapping

Added an extractMapping transform option to all metadata extractors to override the default one.

3rd party libraries to get a green build.
* Upgrade cxf-rt-transports-http and woodstox-core to avoid issues
* Upgrade to org.springframework.boot:spring-boot-starter-parent:2.3.5.RELEASE to avoid problem in org.springframework:spring-web
* Upgrade to activemq 5.15.13 to avoid problem in activemq-broker 5.15.12

alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transformer/AIOTransformRegistryTest.java

@@ -48,6 +48,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static org.alfresco.transformer.util.RequestParamMap.PAGE_LIMIT;
 import static org.alfresco.transformer.util.RequestParamMap.TRANSFORM_NAME_PARAMETER;
@@ -97,7 +98,7 @@ public class AIOTransformRegistryTest
                 "Archive", "OutlookMsg", "PdfBox", "Office", "Poi", "OOXML", "TikaAuto", "TextMining");
 
         List<String> expectedTransformOptionNames = Arrays.asList("tikaOptions", "archiveOptions", "pdfboxOptions",
-                "textToPdfOptions", "stringOptions");
+                "textToPdfOptions", "stringOptions", "metadataOptions");
 
         TransformConfig miscConfig = loadConfig("misc_engine_config.json");
         TransformConfig tikaConfig = loadConfig("tika_engine_config.json");
@@ -116,8 +117,11 @@ public class AIOTransformRegistryTest
         }
 
         // check correct number of options
+        long distinctOptionCount = Stream.concat(
+                miscConfig.getTransformOptions().keySet().stream(),
+                tikaConfig.getTransformOptions().keySet().stream()).distinct().count();
         assertEquals("Number of expected transformers",
-                miscConfig.getTransformOptions().size() + tikaConfig.getTransformOptions().size(),
+                distinctOptionCount,
                 aioTransformerRegistry.getTransformConfig().getTransformOptions().size());
 
         Set<String> actualOptionNames = aioTransformerRegistry.getTransformConfig().getTransformOptions().keySet();
@@ -125,7 +129,7 @@ public class AIOTransformRegistryTest
         // check all options are there
         for (String optionName : expectedTransformOptionNames)
         {
-            assertTrue("Expected transform option missing.",  actualOptionNames.contains(optionName));
+            assertTrue("Expected transform option missing:"+optionName,  actualOptionNames.contains(optionName));
         }
     }
 

alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/resources/misc_engine_config.json

@@ -5,6 +5,9 @@
     ],
     "stringOptions": [
       {"value": {"name": "targetEncoding"}}
+    ],
+    "metadataOptions": [
+      {"value": {"name": "extractMapping"}}
     ]
   },
   "transformers": [
@@ -77,6 +80,7 @@
         {"sourceMediaType": "application/xhtml+xml",                         "targetMediaType": "alfresco-metadata-extract"}
       ],
       "transformOptions": [
+        "metadataOptions"
       ]
     },
     {
@@ -85,6 +89,7 @@
         {"sourceMediaType": "message/rfc822",                                "targetMediaType": "alfresco-metadata-extract"}
       ],
       "transformOptions": [
+        "metadataOptions"
       ]
     }
   ]

alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/resources/tika_engine_config.json

@@ -10,6 +10,9 @@
     "pdfboxOptions": [
       {"value": {"name": "notExtractBookmarksText"}},
       {"value": {"name": "targetEncoding"}}
+    ],
+    "metadataOptions": [
+      {"value": {"name": "extractMapping"}}
     ]
   },
   "transformers": [
@@ -520,6 +523,7 @@
         {"sourceMediaType": "image/x-dwg",                                                                "targetMediaType": "alfresco-metadata-extract"}
       ],
       "transformOptions": [
+        "metadataOptions"
       ]
     },
     {
@@ -528,6 +532,7 @@
         {"sourceMediaType": "application/vnd.ms-outlook",                                                 "targetMediaType": "alfresco-metadata-extract"}
       ],
       "transformOptions": [
+        "metadataOptions"
       ]
     },
     {
@@ -536,6 +541,7 @@
         {"sourceMediaType": "audio/mpeg",                                                                 "targetMediaType": "alfresco-metadata-extract"}
       ],
       "transformOptions": [
+        "metadataOptions"
       ]
     },
     {
@@ -556,6 +562,7 @@
         {"sourceMediaType": "application/x-tika-ooxml-protected",                                         "targetMediaType": "alfresco-metadata-extract"}
       ],
       "transformOptions": [
+        "metadataOptions"
       ]
     },
     {
@@ -601,6 +608,7 @@
         {"sourceMediaType": "application/x-vnd.oasis.opendocument.graphics",                              "targetMediaType": "alfresco-metadata-extract"}
       ],
       "transformOptions": [
+        "metadataOptions"
       ]
     },
     {
@@ -610,6 +618,7 @@
         {"sourceMediaType": "application/illustrator",                                                    "targetMediaType": "alfresco-metadata-extract"}
       ],
       "transformOptions": [
+        "metadataOptions"
       ]
     },
     {
@@ -645,6 +654,7 @@
         {"sourceMediaType": "application/vnd.ms-excel.template.macroenabled.12",                          "targetMediaType": "alfresco-metadata-extract"}
       ],
       "transformOptions": [
+        "metadataOptions"
       ]
     },
     {
@@ -662,6 +672,7 @@
         {"sourceMediaType": "video/mp4",                                                                  "targetMediaType": "alfresco-metadata-extract"}
       ],
       "transformOptions": [
+        "metadataOptions"
       ]
     },
     {
@@ -968,6 +979,7 @@
         {"sourceMediaType": "image/hfa",                                                                  "targetMediaType": "alfresco-metadata-extract"}
       ],
       "transformOptions": [
+        "metadataOptions"
       ]
     }
   ]