Merge branch 'master' into ATS-812_PoC_FFmpeg_skeleton

* master: (52 commits)
  [maven-release-plugin][skip ci] prepare for next development iteration
  [maven-release-plugin][skip ci] prepare release 2.5.7-A4
  ACS-2587 Fix test failure
  ACS-2587 Include directAccessUrl in T-Config if supported (#539)
  ATS-864: fix dependabot
  ATS-864: Switch from fabric8 to docker mvn plugin (#436)
  ACS-2072 Enforce third party license compliance.
  [maven-release-plugin][skip ci] prepare for next development iteration
  [maven-release-plugin][skip ci] prepare release 2.5.7-A3
  [trigger release] 2.5.7-A3
  Bump activemq-client from 5.16.3 to 5.16.4 (#534)
  Bump maven-javadoc-plugin from 3.3.1 to 3.3.2 (#533)
  ATS-981 Avoid CVE-2022-23181 with spring-boot-starter-web 2.6.3 (#537)
  [maven-release-plugin][skip ci] prepare for next development iteration
  [maven-release-plugin][skip ci] prepare release 2.5.7-A2
  [trigger release] 2.5.7-A2
  ACS-2497 Rework httpTransformRequestUsingDirectAccessUrlTest so it can be used in AI and Aspose (#535)
  Bump docker-maven-plugin from 0.38.1 to 0.39.0 (#528)
  [maven-release-plugin][skip ci] prepare for next development iteration
  [maven-release-plugin][skip ci] prepare release 2.5.7-A1
  ...

# Conflicts:
#	.travis.yml
#	alfresco-transformer-base/src/main/java/org/alfresco/transformer/util/RequestParamMap.java

Also bumped pom.xml version (for two ffmpeg folders) from 2.5.5-A2-SNAPSHOT to match others (2.5.7-A5-SNAPSHOT)

.github/dependabot.yml

@@ -13,10 +13,6 @@ updates:
     time: "22:00"
     timezone: Europe/London
   open-pull-requests-limit: 99
-  ignore:
-  - dependency-name: io.fabric8:fabric8-maven-plugin
-    versions:
-    - "> 4.4.0, < 4.5"
   registries:
   - maven-alfresco-internal
 - package-ecosystem: docker

.travis.yml

@@ -21,7 +21,6 @@ branches:
     - master
     - /^SP\/.+$/
     - /^HF\/.+$/
-    - company_release
     - /^ATS-.*$/
     - /^ACS-.*$/
 
@@ -30,7 +29,6 @@ stages:
     if: branch = master
   - build and test
   - release
-  - company_release
 
 before_install: bash _ci/init.sh
 
@@ -47,61 +45,44 @@ jobs:
       before_script: travis_wait bash _ci/cache_artifacts.sh
       install: travis_wait 20 mvn -B -U -q clean install -DadditionalOption=-Xdoclint:none -DskipTests -Dmaven.javadoc.skip=true -Dmaven.wagon.http.pool=false -Pbase
       script: mvn -B -U clean deploy -DadditionalOption=-Xdoclint:none -Dmaven.javadoc.skip=true -Dmaven.wagon.http.pool=false -Pbase
+
 # TODO PoC for Video/Audio transforms (using FFmpeg)
     - name: "Transform Video/Audio (FFmpeg)"
       stage: build and test
       if: branch NOT IN (company_release)
       before_script: travis_wait bash _ci/cache_artifacts.sh
       install: _ci/build.sh ffmpeg
       script: bash _ci/test.sh ffmpeg
-#    - name: "ImageMagick"
-#      stage: build and test
-#      if: branch NOT IN (company_release)
-#      before_script: travis_wait bash _ci/cache_artifacts.sh
-#      install: _ci/build.sh imagemagick
-#      script: bash _ci/test.sh imagemagick
-#    - name: "LibreOffice"
-#      stage: build and test
-#      if: branch NOT IN (company_release)
-#      before_script: travis_wait bash _ci/cache_artifacts.sh
-#      install: _ci/build.sh libreoffice
-#      script: bash _ci/test.sh libreoffice
-#    - name: "Transform Misc"
-#      stage: build and test
-#      if: branch NOT IN (company_release)
-#      before_script: travis_wait bash _ci/cache_artifacts.sh
-#      install: _ci/build.sh misc
-#      script: bash _ci/test.sh misc
-#    - name: "PDF Renderer"
-#      stage: build and test
-#      if: branch NOT IN (company_release)
-#      before_script: travis_wait bash _ci/cache_artifacts.sh
-#      install: _ci/build.sh pdf-renderer
-#      script: bash _ci/test.sh pdf-renderer
-#    - name: "Tika"
-#      stage: build and test
-#      if: branch NOT IN (company_release)
-#      before_script: travis_wait bash _ci/cache_artifacts.sh
-#      install: _ci/build.sh tika
-#      script: bash _ci/test.sh tika
-#    - name: "All in One Transformer"
-#      stage: build and test
-#      if: branch NOT IN (company_release)
-#      before_script: travis_wait bash _ci/cache_artifacts.sh
-#      install: _ci/build.sh full-build
-#      script:  travis_wait 30 bash _ci/test.sh aio-test
-    # - name: "WhiteSource"
-    #   stage: build and test
-    #   if: branch NOT IN (company_release)
-    #   script: bash _ci/whitesource.sh
-    # - name: "Source Clear Scan (SCA)"
-    #   if: branch NOT IN (company_release)
-    #   install: skip
-    #   script: travis_wait 30 bash _ci/sourceclear.sh
+
+    - name: "ImageMagick"
+      before_script: travis_wait bash _ci/cache_artifacts.sh
+      install: _ci/build.sh imagemagick
+      script: bash _ci/test.sh imagemagick
+    - name: "LibreOffice"
+      before_script: travis_wait bash _ci/cache_artifacts.sh
+      install: _ci/build.sh libreoffice
+      script: bash _ci/test.sh libreoffice
+    - name: "Transform Misc"
+      before_script: travis_wait bash _ci/cache_artifacts.sh
+      install: _ci/build.sh misc
+      script: bash _ci/test.sh misc
+    - name: "PDF Renderer"
+      before_script: travis_wait bash _ci/cache_artifacts.sh
+      install: _ci/build.sh pdf-renderer
+      script: bash _ci/test.sh pdf-renderer
+    - name: "Tika"
+      before_script: travis_wait bash _ci/cache_artifacts.sh
+      install: _ci/build.sh tika
+      script: bash _ci/test.sh tika
+    - name: "All in One Transformer"
+      before_script: travis_wait bash _ci/cache_artifacts.sh
+      install: _ci/build.sh full-build
+      script:  travis_wait 30 bash _ci/test.sh aio-test
+
 #    - name: "Static Analysis (SAST)"
 #      stage: build and test
 # TODO ATS-721: comment out until it is possible to run concurrent SAST scans
-#    if: branch NOT IN (company_release) AND type != pull_request
+#    if: type != pull_request
 #      if: branch = master AND type != pull_request
 #      before_install:
 #      - bash _ci/static_analysis_init.sh
@@ -113,34 +94,3 @@ jobs:
       if: commit_message ~= /\[trigger release\]/ AND branch ~= /^(master|SP\/.+|HF\/.+)$/
       before_script: travis_wait bash _ci/cache_artifacts.sh
       script: travis_wait 55 bash _ci/release.sh
-      before_deploy: source _ci/prepare_staging_deploy.sh
-      deploy:
-        provider: s3
-        access_key_id: "${STAGING_AWS_ACCESS_KEY}"
-        secret_access_key: "${STAGING_AWS_SECRET_KEY}"
-        bucket: "alfresco-artefacts-staging"
-        skip_cleanup: true
-        region: "eu-west-1"
-        local_dir: "deploy_dir"
-        upload-dir: "enterprise/AlfrescoTransformServices/TransformEngines/${VERSION}"
-        on:
-          all_branches: true
-
-    - name: "Company Release"
-      stage: company_release
-      if: branch = company_release
-      before_install: bash _ci/init.sh
-      install: echo "NoOp"
-      script: echo "NoOp"
-      before_deploy: source _ci/prepare_release_deploy.sh
-      deploy:
-        provider: s3
-        access_key_id: "${RELEASE_AWS_ACCESS_KEY}"
-        secret_access_key: "${RELEASE_AWS_SECRET_KEY}"
-        bucket: "eu.dl.alfresco.com"
-        skip_cleanup: true
-        region: "eu-west-1"
-        local_dir: "deploy_dir"
-        upload-dir: "release/enterprise/AlfrescoTransformServices/TransformEngines/${VERSION}"
-        on:
-          branch: company_release

README.md

@@ -13,7 +13,7 @@ Contains the common transformer (T-Engine) code, plus a few actual implementatio
 
 ### Documentation
 
-In addition to the sub-projects (such as `alfresco-transformer-base` README above) some additional documentation can be found in:
+In addition to the subprojects (such as `alfresco-transformer-base` README above) some additional documentation can be found in:
 
 * [this project's docs](docs) folder
 * [ACS Packaging docs](https://github.com/Alfresco/acs-packaging/tree/master/docs) folder
@@ -68,7 +68,7 @@ You can find examples of using Core AIO in the reference ACS Deployment for Dock
 * [ACS Community](https://github.com/Alfresco/acs-deployment/blob/master/docker-compose/community-docker-compose.yml)
 * [ACS Enterprise](https://github.com/Alfresco/acs-deployment/blob/master/docker-compose/docker-compose.yml)
 
-You can find examples of using the indivudal T-Engines in the reference ACS Deployment for Helm / Kubernetes:
+You can find examples of using the individual T-Engines in the reference ACS Deployment for Helm / Kubernetes:
 * [ACS Community](https://github.com/Alfresco/acs-deployment/blob/master/helm/alfresco-content-services/community_values.yaml)
 * [ACS Enterprise](https://github.com/Alfresco/acs-deployment/blob/master/helm/alfresco-content-services/values.yaml)
 

_ci/cache_artifacts.sh

@@ -5,7 +5,7 @@ PS4="\[\e[35m\]+ \[\e[m\]"
 set -vex
 pushd "$(dirname "${BASH_SOURCE[0]}")/../"
 
-LIBREOFFICE_VERSION=6.3.5
+LIBREOFFICE_VERSION=7.0.6
 
 # Cache the LibreOffice distribution, as it is takes a long time to download and it can cause the
 # build to fail (no output for more than 10 minutes)

_ci/settings.xml

@@ -28,10 +28,6 @@
                     <url>https://artifacts.alfresco.com/nexus/content/groups/internal</url>
                 </pluginRepository>
             </pluginRepositories>
-            <properties>
-                <!-- WhiteSource token -->
-                <org.whitesource.orgToken>${env.WHITESOURCE_TOKEN}</org.whitesource.orgToken>
-            </properties>
         </profile>
     </profiles>
 

_ci/source_clear.sh

@@ -5,7 +5,7 @@ PS4="\[\e[35m\]+ \[\e[m\]"
 set +e -v -x
 pushd "$(dirname "${BASH_SOURCE[0]}")/../"
 
-mvn -B -q clean install \
+mvn -B -U -q clean install \
     -DskipTests \
     -Dmaven.javadoc.skip=true \
     com.srcclr:srcclr-maven-plugin:scan \

alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile

@@ -52,6 +52,7 @@ RUN ln /usr/bin/alfresco-transform-core-aio-boot-${env.project_version}.jar /usr
     make && \
     make test && \
     make install) && \
+    yum -y autoremove perl-ExtUtils-MakeMaker make && rm -rf ${EXIFTOOL_FOLDER} ${EXIFTOOL_FOLDER}.tgz && \
     yum clean all
 
 ADD target/generated-resources/licenses              /licenses