[ACS-9823]:[publish] release 4.12.0 (#726)

* [ACS-9823]: [publish] migrate from nexus-staging-maven-pluging to central-publishing-maven-plugin

* [ACS-9823]: release 4.12.0-A1

.ci.settings.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+  
+  <servers>
+    <server>
+      <id>alfresco-private-repository</id>
+      <username>${env.MAVEN_USERNAME}</username>
+      <password>${env.MAVEN_PASSWORD}</password>
+    </server>
+    <server>
+      <id>activiti-private-repository</id>
+      <username>${env.MAVEN_USERNAME}</username>
+      <password>${env.MAVEN_PASSWORD}</password>
+    </server>
+    <server>
+      <id>alfresco-public-snapshots</id>
+      <username>${env.MAVEN_USERNAME}</username>
+      <password>${env.MAVEN_PASSWORD}</password>
+    </server>
+    <server>
+      <id>alfresco-public</id>
+      <username>${env.MAVEN_USERNAME}</username>
+      <password>${env.MAVEN_PASSWORD}</password>
+    </server>
+    <server>
+      <id>alfresco-plugin-public</id>
+      <username>${env.MAVEN_USERNAME}</username>
+      <password>${env.MAVEN_PASSWORD}</password>
+    </server>
+    <server>
+      <id>alfresco-plugin-public-snapshots</id>
+      <username>${env.MAVEN_USERNAME}</username>
+      <password>${env.MAVEN_PASSWORD}</password>
+    </server>
+    <server>
+      <id>alfresco-internal-snapshots</id>
+      <username>${env.MAVEN_USERNAME}</username>
+      <password>${env.MAVEN_PASSWORD}</password>
+    </server>
+    <server>
+      <id>alfresco-internal</id>
+      <username>${env.MAVEN_USERNAME}</username>
+      <password>${env.MAVEN_PASSWORD}</password>
+    </server>
+    <server>
+      <id>central-releases-staging</id>
+      <username>${env.MAVEN_CENTRAL_USERNAME}</username>
+      <password>${env.MAVEN_CENTRAL_PASSWORD}</password>
+    </server>
+  </servers>
+</settings>

.github/workflows/ci.yml

@@ -0,0 +1,209 @@
+name: Alfresco SDK CI
+
+on:
+  pull_request:
+    branches:
+      - master
+      - fix/**
+      - feature/**
+  push:
+    branches:
+      - master
+      - fix/**
+      - feature/**
+  workflow_dispatch:
+
+env:
+  MAVEN_USERNAME: ${{ secrets.NEXUS_USERNAME }}
+  MAVEN_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
+  MAVEN_CENTRAL_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
+  MAVEN_CENTRAL_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}
+  GPG_SIGNING_PASSPHRASE: ${{ secrets.GPG_SIGNING_PASSPHRASE }}
+  GITHUB_ACTIONS_DEPLOY_TIMEOUT: 90
+
+jobs:
+  pre_commit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v8.16.0
+
+  veracode_sca:
+    name: "Veracode - Source Clear Scan (SCA)"
+    runs-on: ubuntu-latest
+    if: >
+      github.ref_name == 'master' ||
+      github.event_name == 'pull_request'
+    steps:
+      - uses: actions/checkout@v4
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
+      - name: "Clean-up SNAPSHOT artifacts"
+        run: find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf
+      - uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v8.16.0
+        continue-on-error: true
+        with:
+          srcclr-api-token: ${{ secrets.SRCCLR_API_TOKEN }}
+
+  build:
+    name: "Build application"
+    runs-on: ubuntu-latest
+    needs: [pre_commit]
+    if: "!contains(github.event.head_commit.message, '[skip tests]')"
+    env:
+      MAVEN_CLI_OPTS: >
+        -B -q -e -fae -V -DinstallAtEnd=true -U
+    steps:
+      - uses: actions/checkout@v4
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
+      - name: "Build"
+        run: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
+      - name: "Verify"
+        run: mvn $MAVEN_CLI_OPTS verify -Dlogging.root.level=off -Dspring.main.banner-mode=off
+
+  tests:
+    name: ${{ matrix.name }}
+    runs-on: ubuntu-latest
+    needs: [build]
+    if: >
+      !(failure() || cancelled()) &&
+      !contains(github.event.head_commit.message, '[skip tests]')
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: "current version Java 17"
+            java-version: 17
+          - name: "25.2 Enterprise Java 17"
+            java-version: 17
+            suite: -Penterprise-252-tests
+          - name: "25.2 Community Java 17"
+            java-version: 17
+            suite: -Pcommunity-252-tests
+          - name: "25.1 Enterprise Java 17"
+            java-version: 17
+            suite: -Penterprise-251-tests
+          - name: "25.1 Community Java 17"
+            java-version: 17
+            suite: -Pcommunity-251-tests
+          - name: "23.5 Enterprise Java 17"
+            java-version: 17
+            suite: -Penterprise-235-tests
+          - name: "23.4 Enterprise Java 17"
+            java-version: 17
+            suite: -Penterprise-234-tests
+          - name: "23.4 Community Java 17"
+            java-version: 17
+            suite: -Pcommunity-234-tests
+          - name: "23.3 Enterprise Java 17"
+            java-version: 17
+            suite: -Penterprise-233-tests
+          - name: "23.3 Community Java 17"
+            java-version: 17
+            suite: -Pcommunity-233-tests
+          - name: "23.2 Enterprise Java 17"
+            java-version: 17
+            suite: -Penterprise-232-tests
+          - name: "23.2 Community Java 17"
+            java-version: 17
+            suite: -Pcommunity-232-tests
+          - name: "23.1 Enterprise Java 17"
+            java-version: 17
+            suite: -Penterprise-231-tests
+          - name: "23.1 Community Java 17"
+            java-version: 17
+            suite: -Pcommunity-231-tests
+          - name: "7.4 Enterprise Java 17"
+            java-version: 17
+            suite: -Penterprise-74-tests
+          - name: "7.4 Community Java 17"
+            java-version: 17
+            suite: -Pcommunity-74-tests
+          - name: "7.4 Enterprise Java 11"
+            java-version: 11
+            suite: -Penterprise-74-tests
+          - name: "7.4 Community Java 11"
+            java-version: 11
+            suite: -Pcommunity-74-tests
+          - name: "7.3 Enterprise Java 17"
+            java-version: 17
+            suite: -Penterprise-73-tests
+          - name: "7.3 Community Java 17"
+            java-version: 17
+            suite: -Pcommunity-73-tests
+          - name: "7.3 Enterprise Java 11"
+            java-version: 11
+            suite: -Penterprise-73-tests
+          - name: "7.3 Community Java 11"
+            java-version: 11
+            suite: -Pcommunity-73-tests
+          - name: "7.2 Enterprise"
+            java-version: 11
+            suite: -Penterprise-72-tests
+          - name: "7.2 Community"
+            java-version: 11
+            suite: -Pcommunity-72-tests
+          - name: "7.1 Enterprise"
+            java-version: 11
+            suite: -Penterprise-71-tests
+          - name: "7.1 Community"
+            java-version: 11
+            suite: -Pcommunity-71-tests
+    steps:
+      - uses: actions/checkout@v4
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
+        with:
+          java-version: ${{ matrix.java-version }}
+      - name: "Login to Docker Hub"
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: "Login to Quay.io"
+        uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_PASSWORD }}
+      - name: "Build"
+        run: mvn clean install -B ${{ matrix.suite }}
+
+  publish:
+    name: "Publish artifacts"
+    runs-on: ubuntu-latest
+    needs: [tests]
+    if: >
+      contains(github.event.head_commit.message, '[publish]')
+    steps:
+      - uses: actions/checkout@v4
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
+      - name: "Build"
+        run: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
+      - name: Set up Maven Central credentials
+        run: |
+          echo "<settings xmlns=\"http://maven.apache.org/SETTINGS/1.0.0\"
+                xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"
+                xsi:schemaLocation=\"http://maven.apache.org/SETTINGS/1.0.0
+                https://maven.apache.org/xsd/settings-1.0.0.xsd\">
+            <servers>
+              <server>
+                <id>central</id>
+                <username>${{ secrets.MAVEN_CENTRAL_USERNAME }}</username>
+                <password>${{ secrets.MAVEN_CENTRAL_PASSWORD }}</password>
+              </server>
+            </servers>
+          </settings>" > ~/.m2/settings.xml
+      - name: Import GPG key
+        env:
+          GPG_TTY: $(tty)
+        run: |
+          echo "${{ secrets.GPG_SIGNING_PRIVATE_KEY }}" | gpg --batch --import
+          echo "use-agent" >> ~/.gnupg/gpg.conf
+          echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf
+          echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf
+          gpg --batch --yes --pinentry-mode loopback --passphrase $GPG_SIGNING_PASSPHRASE --list-keys
+      - name: "Publish"
+        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
+        run: |
+          mvn --batch-mode clean package gpg:sign central-publishing:publish -P sdk-release -DskipTests=true -Dgpg.passphrase=$GPG_SIGNING_PASSPHRASE

.pre-commit-config.yaml

@@ -0,0 +1,10 @@
+default_language_version:
+  # force all unspecified python hooks to run python3
+  python: python3
+
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.4.0
+    hooks:
+      - id: check-yaml
+        args: [--allow-multiple-documents]

README.md

@@ -1,5 +1,10 @@
 # [![Alfresco SDK logo](https://github.com/Alfresco/alfresco-sdk/raw/master/src/site/resources/img/alfresco-maven-logo.jpg)](#features) Alfresco SDK
 
+
+[![Build Status](https://github.com/Alfresco/alfresco-sdk/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/Alfresco/alfresco-sdk/actions/workflows/ci.yml)
+[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
+![GitHub](https://img.shields.io/github/license/Alfresco/alfresco-sdk?color=brightgreen)
+
 This is the home of the Alfresco SDK. The Alfresco SDK is used by developers to build extensions for the Alfresco Digital Business Platform. It is based on 
 [Apache Maven](http://maven.apache.org/), compatible with major IDEs and enables [Rapid Application Development (RAD)](https://en.wikipedia.org/wiki/Rapid_application_development) 
 and [Test Driven Development (TDD)](https://en.wikipedia.org/wiki/Test-driven_development).
@@ -9,7 +14,16 @@ This project is released under the [Apache License, Version 2.0](http://www.apac
 If you are an Enterprise customer check the [Support](#alfresco-enterprise-customers-and-partners-support) section.
 
 ## News
-
+- 2025-03: Alfresco SDK 4.11.0 released
+- 2024-11: Alfresco SDK 4.10.0 released
+- 2024-08: Alfresco SDK 4.9.0 released
+- 2024-03: Alfresco SDK 4.8.0 released
+- 2023-11: Alfresco SDK 4.7.0 released
+- 2023-06: Alfresco SDK 4.6.0 released
+- 2022-10: Alfresco SDK 4.5.0 released
+- 2022-03: Alfresco SDK 4.4.0 released
+- 2021-10: Alfresco SDK 4.3.0 released
+- 2021-02: Alfresco SDK 4.2.0 released
 - 2019-10: Alfresco SDK 4.1.0 released
 - 2019-03: Alfresco SDK 4.0.0 released
 - 2019-03: Alfresco SDK 3.1.0 released
@@ -25,20 +39,85 @@ If you are an Enterprise customer check the [Support](#alfresco-enterprise-custo
 
 ## User Getting Started
 
+### Important Notice about ACS 7.2
+
+Please refer to https://github.com/Alfresco/alfresco-sdk/issues/635 to fix the Search Services 403 problem.
+
+### Important Notice about ACS 7.1 
+
+#### Share Version Number
+
+Since ACS 7.1, Share build pipeline has been refactored, and you now have to specify the internal 
+Share version number, in addition to the version of the image, because they are not the same anymore.
+
+This number can be located in the main pom.xml of the project used to build Share, hence: 
+
+- property `<alfresco-community-share.version>` of [acs-community-packaging](https://github.com/Alfresco/acs-community-packaging/blob/7.1.0/pom.xml#L17) (Community)  
+- property `<alfresco-enterprise-share.version>`of [acs-packaging](https://github.com/Alfresco/acs-packaging/blob/7.1.0.1/pom.xml#L18) (Enterprise) 
+
+So, if for example you want to use the community version of `7.1.0.1`, you can go on acs-community-packaging, 
+open the `7.1.0.1` release tag, browse its files, open the pom.xml in the root, 
+then copy the value of `<alfresco-community-share.version>`. 
+
+You'll then need to paste this value inside the SDK property `<alfresco.share.version>`.
+
+#### Alternate Docker User
+
+- ACS 6 used to run everything as `root`.
+- ACS 7 introduced an `alfresco` user, that should've been used after the `root` user completed its configurations in the Dockerfile.
+
+Due to a bug, this wasn't working in earlier SDKs, and has been fixed in SDK 4.3.
+
+In order to be retro-compatible with ACS 6, however, the user is specified in the SDK property `<alfresco.platform.docker.user>`.
+
+Hence, its values (already in place) are `root` for ACS 6, and `alfresco` for ACS 7+.
+
+#### Log file location
+
+To prevent writing permission problems when logging with the non-root user, 
+the `alfresco.log` file has also been moved to a more appropriate location (Tomcat logs instead of Tomcat root).
+
+### Important Notice about Version Numbers
+
+In Q4 2020, Alfresco Platform has undergone a major structural refactoring.
+
+Depending on the Platform version desired, you might need to use SDK 4.1, 4.3, 4.4, 4.5, 4.6, 4.7, 4.8, 4.9 or SDK 4.10 instead of SDK 4.11.0.
+
+- For Enterprise and Community versions of 7.x, SDK 4.4 or higher must be used
+- For Enterprise versions of 6.0.x, 6.1.x, 6.2.x newer than November 2020, SDK 4.3 must be used
+- For Enterprise and Community versions of 6.0.x, 6.1.x, 6.2.x older than November 2020, SDK 4.1 must be used
+
+It's also important to remember that:
+
+- Community Platform versions are built by [acs-community-packaging](https://github.com/Alfresco/acs-community-packaging)
+- Community Docker images are published on [Docker Hub](https://hub.docker.com/r/alfresco/alfresco-content-repository-community/tags?page=1&ordering=last_updated)
+- Enterprise Platform versions are built by [acs-packaging](https://github.com/Alfresco/acs-packaging)
+- Enterprise Docker images are published on *Quay.io*
+
 ### Latest Documentation
-To get started with **Alfresco SDK 4.1.x** (latest) visit the [Alfresco Documentation](docs/README.md).
+To get started with **Alfresco SDK 4.9.x** (latest) visit the [Alfresco Documentation](docs/README.md).
 
 #### Documentation about Previous Versions
-| SDK Version  | Alfresco Enterprise Version       |  Alfresco Community Version       | Documentation  |
-| ------------- |:-------------:| :-----:|:-----|
-| SDK 4.1   | Alfresco 6.0.x / 6.1.x / 6.2.x | Alfresco 6.0.x / 6.1.x / 6.2.x | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md |
-| SDK 4.0   | Alfresco 6.0.x / 6.1.x | Alfresco 6.0.x / 6.1.x | https://github.com/Alfresco/alfresco-sdk/blob/sdk-4.0/docs/README.md |
-| SDK 3.1   | Alfresco 5.2.x | Alfresco 5.2.x | http://docs.alfresco.com/5.2/concepts/sdk-intro.html |
-| SDK 3.0   | Alfresco 5.2.x | Alfresco 5.2.x | http://docs.alfresco.com/5.2/concepts/sdk-intro.html |
-| SDK 2.2   | Alfresco 5.1.x | Alfresco 5.1.x | https://docs.alfresco.com/5.1/concepts/alfresco-sdk-intro.html |
-| SDK 2.1   | Alfresco 5.0.1 | Alfresco 5.0.d | https://docs.alfresco.com/sdk2.1/concepts/alfresco-sdk-intro.html |
-| SDK 2.0   | Alfresco 5.0.0 | Alfresco 5.0.c | https://docs.alfresco.com/sdk2.0/concepts/alfresco-sdk-intro.html |
-| SDK 1.1.1 | Alfresco 4.2.x | Alfresco 4.2.x | https://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-intro.html |
+| SDK Version   |                                Alfresco Enterprise Version                                 |                             Alfresco Community Version                             | Documentation                                                                                                                                                                                                   |
+|---------------|:------------------------------------------------------------------------------------------:|:----------------------------------------------------------------------------------:|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| SDK 4.11.0    | Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x / 23.1.x/ 23.2.x / 23.3.x / 23.4.x / 25.1.x | Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x / 23.2.x / 23.3.x / 23.4.x / 25.1.x | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                                                                                             |
+| SDK 4.10      |     Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x / 23.1.x/ 23.2.x / 23.3.x / 23.4.x      |     Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x / 23.2.x / 23.3.x / 23.4.x      | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                                                                                             |
+| SDK 4.9       |          Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x / 23.1.x/ 23.2.x / 23.3.x          |          Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x / 23.2.x / 23.3.x          | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                                                                                             |
+| SDK 4.8       |              Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x / 23.1.x/ 23.2.x               |              Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x / 23.2.x               | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                                                                                             |
+| SDK 4.7       |                  Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x / 23.1.x                   |              Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x / 23.1.x               | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                                                                                             |
+| SDK 4.6       |                       Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x                       |                   Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x                   | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                                                                                             |
+| SDK 4.5       |                           Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x                           |                       Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x                       | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                                                                                             |
+| SDK 4.4       |                               Alfresco 7.0.x / 7.1.x / 7.2.x                               |                           Alfresco 7.0.x / 7.1.x / 7.2.x                           | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                                                                                             |
+| SDK 4.3       |                       Alfresco 6.0.x / 6.1.x / 6.2.x / 7.0.x / 7.1.x                       |                               Alfresco 7.0.x / 7.1.x                               | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                                                                                             |
+| SDK 4.2       |                           Alfresco 6.0.x / 6.1.x / 6.2.x / 7.0.x                           |                                   Alfresco 7.0.x                                   | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                                                                                             |
+| SDK 4.1       |                               Alfresco 6.0.x / 6.1.x / 6.2.x                               |                           Alfresco 6.0.x / 6.1.x / 6.2.x                           | https://github.com/Alfresco/alfresco-sdk/blob/sdk-4.1/docs/README.md                                                                                                                                            |
+| SDK 4.0       |                                   Alfresco 6.0.x / 6.1.x                                   |                               Alfresco 6.0.x / 6.1.x                               | https://github.com/Alfresco/alfresco-sdk/blob/sdk-4.0/docs/README.md                                                                                                                                            |
+| SDK 3.1       |                                       Alfresco 5.2.x                                       |                                   Alfresco 5.2.x                                   | http://docs.alfresco.com/5.2/concepts/sdk-intro.html                                                                                                                                                            |
+| SDK 3.0       |                                       Alfresco 5.2.x                                       |                                   Alfresco 5.2.x                                   | http://docs.alfresco.com/5.2/concepts/sdk-intro.html                                                                                                                                                            |
+| SDK 2.2       |                                       Alfresco 5.1.x                                       |                                   Alfresco 5.1.x                                   | https://docs.alfresco.com/5.1/concepts/alfresco-sdk-intro.html                                                                                                                                                  |
+| SDK 2.1       |                                       Alfresco 5.0.1                                       |                                   Alfresco 5.0.d                                   | https://docs.alfresco.com/sdk2.1/concepts/alfresco-sdk-intro.html                                                                                                                                               |
+| SDK 2.0       |                                       Alfresco 5.0.0                                       |                                   Alfresco 5.0.c                                   | https://docs.alfresco.com/sdk2.0/concepts/alfresco-sdk-intro.html                                                                                                                                               |
+| SDK 1.1.1     |                                       Alfresco 4.2.x                                       |                                   Alfresco 4.2.x                                   | https://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-intro.html                                                                                                                                      |
 
 ## Reporting Issues and Community Support
 Report issues (and contribute!) [here](https://github.com/Alfresco/alfresco-sdk/issues?milestone=1&state=open) or join us on the [IRC Channel](http://chat.alfresco.com/).
@@ -85,3 +164,16 @@ To test new unreleased (unsupported) features, you can use the following snippet
 
 ## For Developers that want to contribute to the SDK
 See the [Developers Wiki page](https://github.com/Alfresco/alfresco-sdk/wiki/Developer-Wiki).
+
+## Publishing the release on Maven Central
+- Manually change the version from SNAPSHOT to final (eg. when releasing SDK 4.11.0, replacing all the occurrences of 4.11.0-SNAPSHOT with 4.11.0)
+
+- Commit and push changes to GitHub with the commit message [publish], then it will automatically publish your artifacts to maven central
+
+At this point, we need to manually proceed with the remaining steps:
+
+1- Manually create a release tag on GitHub
+
+2- Manually change the version from final to next SNAPSHOT (eg. replacing all the occurrences of 4.11.0 with 4.12.0-SNAPSHOT (in pom.xml, not in READMEs - if not needed)
+
+3- Commit and push on GitHub

archetypes/alfresco-allinone-archetype/pom.xml

@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.alfresco.maven</groupId>
     <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.12.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -54,4 +54,4 @@
       </plugins>
   </build>
 
-</project>
+</project>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/README.md

@@ -1,6 +1,6 @@
-# Alfresco AIO Project - SDK 4.0
+# Alfresco AIO Project - SDK 4.11.0
 
-This is an All-In-One (AIO) project for Alfresco SDK 4.0.
+This is an All-In-One (AIO) project for Alfresco SDK 4.11.0.
 
 Run with `./run.sh build_start` or `./run.bat build_start` and verify that it
 
@@ -43,4 +43,4 @@ All the services of the project are now run as docker containers. The run script
 # TODO
 
   * Abstract assembly into a dependency so we don't have to ship the assembly in the archetype
-  * Functional/remote unit tests
+  * Functional/remote unit tests

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>${artifactId}</artifactId>
     <name>Integration Tests Module</name>
-    <description>Integration Tests module for in-container integration testing - part of AIO - SDK 4.0</description>
+    <description>Integration Tests module for in-container integration testing - part of AIO - SDK 4.11.0</description>
     <packaging>jar</packaging> <!-- Note. this just runs Integration Tests, but it needs to be a JAR otherwise
                                             nothing is compiled (i.e. you cannot set it to pom) -->
 
@@ -73,4 +73,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/Dockerfile

@@ -1,6 +1,7 @@
 FROM ${docker.acs.image}:${alfresco.platform.version}
 
 ARG TOMCAT_DIR=/usr/local/tomcat
+ARG USERNAME=${alfresco.platform.docker.user} 
 
 USER root
 
@@ -13,10 +14,16 @@ RUN java -jar $TOMCAT_DIR/alfresco-mmt/alfresco-mmt*.jar install \
               $TOMCAT_DIR/amps $TOMCAT_DIR/webapps/alfresco -directory -nobackup -force
 
 COPY alfresco-global.properties $TOMCAT_DIR/shared/classes/alfresco-global.properties
-COPY dev-log4j.properties $TOMCAT_DIR/shared/classes/alfresco/extension
+COPY dev-log4j2.properties $TOMCAT_DIR/shared/classes/alfresco/extension/dev-log4j2.properties
 COPY disable-webscript-caching-context.xml $TOMCAT_DIR/shared/classes/alfresco/extension
 
 # Copy Dockerfile to avoid an error if no license file exists
 COPY Dockerfile license/*.* $TOMCAT_DIR/webapps/alfresco/WEB-INF/classes/alfresco/extension/license/
 
+# Move the log file
+RUN sed -i -e "s_appender.rolling.fileName\=alfresco.log_appender.rolling.fileName\=${TOMCAT_DIR}/logs\/alfresco.log_" \
+        ${TOMCAT_DIR}/shared/classes/alfresco/extension/dev-log4j2.properties && \
+    sed -i -e "s_appender.rolling.filePattern=alfresco.log.%d{yyyy-MM-dd}_appender.rolling.filePattern\=${TOMCAT_DIR}/logs\/alfresco.log.%d{yyyy-MM-dd}_" \
+        ${TOMCAT_DIR}/shared/classes/alfresco/extension/dev-log4j2.properties
+
 USER ${USERNAME}

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/alfresco-global.properties

@@ -62,7 +62,8 @@ db.driver=org.postgresql.Driver
 index.subsystem.name=solr6
 solr.host=${rootArtifactId}-ass
 solr.port=8983
-solr.secureComms=none
+solr.secureComms=secret
+solr.sharedSecret=secret
 
 db.username=alfresco
 db.password=alfresco

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/dev-log4j.properties

@@ -1,270 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-# Set root logger level to error
-log4j.rootLogger=error, Console, File
-
-
-# All outputs currently set to be a ConsoleAppender.
-log4j.appender.Console=org.apache.log4j.ConsoleAppender
-log4j.appender.Console.layout=org.apache.log4j.PatternLayout
-
-# use log4j NDC to replace %x with tenant domain / username
-log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n 
-#log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
-
-log4j.appender.File=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.File.File=alfresco.log
-log4j.appender.File.Append=true
-log4j.appender.File.DatePattern='.'yyyy-MM-dd
-log4j.appender.File.layout=org.apache.log4j.PatternLayout
-log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %m%n
-
-#log4j.appender.file=org.apache.log4j.FileAppender
-#log4j.appender.file.File=hibernate.log
-#log4j.appender.file.layout=org.apache.log4j.PatternLayout
-#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-
-
-# Commented-in loggers will be exposed as JMX MBeans (refer to org.alfresco.repo.admin.Log4JHierarchyInit)
-# Hence, generally useful loggers should be listed with at least ERROR level to allow simple runtime
-# control of the level via a suitable JMX Console. Also, any other loggers can be added transiently via
-# Log4j addLoggerMBean as long as the logger exists and has been loaded.
-
-# Hibernate
-log4j.logger.org.hibernate=error
-log4j.logger.org.hibernate.util.JDBCExceptionReporter=fatal
-log4j.logger.org.hibernate.event.def.AbstractFlushingEventListener=fatal
-log4j.logger.org.hibernate.type=warn
-log4j.logger.org.hibernate.cfg.SettingsFactory=warn
-
-# Spring
-log4j.logger.org.springframework=warn
-# Turn off Spring remoting warnings that should really be info or debug.
-log4j.logger.org.springframework.remoting.support=error
-log4j.logger.org.springframework.util=error
-
-# Axis/WSS4J
-log4j.logger.org.apache.axis=info
-log4j.logger.org.apache.ws=info
-
-# CXF
-log4j.logger.org.apache.cxf=error
-
-# MyFaces
-log4j.logger.org.apache.myfaces.util.DebugUtils=info
-log4j.logger.org.apache.myfaces.el.VariableResolverImpl=error
-log4j.logger.org.apache.myfaces.application.jsp.JspViewHandlerImpl=error
-log4j.logger.org.apache.myfaces.taglib=error
-
-# OpenOfficeConnection
-log4j.logger.net.sf.jooreports.openoffice.connection=fatal
-
-# log prepared statement cache activity log4j.logger.org.hibernate.ps.PreparedStatementCache=info
-
-# Alfresco
-log4j.logger.org.alfresco=error
-log4j.logger.org.alfresco.repo.admin=info
-log4j.logger.org.alfresco.repo.transaction=warn
-log4j.logger.org.alfresco.repo.cache.TransactionalCache=warn
-log4j.logger.org.alfresco.repo.model.filefolder=warn
-log4j.logger.org.alfresco.repo.tenant=info
-log4j.logger.org.alfresco.config=warn
-log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn
-log4j.logger.org.alfresco.config.JBossEnabledWebApplicationContext=warn
-log4j.logger.org.alfresco.repo.management.subsystems=warn
-log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory=info
-log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory$ChildApplicationContext=warn
-log4j.logger.org.alfresco.repo.security.sync=info
-log4j.logger.org.alfresco.repo.security.person=info
-
-log4j.logger.org.alfresco.sample=info
-log4j.logger.org.alfresco.web=info
-#log4j.logger.org.alfresco.web.app.AlfrescoNavigationHandler=debug
-#log4j.logger.org.alfresco.web.ui.repo.component.UIActions=debug
-#log4j.logger.org.alfresco.web.ui.repo.tag.PageTag=debug
-#log4j.logger.org.alfresco.web.bean.clipboard=debug
-log4j.logger.org.alfresco.service.descriptor.DescriptorService=info
-#log4j.logger.org.alfresco.web.page=debug
-
-log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=error
-#log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=info
-
-log4j.logger.org.alfresco.repo.admin.patch.PatchExecuter=info
-log4j.logger.org.alfresco.repo.domain.patch.ibatis.PatchDAOImpl=info
-
-# Specific patches
-log4j.logger.org.alfresco.repo.admin.patch.impl.DeploymentMigrationPatch=info
-log4j.logger.org.alfresco.repo.version.VersionMigrator=info
-
-log4j.logger.org.alfresco.repo.module.ModuleServiceImpl=info
-log4j.logger.org.alfresco.repo.domain.schema.SchemaBootstrap=info
-log4j.logger.org.alfresco.repo.admin.ConfigurationChecker=info
-log4j.logger.org.alfresco.repo.node.index.AbstractReindexComponent=warn
-log4j.logger.org.alfresco.repo.node.index.IndexTransactionTracker=warn
-log4j.logger.org.alfresco.repo.node.index.FullIndexRecoveryComponent=info
-log4j.logger.org.alfresco.util.OpenOfficeConnectionTester=info
-log4j.logger.org.alfresco.repo.node.db.hibernate.HibernateNodeDaoServiceImpl=warn
-log4j.logger.org.alfresco.repo.domain.hibernate.DirtySessionMethodInterceptor=warn
-log4j.logger.org.alfresco.repo.transaction.RetryingTransactionHelper=warn
-log4j.logger.org.alfresco.util.transaction.SpringAwareUserTransaction.trace=warn
-log4j.logger.org.alfresco.util.AbstractTriggerBean=warn
-log4j.logger.org.alfresco.enterprise.repo.cluster=info
-log4j.logger.org.alfresco.repo.version.Version2ServiceImpl=warn
-
-#log4j.logger.org.alfresco.web.app.DebugPhaseListener=debug
-log4j.logger.org.alfresco.repo.node.db.NodeStringLengthWorker=info
-
-log4j.logger.org.alfresco.repo.workflow=info
-
-# CIFS server debugging
-log4j.logger.org.alfresco.smb.protocol=error
-#log4j.logger.org.alfresco.smb.protocol.auth=debug
-#log4j.logger.org.alfresco.acegi=debug
-
-# FTP server debugging
-log4j.logger.org.alfresco.ftp.protocol=error
-#log4j.logger.org.alfresco.ftp.server=debug
-
-# WebDAV debugging
-#log4j.logger.org.alfresco.webdav.protocol=debug
-log4j.logger.org.alfresco.webdav.protocol=info
-
-# NTLM servlet filters
-#log4j.logger.org.alfresco.web.app.servlet.NTLMAuthenticationFilter=debug
-#log4j.logger.org.alfresco.repo.webdav.auth.NTLMAuthenticationFilter=debug
-
-# Kerberos servlet filters
-#log4j.logger.org.alfresco.web.app.servlet.KerberosAuthenticationFilter=debug
-#log4j.logger.org.alfresco.repo.webdav.auth.KerberosAuthenticationFilter=debug
-
-# File servers
-log4j.logger.org.alfresco.fileserver=warn
-
-# Repo filesystem debug logging
-#log4j.logger.org.alfresco.filesys.repo.ContentDiskDriver=debug
-
-# Integrity message threshold - if 'failOnViolation' is off, then WARNINGS are generated
-log4j.logger.org.alfresco.repo.node.integrity=ERROR
-
-# Indexer debugging
-log4j.logger.org.alfresco.repo.search.Indexer=error
-#log4j.logger.org.alfresco.repo.search.Indexer=debug
-
-log4j.logger.org.alfresco.repo.search.impl.lucene.index=error
-log4j.logger.org.alfresco.repo.search.impl.lucene.fts.FullTextSearchIndexerImpl=warn
-#log4j.logger.org.alfresco.repo.search.impl.lucene.index=DEBUG
-
-# Audit debugging
-# log4j.logger.org.alfresco.repo.audit=DEBUG
-# log4j.logger.org.alfresco.repo.audit.model=DEBUG
-
-# Property sheet and modelling debugging
-# change to error to hide the warnings about missing properties and associations
-log4j.logger.alfresco.missingProperties=warn
-
-# Dictionary/Model debugging
-log4j.logger.org.alfresco.repo.dictionary=warn
-log4j.logger.org.alfresco.repo.dictionary.types.period=warn
-
-# Virtualization Server Registry
-log4j.logger.org.alfresco.mbeans.VirtServerRegistry=error
-
-# Spring context runtime property setter
-log4j.logger.org.alfresco.util.RuntimeSystemPropertiesSetter=info
-
-# Debugging options for clustering
-log4j.logger.org.alfresco.repo.content.ReplicatingContentStore=error
-log4j.logger.org.alfresco.repo.content.replication=error
-
-#log4j.logger.org.alfresco.repo.deploy.DeploymentServiceImpl=debug
-
-# Activity service
-log4j.logger.org.alfresco.repo.activities=warn
-
-# User usage tracking
-log4j.logger.org.alfresco.repo.usage=info
-
-# Sharepoint
-log4j.logger.org.alfresco.module.vti=info
-
-# Forms Engine
-log4j.logger.org.alfresco.web.config.forms=info
-log4j.logger.org.alfresco.web.scripts.forms=info
-
-# CMIS
-log4j.logger.org.alfresco.opencmis=error
-log4j.logger.org.alfresco.opencmis.AlfrescoCmisServiceInterceptor=error
-log4j.logger.org.alfresco.cmis=error
-log4j.logger.org.alfresco.cmis.dictionary=warn
-log4j.logger.org.apache.chemistry.opencmis=info
-log4j.logger.org.apache.chemistry.opencmis.server.impl.browser.CmisBrowserBindingServlet=OFF
-log4j.logger.org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet=OFF
-
-# IMAP
-log4j.logger.org.alfresco.repo.imap=info
-
-# JBPM
-# Note: non-fatal errors (eg. logged during job execution) should be handled by Alfresco's retrying transaction handler 
-log4j.logger.org.jbpm.graph.def.GraphElement=fatal
-
-#log4j.logger.org.alfresco.repo.googledocs=debug
-
-
-# Web Framework
-log4j.logger.org.springframework.extensions.webscripts=info
-log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=warn
-log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off
-
-# Repository
-log4j.logger.org.alfresco.repo.web.scripts=warn
-log4j.logger.org.alfresco.repo.web.scripts.BaseWebScriptTest=info
-log4j.logger.org.alfresco.repo.web.scripts.AlfrescoRhinoScriptDebugger=off
-log4j.logger.org.alfresco.repo.jscript=error
-log4j.logger.org.alfresco.repo.jscript.ScriptLogger=warn
-log4j.logger.org.alfresco.repo.cmis.rest.CMISTest=info
-
-log4j.logger.org.alfresco.repo.domain.schema.script.ScriptBundleExecutorImpl=off
-log4j.logger.org.alfresco.repo.domain.schema.script.ScriptExecutorImpl=info
-
-log4j.logger.org.alfresco.repo.search.impl.solr.facet.SolrFacetServiceImpl=info
-
-# Bulk Filesystem Import Tool
-log4j.logger.org.alfresco.repo.bulkimport=warn
-
-# Freemarker
-# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
-log4j.logger.freemarker.runtime=
-
-# Metadata extraction
-log4j.logger.org.alfresco.repo.content.metadata.AbstractMappingMetadataExtracter=warn
-
-# Reduces PDFont error level due to ALF-7105
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDSimpleFont=fatal
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDFont=fatal
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDCIDFont=fatal
-
-# no index support
-log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexIndexer=fatal
-log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexSearchService=fatal
-
-# lucene index warnings
-log4j.logger.org.alfresco.repo.search.impl.lucene.index.IndexInfo=warn
-
-# Warn about RMI socket bind retries.
-log4j.logger.org.alfresco.util.remote.server.socket.HostConfigurableSocketFactory=warn
-
-log4j.logger.org.alfresco.repo.usage.RepoUsageMonitor=info
-
-# Authorization
-log4j.logger.org.alfresco.enterprise.repo.authorization.AuthorizationService=info
-log4j.logger.org.alfresco.enterprise.repo.authorization.AuthorizationsConsistencyMonitor=warn
-
-#-----------------------------------------------------------------------
-# Platform module logging
-#-----------------------------------------------------------------------
-log4j.logger.${package}.platformsample.DemoComponent=debug
-log4j.logger.${package}.platformsample.HelloWorldWebScript=debug
-
-
-

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/dev-log4j2.properties

@@ -0,0 +1,412 @@
+rootLogger.level=error
+rootLogger.appenderRef.stdout.ref=ConsoleAppender
+rootLogger.appenderRef.rolling.ref=RollingAppender
+
+# All outputs currently set to be a ConsoleAppender.
+appender.console.type=Console
+appender.console.name=ConsoleAppender
+appender.console.layout.type=PatternLayout
+# use log4j NDC to replace %x with tenant domain / username
+appender.console.layout.pattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %replace{%m}{[\r\n]+}{}%n
+
+# File appender definition #
+appender.rolling.type=RollingFile
+appender.rolling.name=RollingAppender
+appender.rolling.fileName=alfresco.log
+appender.rolling.filePattern=alfresco.log.%d{yyyy-MM-dd}
+appender.rolling.layout.type=PatternLayout
+appender.rolling.layout.pattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %replace{%m}{[\r\n]+}{}%n
+appender.rolling.policies.type = Policies
+appender.rolling.policies.time.type = TimeBasedTriggeringPolicy
+appender.rolling.policies.time.interval = 1
+
+# Commented-in loggers will be exposed as JMX MBeans (refer to org.alfresco.repo.admin.Log4J2HierarchyInit)
+# Hence, generally useful loggers should be listed with at least ERROR level to allow simple runtime
+# control of the level via a suitable JMX Console. Also, any other loggers can be added transiently via
+# Log4j2 addLoggerMBean as long as the logger exists and has been loaded.
+
+# Hibernate
+logger.hibernate.name=org.hibernate
+logger.hibernate.level=error
+
+logger.hibernate-util-JDBCExceptionReporter.name=org.hibernate.util.JDBCExceptionReporter
+logger.hibernate-util-JDBCExceptionReporter.level=fatal
+
+logger.hibernate-event-def-AbstractFlushingEventListener.name=org.hibernate.event.def.AbstractFlushingEventListener
+logger.hibernate-event-def-AbstractFlushingEventListener.level=fatal
+
+logger.hibernate-type.name=org.hibernate.type
+logger.hibernate-type.level=warn
+
+logger.hibernate-cfg-SettingsFactory.name=org.hibernate.cfg.SettingsFactory
+logger.hibernate-cfg-SettingsFactory.level=warn
+
+# Spring
+logger.springframework.name=org.springframework
+logger.springframework.level=warn
+# Turn off Spring remoting warnings that should really be info or debug.
+logger.springframework-remoting-support.name=org.springframework.remoting.support
+logger.springframework-remoting-support.level=error
+
+logger.springframework-util.name=org.springframework.util
+logger.springframework-util.level=error
+
+# Axis/WSS4J
+logger.apache-axis.name=org.apache.axis
+logger.apache-axis.level=info
+
+logger.apache-ws.name=org.apache.ws
+logger.apache-ws.level=info
+
+# CXF
+logger.apache-cxf.name=org.apache.cxf
+logger.apache-cxf.level=error
+
+# MyFaces
+logger.apache-myfaces-util-DebugUtils.name=org.apache.myfaces.util.DebugUtils
+logger.apache-myfaces-util-DebugUtils.level=info
+
+logger.apache-myfaces-el-VariableResolverImpl.name=org.apache.myfaces.el.VariableResolverImpl
+logger.apache-myfaces-el-VariableResolverImpl.level=error
+
+logger.apache-myfaces-application-jsp-JspViewHandlerImpl.name=org.apache.myfaces.application.jsp.JspViewHandlerImpl
+logger.apache-myfaces-application-jsp-JspViewHandlerImpl.level=error
+
+logger.apache-myfaces-taglib.name=org.apache.myfaces.taglib
+logger.apache-myfaces-taglib.level=error
+
+# OpenOfficeConnection
+logger.sf-jooreports-openoffice-connection.name=net.sf.jooreports.openoffice.connection
+logger.sf-jooreports-openoffice-connection.level=fatal
+
+# log prepared statement cache activity log4j.logger.org.hibernate.ps.PreparedStatementCache=info
+
+# Alfresco
+logger.alfresco.name=org.alfresco
+logger.alfresco.level=error
+
+logger.alfresco-repo-admin.name=org.alfresco.repo.admin
+logger.alfresco-repo-admin.level=info
+
+logger.alfresco-repo-transaction.name=org.alfresco.repo.transaction
+logger.alfresco-repo-transaction.level=warn
+
+logger.alfresco-repo-cache-TransactionalCache.name=org.alfresco.repo.cache.TransactionalCache
+logger.alfresco-repo-cache-TransactionalCache.level=warn
+
+logger.alfresco-repo-model-filefolder.name=org.alfresco.repo.model.filefolder
+logger.alfresco-repo-model-filefolder.level=warn
+
+logger.alfresco-repo-tenant.name=org.alfresco.repo.tenant
+logger.alfresco-repo-tenant.level=info
+
+logger.alfresco-config.name=org.alfresco.config
+logger.alfresco-config.level=warn
+
+logger.alfresco-config-JndiObjectFactoryBean.name=org.alfresco.config.JndiObjectFactoryBean
+logger.alfresco-config-JndiObjectFactoryBean.level=warn
+
+logger.alfresco-config-JBossEnabledWebApplicationContext.name=org.alfresco.config.JBossEnabledWebApplicationContext
+logger.alfresco-config-JBossEnabledWebApplicationContext.level=warn
+
+logger.alfresco-repo-management-subsystems.name=org.alfresco.repo.management.subsystems
+logger.alfresco-repo-management-subsystems.level=warn
+
+logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory.name=org.alfresco.repo.management.subsystems.ChildApplicationContextFactory
+logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory.level=info
+
+logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory$ChildApplicationContext.name=org.alfresco.repo.management.subsystems.ChildApplicationContextFactory$ChildApplicationContext
+logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory$ChildApplicationContext.level=warn
+
+logger.alfresco-repo-security-sync.name=org.alfresco.repo.security.sync
+logger.alfresco-repo-security-sync.level=info
+
+logger.alfresco-repo-security-person.name=org.alfresco.repo.security.person
+logger.alfresco-repo-security-person.level=info
+
+logger.alfresco-sample.name=org.alfresco.sample
+logger.alfresco-sample.level=info
+
+logger.alfresco-web.name=org.alfresco.web
+logger.alfresco-web.level=info
+
+logger.alfresco-service-descriptor-DescriptorService.name=org.alfresco.service.descriptor.DescriptorService
+logger.alfresco-service-descriptor-DescriptorService.level=info
+
+logger.alfresco-repo-importer-ImporterBootstrap.name=org.alfresco.repo.importer.ImporterBootstrap
+logger.alfresco-repo-importer-ImporterBootstrap.level=error
+#log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=info
+
+logger.alfresco-repo-admin-patch-PatchExecuter.name=org.alfresco.repo.admin.patch.PatchExecuter
+logger.alfresco-repo-admin-patch-PatchExecuter.level=info
+
+logger.alfresco-repo-domain-patch-ibatis-PatchDAOImpl.name=org.alfresco.repo.domain.patch.ibatis.PatchDAOImpl
+logger.alfresco-repo-domain-patch-ibatis-PatchDAOImpl.level=info
+
+# Specific patches
+logger.alfresco-repo-admin-patch-impl-DeploymentMigrationPatch.name=org.alfresco.repo.admin.patch.impl.DeploymentMigrationPatch
+logger.alfresco-repo-admin-patch-impl-DeploymentMigrationPatch.level=info
+
+logger.alfresco-repo-version-VersionMigrator.name=org.alfresco.repo.version.VersionMigrator
+logger.alfresco-repo-version-VersionMigrator.level=info
+
+logger.alfresco-repo-module-ModuleServiceImpl.name=org.alfresco.repo.module.ModuleServiceImpl
+logger.alfresco-repo-module-ModuleServiceImpl.level=info
+
+logger.alfresco-repo-domain-schema-SchemaBootstrap.name=org.alfresco.repo.domain.schema.SchemaBootstrap
+logger.alfresco-repo-domain-schema-SchemaBootstrap.level=info
+
+logger.alfresco-repo-admin-ConfigurationChecker.name=org.alfresco.repo.admin.ConfigurationChecker
+logger.alfresco-repo-admin-ConfigurationChecker.level=info
+
+logger.alfresco-repo-node-index-AbstractReindexComponent.name=org.alfresco.repo.node.index.AbstractReindexComponent
+logger.alfresco-repo-node-index-AbstractReindexComponent.level=warn
+
+logger.alfresco-repo-node-index-IndexTransactionTracker.name=org.alfresco.repo.node.index.IndexTransactionTracker
+logger.alfresco-repo-node-index-IndexTransactionTracker.level=warn
+
+logger.alfresco-repo-node-index-FullIndexRecoveryComponent.name=org.alfresco.repo.node.index.FullIndexRecoveryComponent
+logger.alfresco-repo-node-index-FullIndexRecoveryComponent.level=info
+
+#logger.alfresco-repo-node-db-hibernate-HibernateNodeDaoServiceImpl.name=org.alfresco.repo.node.db.hibernate.HibernateNodeDaoServiceImpl
+#logger.alfresco-repo-node-db-hibernate-HibernateNodeDaoServiceImpl.level=warn
+
+logger.alfresco-repo-domain-hibernate-DirtySessionMethodInterceptor.name=org.alfresco.repo.domain.hibernate.DirtySessionMethodInterceptor
+logger.alfresco-repo-domain-hibernate-DirtySessionMethodInterceptor.level=warn
+
+logger.alfresco-repo-transaction-RetryingTransactionHelper.name=org.alfresco.repo.transaction.RetryingTransactionHelper
+logger.alfresco-repo-transaction-RetryingTransactionHelper.level=warn
+
+logger.alfresco-util-transaction-SpringAwareUserTransaction-trace.name=org.alfresco.util.transaction.SpringAwareUserTransaction.trace
+logger.alfresco-util-transaction-SpringAwareUserTransaction-trace.level=warn
+
+logger.alfresco-util-AbstractTriggerBean.name=org.alfresco.util.AbstractTriggerBean
+logger.alfresco-util-AbstractTriggerBean.level=warn
+
+logger.alfresco-enterprise-repo-cluster.name=org.alfresco.enterprise.repo.cluster
+logger.alfresco-enterprise-repo-cluster.level=info
+
+logger.alfresco-repo-version-Version2ServiceImpl.name=org.alfresco.repo.version.Version2ServiceImpl
+logger.alfresco-repo-version-Version2ServiceImpl.level=warn
+
+#logger.alfresco-web-app-DebugPhaseListener.name=org.alfresco.web.app.DebugPhaseListener
+#logger.alfresco-web-app-DebugPhaseListener.level=debug
+
+logger.alfresco-repo-node-db-NodeStringLengthWorker.name=org.alfresco.repo.node.db.NodeStringLengthWorker
+logger.alfresco-repo-node-db-NodeStringLengthWorker.level=info
+
+logger.alfresco-repo-workflow.name=org.alfresco.repo.workflow
+logger.alfresco-repo-workflow.level=info
+
+# FTP server debugging
+logger.alfresco-ftp-protocol.name=org.alfresco.ftp.protocol
+logger.alfresco-ftp-protocol.level=error
+
+# WebDAV debugging
+logger.alfresco-webdav-protocol.name=org.alfresco.webdav.protocol
+logger.alfresco-webdav-protocol.level=info
+
+# NTLM servlet filters
+#log4j.logger.org.alfresco.web.app.servlet.NTLMAuthenticationFilter=debug
+#log4j.logger.org.alfresco.repo.webdav.auth.NTLMAuthenticationFilter=debug
+
+# Kerberos servlet filters
+#log4j.logger.org.alfresco.web.app.servlet.KerberosAuthenticationFilter=debug
+#log4j.logger.org.alfresco.repo.webdav.auth.KerberosAuthenticationFilter=debug
+
+# File servers
+logger.alfresco-fileserver.name=org.alfresco.fileserver
+logger.alfresco-fileserver.level=warn
+
+# Repo filesystem debug logging
+#log4j.logger.org.alfresco.filesys.repo.ContentDiskDriver=debug
+
+# Integrity message threshold - if 'failOnViolation' is off, then WARNINGS are generated
+logger.alfresco-repo-node-integrity.name=org.alfresco.repo.node.integrity
+logger.alfresco-repo-node-integrity.level=error
+
+# Indexer debugging
+logger.alfresco-repo-search-Indexer.name=org.alfresco.repo.search.Indexer
+logger.alfresco-repo-search-Indexer.level=error
+
+logger.alfresco-repo-search-impl-lucene-index.name=org.alfresco.repo.search.impl.lucene.index
+logger.alfresco-repo-search-impl-lucene-index.level=error
+
+logger.alfresco-repo-search-impl-lucene-fts-FullTextSearchIndexerImpl.name=org.alfresco.repo.search.impl.lucene.fts.FullTextSearchIndexerImpl
+logger.alfresco-repo-search-impl-lucene-fts-FullTextSearchIndexerImpl.level=warn
+
+# Audit debugging
+# log4j.logger.org.alfresco.repo.audit=DEBUG
+# log4j.logger.org.alfresco.repo.audit.model=DEBUG
+
+# Property sheet and modelling debugging
+# change to error to hide the warnings about missing properties and associations
+logger.missingProperties.name=alfresco.missingProperties
+logger.missingProperties.level=warn
+
+# Dictionary/Model debugging
+logger.alfresco-repo-dictionary.name=org.alfresco.repo.dictionary
+logger.alfresco-repo-dictionary.level=warn
+
+# Virtualization Server Registry
+logger.alfresco-mbeans-VirtServerRegistry.name=org.alfresco.mbeans.VirtServerRegistry
+logger.alfresco-mbeans-VirtServerRegistry.level=error
+
+# Spring context runtime property setter
+logger.alfresco-util-RuntimeSystemPropertiesSetter.name=org.alfresco.util.RuntimeSystemPropertiesSetter
+logger.alfresco-util-RuntimeSystemPropertiesSetter.level=info
+
+# Debugging options for clustering
+logger.alfresco-repo-content-ReplicatingContentStore.name=org.alfresco.repo.content.ReplicatingContentStore
+logger.alfresco-repo-content-ReplicatingContentStore.level=error
+
+logger.alfresco-repo-content-replication.name=org.alfresco.repo.content.replication
+logger.alfresco-repo-content-replication.level=error
+
+#log4j.logger.org.alfresco.repo.deploy.DeploymentServiceImpl=debug
+
+# Activity service
+logger.alfresco-repo-activities.name=org.alfresco.repo.activities
+logger.alfresco-repo-activities.level=warn
+
+# User usage tracking
+logger.alfresco-repo-usage.name=org.alfresco.repo.usage
+logger.alfresco-repo-usage.level=info
+
+# Sharepoint
+logger.alfresco-module-vti.name=org.alfresco.module.vti
+logger.alfresco-module-vti.level=info
+
+# Forms Engine
+logger.alfresco-web-config-forms.name=org.alfresco.web.config.forms
+logger.alfresco-web-config-forms.level=info
+
+logger.alfresco-web-scripts-forms.name=org.alfresco.web.scripts.forms
+logger.alfresco-web-scripts-forms.level=info
+
+# CMIS
+logger.alfresco-opencmis.name=org.alfresco.opencmis
+logger.alfresco-opencmis.level=error
+
+logger.alfresco-opencmis-AlfrescoCmisServiceInterceptor.name=org.alfresco.opencmis.AlfrescoCmisServiceInterceptor
+logger.alfresco-opencmis-AlfrescoCmisServiceInterceptor.level=error
+
+logger.alfresco-cmis.name=org.alfresco.cmis
+logger.alfresco-cmis.level=error
+
+logger.alfresco-cmis-dictionary.name=org.alfresco.cmis.dictionary
+logger.alfresco-cmis-dictionary.level=warn
+
+logger.apache-chemistry-opencmis.name=org.apache.chemistry.opencmis
+logger.apache-chemistry-opencmis.level=info
+
+logger.apache-chemistry-opencmis-server-impl-browser-CmisBrowserBindingServlet.name=org.apache.chemistry.opencmis.server.impl.browser.CmisBrowserBindingServlet
+logger.apache-chemistry-opencmis-server-impl-browser-CmisBrowserBindingServlet.level=off
+
+logger.apache-chemistry-opencmis-server-impl-atompub-CmisAtomPubServlet.name=org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet
+logger.apache-chemistry-opencmis-server-impl-atompub-CmisAtomPubServlet.level=off
+
+# IMAP
+logger.alfresco-repo-imap.name=org.alfresco.repo.imap
+logger.alfresco-repo-imap.level=info
+
+# JBPM
+# Note: non-fatal errors (eg. logged during job execution) should be handled by Alfresco's retrying transaction handler
+logger.jbpm-graph-def-GraphElement.name=org.jbpm.graph.def.GraphElement
+logger.jbpm-graph-def-GraphElement.level=fatal
+
+# Web Framework
+logger.springframework-extensions-webscripts.name=org.springframework.extensions.webscripts
+logger.springframework-extensions-webscripts.level=info
+
+logger.springframework-extensions-webscripts-ScriptLogger.name=org.springframework.extensions.webscripts.ScriptLogger
+logger.springframework-extensions-webscripts-ScriptLogger.level=warn
+
+logger.springframework-extensions-webscripts-ScriptDebugger.name=org.springframework.extensions.webscripts.ScriptDebugger
+logger.springframework-extensions-webscripts-ScriptDebugger.level=off
+
+# Repository
+logger.alfresco-repo-web-scripts.name=org.alfresco.repo.web.scripts
+logger.alfresco-repo-web-scripts.level=warn
+
+logger.alfresco-repo-web-scripts-BaseWebScriptTest.name=org.alfresco.repo.web.scripts.BaseWebScriptTest
+logger.alfresco-repo-web-scripts-BaseWebScriptTest.level=info
+
+logger.alfresco-repo-web-scripts-AlfrescoRhinoScriptDebugger.name=org.alfresco.repo.web.scripts.AlfrescoRhinoScriptDebugger
+logger.alfresco-repo-web-scripts-AlfrescoRhinoScriptDebugger.level=off
+
+logger.alfresco-repo-jscript.name=org.alfresco.repo.jscript
+logger.alfresco-repo-jscript.level=error
+
+logger.alfresco-repo-jscript-ScriptLogger.name=org.alfresco.repo.jscript.ScriptLogger
+logger.alfresco-repo-jscript-ScriptLogger.level=warn
+
+logger.alfresco-repo-cmis-rest-CMISTest.name=org.alfresco.repo.cmis.rest.CMISTest
+logger.alfresco-repo-cmis-rest-CMISTest.level=info
+
+logger.alfresco-repo-domain-schema-script-ScriptBundleExecutorImpl.name=org.alfresco.repo.domain.schema.script.ScriptBundleExecutorImpl
+logger.alfresco-repo-domain-schema-script-ScriptBundleExecutorImpl.level=off
+
+logger.alfresco-repo-domain-schema-script-ScriptExecutorImpl.name=org.alfresco.repo.domain.schema.script.ScriptExecutorImpl
+logger.alfresco-repo-domain-schema-script-ScriptExecutorImpl.level=info
+
+logger.alfresco-repo-domain-schema-script-DeleteNotExistsExecutor.name=org.alfresco.repo.domain.schema.script.DeleteNotExistsExecutor
+logger.alfresco-repo-domain-schema-script-DeleteNotExistsExecutor.level=off
+
+logger.alfresco-repo-search-impl-solr-facet-SolrFacetServiceImpl.name=org.alfresco.repo.search.impl.solr.facet.SolrFacetServiceImpl
+logger.alfresco-repo-search-impl-solr-facet-SolrFacetServiceImpl.level=info
+
+# Bulk Filesystem Import Tool
+logger.alfresco-repo-bulkimport.name=org.alfresco.repo.bulkimport
+logger.alfresco-repo-bulkimport.level=warn
+
+# Freemarker
+# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
+logger.runtime.name=freemarker.runtime
+logger.runtime.level=
+
+# Metadata extraction
+logger.alfresco-repo-content-metadata-AbstractMappingMetadataExtracter.name=org.alfresco.repo.content.metadata.AbstractMappingMetadataExtracter
+logger.alfresco-repo-content-metadata-AbstractMappingMetadataExtracter.level=warn
+
+# Reduces PDFont error level due to ALF-7105
+logger.apache-pdfbox-pdmodel-font-PDSimpleFont.name=org.apache.pdfbox.pdmodel.font.PDSimpleFont
+logger.apache-pdfbox-pdmodel-font-PDSimpleFont.level=fatal
+
+logger.apache-pdfbox-pdmodel-font-PDCIDFont.name=org.apache.pdfbox.pdmodel.font.PDCIDFont
+logger.apache-pdfbox-pdmodel-font-PDCIDFont.level=fatal
+
+# no index support
+logger.alfresco-repo-search-impl-noindex-NoIndexIndexer.name=org.alfresco.repo.search.impl.noindex.NoIndexIndexer
+logger.alfresco-repo-search-impl-noindex-NoIndexIndexer.level=fatal
+
+logger.alfresco-repo-search-impl-noindex-NoIndexSearchService.name=org.alfresco.repo.search.impl.noindex.NoIndexSearchService
+logger.alfresco-repo-search-impl-noindex-NoIndexSearchService.level=fatal
+
+# lucene index warnings
+logger.alfresco-repo-search-impl-lucene-index-IndexInfo.name=org.alfresco.repo.search.impl.lucene.index.IndexInfo
+logger.alfresco-repo-search-impl-lucene-index-IndexInfo.level=warn
+
+# Warn about RMI socket bind retries.
+logger.alfresco-util-remote-server-socket-HostConfigurableSocketFactory.name=org.alfresco.util.remote.server.socket.HostConfigurableSocketFactory
+logger.alfresco-util-remote-server-socket-HostConfigurableSocketFactory.level=warn
+
+logger.alfresco-repo-usage-RepoUsageMonitor.name=org.alfresco.repo.usage.RepoUsageMonitor
+logger.alfresco-repo-usage-RepoUsageMonitor.level=info
+
+# Authorization
+logger.alfresco-enterprise-repo-authorization-AuthorizationService.name=org.alfresco.enterprise.repo.authorization.AuthorizationService
+logger.alfresco-enterprise-repo-authorization-AuthorizationService.level=info
+
+logger.alfresco-enterprise-repo-authorization-AuthorizationsConsistencyMonitor.name=org.alfresco.enterprise.repo.authorization.AuthorizationsConsistencyMonitor
+logger.alfresco-enterprise-repo-authorization-AuthorizationsConsistencyMonitor.level=warn
+
+#-----------------------------------------------------------------------
+# Platform module logging
+#-----------------------------------------------------------------------
+logger.platformsample-DemoComponent.name=${package}.platformsample.DemoComponent
+logger.platformsample-DemoComponent.level=debug
+logger.platformsample-HelloWorldWebScript.name=${package}.platformsample.HelloWorldWebScript
+logger.platformsample-HelloWorldWebScript.level=debug
+
+

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/pom.xml

@@ -3,8 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>${artifactId}</artifactId>
     <name>Alfresco Platform/Repository JAR Module</name>
-    <description>Platform/Repo JAR Module (to be included in the alfresco.war) - part of AIO - SDK 4.0
-    </description>
+    <description>Platform/Repo JAR Module (to be included in the alfresco.war) - part of AIO - SDK 4.11.0</description>
     <packaging>jar</packaging>
 
     <parent>
@@ -28,4 +27,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/assembly/amp.xml

@@ -35,9 +35,9 @@
             <source>src/main/assembly/file-mapping.properties</source>
             <filtered>false</filtered>
         </file>
-        <!-- Add module-specific log4j.properties configuration at top level in the AMP -->
+        <!-- Add module-specific log4j2.properties configuration at top level in the AMP -->
         <file>
-            <source>src/main/resources/alfresco/module/${project.artifactId}/log4j.properties</source>
+            <source>src/main/resources/alfresco/module/${project.artifactId}/log4j2.properties</source>
             <filtered>false</filtered>
         </file>
     </files>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/log4j.properties

@@ -1 +0,0 @@
-# Add here module-specific custom log4j.properties configuration

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/log4j2.properties

@@ -0,0 +1 @@
+# Add here module-specific custom log4j2.properties configuration

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-docker/src/main/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM ${docker.share.image}:${alfresco.share.version}
+FROM ${docker.share.image}:${alfresco.share.docker.version}
 
 ARG TOMCAT_DIR=/usr/local/tomcat
 
@@ -12,5 +12,5 @@ RUN java -jar $TOMCAT_DIR/alfresco-mmt/alfresco-mmt*.jar install \
 
 COPY share-config-custom.xml $TOMCAT_DIR/shared/classes/alfresco/web-extension
 
-COPY log4j.properties $TOMCAT_DIR/webapps/share/WEB-INF/classes
-COPY hotswap-agent.properties $TOMCAT_DIR/webapps/share/WEB-INF/classes
+COPY log4j2.properties $TOMCAT_DIR/webapps/share/WEB-INF/classes
+COPY hotswap-agent.properties $TOMCAT_DIR/webapps/share/WEB-INF/classes

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-docker/src/main/docker/log4j.properties

@@ -1,57 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-# Set root logger level to error
-log4j.rootLogger=error, Console, File
-
-# Console appender definition #
-
-# All outputs currently set to be a ConsoleAppender.
-log4j.appender.Console=org.apache.log4j.ConsoleAppender
-log4j.appender.Console.layout=org.apache.log4j.PatternLayout
-
-# use log4j NDC to replace %x with tenant domain / username
-log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n
-#log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
-
-# File appender definition #
-log4j.appender.File=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.File.File=share.log
-log4j.appender.File.Append=true
-log4j.appender.File.DatePattern='.'yyyy-MM-dd
-log4j.appender.File.layout=org.apache.log4j.PatternLayout
-log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %m%n
-
-# Spring
-log4j.logger.org.springframework=warn
-# Turn off Spring remoting warnings that should really be info or debug.
-log4j.logger.org.springframework.remoting.support=error
-log4j.logger.org.springframework.util=error
-
-# MyFaces
-log4j.logger.org.apache.myfaces.util.DebugUtils=info
-log4j.logger.org.apache.myfaces.el.VariableResolverImpl=error
-log4j.logger.org.apache.myfaces.application.jsp.JspViewHandlerImpl=error
-log4j.logger.org.apache.myfaces.taglib=error
-
-# Alfresco
-log4j.logger.org.alfresco=error
-log4j.logger.org.alfresco.config=warn
-log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn
-log4j.logger.org.alfresco.web=info
-
-# Web Framework
-log4j.logger.org.springframework.extensions.webscripts=info
-log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=warn
-log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off
-
-# Freemarker
-# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
-log4j.logger.freemarker.runtime=
-
-#-----------------------------------------------------------------------
-# Custom Share module logging goes here...
-#-----------------------------------------------------------------------
-
-
-

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-docker/src/main/docker/log4j2.properties

@@ -0,0 +1,89 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+# Set root logger level to error
+#log4j.rootLogger=error, Console, File
+rootLogger.level=error
+rootLogger.appenderRef.stdout.ref=ConsoleAppender
+rootLogger.appenderRef.rolling.ref=RollingAppender
+
+# Console appender definition #
+
+# All outputs currently set to be a ConsoleAppender.
+appender.console.type=Console
+appender.console.name=ConsoleAppender
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %replace{%m}{[\r\n]+}{}%n
+
+# use log4j NDC to replace %x with tenant domain / username
+appender.console.layout.pattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %replace{%m}{[\r\n]+}{}%n
+
+# File appender definition #
+appender.rolling.type=RollingFile
+appender.rolling.name=RollingAppender
+appender.rolling.fileName=alfresco.log
+appender.rolling.filePattern=alfresco.log.%d{yyyy-MM-dd}
+appender.rolling.layout.type=PatternLayout
+appender.rolling.layout.pattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %replace{%m}{[\r\n]+}{}%n
+appender.rolling.policies.type = Policies
+appender.rolling.policies.time.type = TimeBasedTriggeringPolicy
+appender.rolling.policies.time.interval = 1
+
+# Spring
+logger.springframework.name=org.springframework
+logger.springframework.level=warn
+
+# Turn off Spring remoting warnings that should really be info or debug.
+logger.springframework-remoting-support.name=org.springframework.remoting.support
+logger.springframework-remoting-support.level=error
+
+logger.springframework-util.name=org.springframework.util
+logger.springframework-util.level=error
+
+# MyFaces
+logger.apache-myfaces-util-DebugUtils.name=org.apache.myfaces.util.DebugUtils
+logger.apache-myfaces-util-DebugUtils.level=info
+
+logger.apache-myfaces-el-VariableResolverImpl.name=org.apache.myfaces.el.VariableResolverImpl
+logger.apache-myfaces-el-VariableResolverImpl.level=error
+
+logger.apache-myfaces-application-jsp-JspViewHandlerImpl.name=org.apache.myfaces.application.jsp.JspViewHandlerImpl
+logger.apache-myfaces-application-jsp-JspViewHandlerImpl.level=error
+
+logger.apache-myfaces-taglib.name=org.apache.myfaces.taglib
+logger.apache-myfaces-taglib.level=error
+
+# Alfresco
+logger.alfresco.name=org.alfresco
+logger.alfresco.level=error
+
+logger.alfresco-config.name=org.alfresco.config
+logger.alfresco-config.level=warn
+
+logger.alfresco-config-JndiObjectFactoryBean.name=org.alfresco.config.JndiObjectFactoryBean
+logger.alfresco-config-JndiObjectFactoryBean.level=warn
+
+logger.alfresco-web.name=org.alfresco.web
+logger.alfresco-web.level=info
+
+# Web Framework
+logger.springframework-extensions-webscripts.name=org.springframework.extensions.webscripts
+logger.springframework-extensions-webscripts.level=info
+
+logger.springframework-extensions-webscripts-ScriptLogger.name=org.springframework.extensions.webscripts.ScriptLogger
+logger.springframework-extensions-webscripts-ScriptLogger.level=warn
+
+logger.springframework-extensions-webscripts-ScriptDebugger.name=org.springframework.extensions.webscripts.ScriptDebugger
+logger.springframework-extensions-webscripts-ScriptDebugger.level=off
+
+# Freemarker
+# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
+logger.freemarker-runtime.name=freemarker.runtime
+logger.freemarker-runtime.level=
+
+#-----------------------------------------------------------------------
+# Custom Share module logging goes here...
+#-----------------------------------------------------------------------
+
+
+

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-docker/src/main/docker/share-config-custom.xml

@@ -39,7 +39,7 @@
 
     <!--
         Disable CSRF completely for now
-        It seems Share has issues on 4.2.x with the embedded tomcat and CSRFPolicy
+        It seems Share has issues on 4.x with the embedded tomcat and CSRFPolicy
         -->
     <config evaluator="string-compare" condition="CSRFPolicy" replace="true">
         <filter/>
@@ -101,5 +101,13 @@
             </endpoint>
         </remote>
     </config>
+    <config evaluator="string-compare" condition="Users" replace="true">
+        <users>
+            <username-min-length>2</username-min-length>
+            <password-min-length>3</password-min-length>
+            <show-authorization-status>false</show-authorization-status>
+        </users>
+        <enable-external-users-panel>false</enable-external-users-panel>
+    </config>
 </alfresco-config>
 

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/pom.xml

@@ -5,7 +5,7 @@
     <artifactId>${artifactId}</artifactId>
     <name>Alfresco Share JAR Module</name>
     <packaging>jar</packaging>
-    <description>Sample Share JAR Module (to be included in the share.war) - part of AIO - SDK 4.0</description>
+    <description>Sample Share JAR Module (to be included in the share.war) - part of AIO - SDK 4.11.0</description>
 
     <parent>
         <groupId>${groupId}</groupId>
@@ -36,4 +36,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/assembly/amp.xml

@@ -35,9 +35,9 @@
             <source>src/main/assembly/file-mapping.properties</source>
             <filtered>false</filtered>
         </file>
-        <!-- Add module-specific log4j.properties configuration at top level in the AMP -->
+        <!-- Add module-specific log4j2.properties configuration at top level in the AMP -->
         <file>
-            <source>src/main/resources/alfresco/module/${project.artifactId}/log4j.properties</source>
+            <source>src/main/resources/alfresco/module/${project.artifactId}/log4j2.properties</source>
             <filtered>false</filtered>
         </file>
     </files>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/alfresco/module/__artifactId__/log4j.properties

@@ -1 +0,0 @@
-# Add here module-specific custom log4j.properties configuration

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/alfresco/module/__artifactId__/log4j2.properties

@@ -0,0 +1 @@
+# Add here module-specific custom log4j2.properties configuration

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml

@@ -19,6 +19,12 @@ services:
       dockerfile: ./Dockerfile
       context: ../../../${rootArtifactId}-platform-docker/target
     environment:
+      JAVA_TOOL_OPTIONS: "${symbol_dollar}{keystore.settings}"
+      JAVA_OPTS: "
+        -Dsolr.secureComms=secret
+        -Dsolr.sharedSecret=secret
+        -Dmessaging.broker.url=\"failover:(nio://${rootArtifactId}-activemq:61616)?timeout=3000&jms.useCompression=true\"
+        "
       CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:8888"
     ports:
       - "${symbol_dollar}{acs.port}:8080"
@@ -28,7 +34,7 @@ services:
     depends_on:
       - ${rootArtifactId}-postgres
   ${rootArtifactId}-postgres:
-    image: postgres:9.6
+    image: postgres:16.5
     environment:
       POSTGRES_DB: alfresco
       POSTGRES_USER: alfresco
@@ -39,22 +45,33 @@ services:
     volumes:
       - ${rootArtifactId}-db-volume:/var/lib/postgresql/data
   ${rootArtifactId}-ass:
-    image: alfresco/alfresco-search-services:1.2.0
+    image: alfresco/alfresco-search-services:2.0.15
     environment:
       SOLR_ALFRESCO_HOST: ${rootArtifactId}-acs
       SOLR_ALFRESCO_PORT: 8080
       SOLR_SOLR_HOST: ${rootArtifactId}-ass
       SOLR_SOLR_PORT: 8983
       SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
+      ALFRESCO_SECURE_COMMS: "secret"
+      JAVA_TOOL_OPTIONS: "-Dalfresco.secureComms.secret=secret"
     ports:
       - "8983:8983"
     volumes:
       - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/contentstore
       - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/data
+  ${rootArtifactId}-activemq:
+      image: alfresco/alfresco-activemq:5.18-jre17-rockylinux8
+      mem_limit: 1g
+      ports:
+        - 8161:8161 # Web Console
+        - 5672:5672 # AMQP
+        - 61616:61616 # OpenWire
+        - 61613:61613 # STOMP
+
 volumes:
   ${rootArtifactId}-acs-volume:
     external: true
   ${rootArtifactId}-db-volume:
     external: true
   ${rootArtifactId}-ass-volume:
-    external: true
+    external: true

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml

@@ -5,8 +5,8 @@
     <groupId>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
     <version>${version}</version>
-    <name>AIO - SDK 4.0</name>
-    <description>All-In-One (AIO) project for SDK 4.0</description>
+    <name>AIO - SDK 4.12.0</name>
+    <description>All-In-One (AIO) project for SDK 4.12.0</description>
     <packaging>pom</packaging>
 
     <prerequisites>
@@ -23,12 +23,16 @@
         <alfresco.groupId>org.alfresco</alfresco.groupId>
         <alfresco.bomDependencyArtifactId>@@alfresco.bomDependency.artifactId@@</alfresco.bomDependencyArtifactId>
         <alfresco.platform.version>@@alfresco.platform.version@@</alfresco.platform.version>
+        <alfresco.platform.docker.user>@@alfresco.platform.docker.user@@</alfresco.platform.docker.user>
         <alfresco.share.version>@@alfresco.share.version@@</alfresco.share.version>
+        <alfresco.share.docker.version>@@alfresco.share.docker.version@@</alfresco.share.docker.version>
 
         <!-- Docker images -->
         <docker.acs.image>@@alfresco.platform.docker.image@@</docker.acs.image>
         <docker.share.image>@@alfresco.share.docker.image@@</docker.share.image>
 
+        <keystore.settings>@@keystore.settings@@</keystore.settings>
+
         <!-- JRebel Hot reloading of classpath stuff and web resource stuff -->
         <jrebel.version>1.1.8</jrebel.version>
 
@@ -55,8 +59,8 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.9.5</version>
+            <artifactId>mockito-core</artifactId>
+            <version>4.2.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -79,6 +83,7 @@
             <version>${alfresco.sdk.version}</version>
             <scope>test</scope>
         </dependency>
+
     </dependencies>
 
     <dependencyManagement>
@@ -282,51 +287,65 @@
                 </executions>
             </plugin>
 
-            <!-- Compress JavaScript files and store as *-min.js -->
+            <!-- Compress JavaScript files and store as *.min.js -->
             <plugin>
-                <groupId>net.alchim31.maven</groupId>
-                <artifactId>yuicompressor-maven-plugin</artifactId>
-                <version>1.5.1</version>
+                <groupId>com.github.blutorange</groupId>
+                <artifactId>closure-compiler-maven-plugin</artifactId>
+                <version>2.28.0</version>
                 <executions>
                     <!-- Compress the JS files under the assembly folder -->
                     <execution>
                         <id>compress-assembly</id>
+                        <phase>generate-resources</phase>
                         <goals>
-                            <goal>compress</goal>
+                            <goal>minify</goal>
                         </goals>
                         <configuration>
-                            <sourceDirectory>${project.basedir}/src/main/assembly/web</sourceDirectory>
-                            <outputDirectory>${project.basedir}/src/main/assembly/web</outputDirectory>
+                            <baseSourceDir>${project.basedir}/src/main/assembly</baseSourceDir>
+                            <baseTargetDir>${project.basedir}/src/main/assembly</baseTargetDir>
+                            <sourceDir>web</sourceDir>
+                            <targetDir>web</targetDir>
+                            <skipMerge>true</skipMerge>
+                            <includes>
+                                <include>**/*.js</include>
+                            </includes>
                             <excludes>
                                 <exclude>**/webscripts/**</exclude>
                                 <exclude>**/site-webscripts/**</exclude>
                                 <exclude>**/META-INF/**</exclude>
                                 <exclude>**/*.lib.js</exclude>
                                 <exclude>**/*.css</exclude>
-                                <exclude>**/*-min.js</exclude>
-                                <exclude>**/*-min.css</exclude>
+                                <exclude>**/*.min.js</exclude>
+                                <exclude>**/*.min.css</exclude>
                             </excludes>
                             <force>true</force>
-                            <jswarn>false</jswarn>
                         </configuration>
                     </execution>
                     <!-- Compress the JS files under the resources folder -->
                     <execution>
                         <id>compress-resources</id>
+                        <phase>generate-resources</phase>
                         <goals>
-                            <goal>compress</goal>
+                            <goal>minify</goal>
                         </goals>
                         <configuration>
+                            <baseSourceDir>${project.basedir}/src/main</baseSourceDir>
+                            <baseTargetDir>${project.basedir}/src/main</baseTargetDir>
+                            <sourceDir>resources</sourceDir>
+                            <targetDir>resources</targetDir>
+                            <skipMerge>true</skipMerge>
+                            <includes>
+                                <include>**/*.js</include>
+                            </includes>
                             <excludes>
                                 <exclude>**/webscripts/**</exclude>
                                 <exclude>**/site-webscripts/**</exclude>
                                 <exclude>**/*.lib.js</exclude>
                                 <exclude>**/*.css</exclude>
-                                <exclude>**/*-min.js</exclude>
-                                <exclude>**/*-min.css</exclude>
+                                <exclude>**/*.min.js</exclude>
+                                <exclude>**/*.min.css</exclude>
                             </excludes>
                             <force>true</force>
-                            <jswarn>false</jswarn>
                         </configuration>
                     </execution>
                 </executions>
@@ -392,7 +411,7 @@
         <profile>
             <id>java11</id>
             <activation>
-                <jdk>[11.0,)</jdk>
+                <jdk>[11.0,17)</jdk>
             </activation>
             <build>
                 <plugins>
@@ -407,6 +426,24 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>java17</id>
+            <activation>
+                <jdk>[17,)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <version>3.8.0</version>
+                        <configuration>
+                            <release>17</release>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
     <!--
@@ -430,6 +467,10 @@
             <id>alfresco-private-repository</id>
             <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
         </repository>
+        <repository>
+            <id>alfresco-internal</id>
+            <url>https://artifacts.alfresco.com/nexus/content/groups/internal</url>
+        </repository>
     </repositories>
 
     <pluginRepositories>
@@ -446,4 +487,4 @@
             </snapshots>
         </pluginRepository>
     </pluginRepositories>
-</project>
+</project>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat

@@ -83,37 +83,37 @@ EXIT /B %ERRORLEVEL%
     docker volume create ${rootArtifactId}-acs-volume
     docker volume create ${rootArtifactId}-db-volume
     docker volume create ${rootArtifactId}-ass-volume
-    docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d
+    docker compose -f "%COMPOSE_FILE_PATH%" up --build -d
 EXIT /B 0
 :start_share
-    docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-share
+    docker compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-share
 EXIT /B 0
 :start_acs
-    docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-acs
+    docker compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-acs
 EXIT /B 0
 :down
     if exist "%COMPOSE_FILE_PATH%" (
-        docker-compose -f "%COMPOSE_FILE_PATH%" down
+        docker compose -f "%COMPOSE_FILE_PATH%" down
     )
 EXIT /B 0
 :build
 	call %MVN_EXEC% clean package
 EXIT /B 0
 :build_share
-    docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share
-    docker-compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-share
+    docker compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share
+    docker compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-share
 	call %MVN_EXEC% clean package -pl ${rootArtifactId}-share,${rootArtifactId}-share-docker
 EXIT /B 0
 :build_acs
-    docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-acs
-    docker-compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-acs
+    docker compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-acs
+    docker compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-acs
 	call %MVN_EXEC% clean package -pl ${rootArtifactId}-integration-tests,${rootArtifactId}-platform,${rootArtifactId}-platform-docker
 EXIT /B 0
 :tail
-    docker-compose -f "%COMPOSE_FILE_PATH%" logs -f
+    docker compose -f "%COMPOSE_FILE_PATH%" logs -f
 EXIT /B 0
 :tail_all
-    docker-compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"
+    docker compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"
 EXIT /B 0
 :prepare-test
     call %MVN_EXEC% verify -DskipTests=true -pl ${rootArtifactId}-platform,${rootArtifactId}-integration-tests,${rootArtifactId}-platform-docker

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh

@@ -13,20 +13,20 @@ start() {
     docker volume create ${rootArtifactId}-acs-volume
     docker volume create ${rootArtifactId}-db-volume
     docker volume create ${rootArtifactId}-ass-volume
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d
 }
 
 start_share() {
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-share
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-share
 }
 
 start_acs() {
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-acs
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-acs
 }
 
 down() {
     if [ -f "${symbol_dollar}COMPOSE_FILE_PATH" ]; then
-        docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down
+        docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down
     fi
 }
 
@@ -41,23 +41,23 @@ build() {
 }
 
 build_share() {
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" kill ${rootArtifactId}-share
-    yes | docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" rm -f ${rootArtifactId}-share
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" kill ${rootArtifactId}-share
+    yes | docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" rm -f ${rootArtifactId}-share
     ${symbol_dollar}MVN_EXEC clean package -pl ${rootArtifactId}-share,${rootArtifactId}-share-docker
 }
 
 build_acs() {
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" kill ${rootArtifactId}-acs
-    yes | docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" rm -f ${rootArtifactId}-acs
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" kill ${rootArtifactId}-acs
+    yes | docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" rm -f ${rootArtifactId}-acs
     ${symbol_dollar}MVN_EXEC clean package -pl ${rootArtifactId}-integration-tests,${rootArtifactId}-platform,${rootArtifactId}-platform-docker
 }
 
 tail() {
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f
 }
 
 tail_all() {
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all"
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all"
 }
 
 prepare_test() {

archetypes/alfresco-platform-jar-archetype/pom.xml

@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.alfresco.maven</groupId>
     <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.12.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -55,4 +55,4 @@
       </plugins>
   </build>
 
-</project>
+</project>

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/README.md

@@ -1,6 +1,6 @@
-# Alfresco ACS JAR Module - SDK 4.0
+# Alfresco ACS JAR Module - SDK 4.11.0
 
-This is an ACS project for Alfresco SDK 4.0.
+This is an ACS project for Alfresco SDK 4.11.0.
 
 Run with `./run.sh build_start` or `./run.bat build_start` and verify that it
 
@@ -41,4 +41,4 @@ All the services of the project are now run as docker containers. The run script
 # TODO
 
   * Abstract assembly into a dependency so we don't have to ship the assembly in the archetype
-  * Functional/remote unit tests
+  * Functional/remote unit tests

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml

@@ -15,6 +15,12 @@ services:
       dockerfile: ./Dockerfile
       context: ../../../target
     environment:
+      JAVA_TOOL_OPTIONS: "${symbol_dollar}{keystore.settings}"
+      JAVA_OPTS: "
+        -Dsolr.secureComms=secret
+        -Dsolr.sharedSecret=secret
+        -Dmessaging.broker.url=\"failover:(nio://${rootArtifactId}-activemq:61616)?timeout=3000&jms.useCompression=true\"
+        "
       CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:8888"
     ports:
       - "${symbol_dollar}{acs.port}:8080"
@@ -24,7 +30,7 @@ services:
     depends_on:
       - ${rootArtifactId}-postgres
   ${rootArtifactId}-postgres:
-    image: postgres:9.6
+    image: postgres:16.5
     environment:
       POSTGRES_DB: alfresco
       POSTGRES_USER: alfresco
@@ -35,22 +41,33 @@ services:
     volumes:
       - ${rootArtifactId}-db-volume:/var/lib/postgresql/data
   ${rootArtifactId}-ass:
-    image: alfresco/alfresco-search-services:1.2.0
+    image: alfresco/alfresco-search-services:2.0.15
     environment:
       SOLR_ALFRESCO_HOST: ${rootArtifactId}-acs
       SOLR_ALFRESCO_PORT: 8080
       SOLR_SOLR_HOST: ${rootArtifactId}-ass
       SOLR_SOLR_PORT: 8983
       SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
+      ALFRESCO_SECURE_COMMS: "secret"
+      JAVA_TOOL_OPTIONS: "-Dalfresco.secureComms.secret=secret"
     ports:
       - "8983:8983"
     volumes:
       - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/contentstore
       - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/data
+  ${rootArtifactId}-activemq:
+      image: alfresco/alfresco-activemq:5.18-jre17-rockylinux8
+      mem_limit: 1g
+      ports:
+        - 8161:8161 # Web Console
+        - 5672:5672 # AMQP
+        - 61616:61616 # OpenWire
+        - 61613:61613 # STOMP
+
 volumes:
   ${rootArtifactId}-acs-volume:
     external: true
   ${rootArtifactId}-db-volume:
     external: true
   ${rootArtifactId}-ass-volume:
-    external: true
+    external: true

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.bat

@@ -71,21 +71,21 @@ EXIT /B %ERRORLEVEL%
     docker volume create ${rootArtifactId}-acs-volume
     docker volume create ${rootArtifactId}-db-volume
     docker volume create ${rootArtifactId}-ass-volume
-    docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d
+    docker compose -f "%COMPOSE_FILE_PATH%" up --build -d
 EXIT /B 0
 :down
     if exist "%COMPOSE_FILE_PATH%" (
-        docker-compose -f "%COMPOSE_FILE_PATH%" down
+        docker compose -f "%COMPOSE_FILE_PATH%" down
     )
 EXIT /B 0
 :build
 	call %MVN_EXEC% clean package
 EXIT /B 0
 :tail
-    docker-compose -f "%COMPOSE_FILE_PATH%" logs -f
+    docker compose -f "%COMPOSE_FILE_PATH%" logs -f
 EXIT /B 0
 :tail_all
-    docker-compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"
+    docker compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"
 EXIT /B 0
 :prepare_test
     call %MVN_EXEC% verify -DskipTests=true

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.sh

@@ -13,12 +13,12 @@ start() {
     docker volume create ${rootArtifactId}-acs-volume
     docker volume create ${rootArtifactId}-db-volume
     docker volume create ${rootArtifactId}-ass-volume
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d
 }
 
 down() {
     if [ -f "${symbol_dollar}COMPOSE_FILE_PATH" ]; then
-        docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down
+        docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down
     fi
 }
 
@@ -33,11 +33,11 @@ build() {
 }
 
 tail() {
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f
 }
 
 tail_all() {
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all"
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all"
 }
 
 prepare_test() {

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/assembly/amp.xml

@@ -35,9 +35,9 @@
             <source>src/main/assembly/file-mapping.properties</source>
             <filtered>false</filtered>
         </file>
-        <!-- Add module-specific log4j.properties configuration at top level in the AMP -->
+        <!-- Add module-specific log4j2.properties configuration at top level in the AMP -->
         <file>
-            <source>src/main/resources/alfresco/module/${project.artifactId}/log4j.properties</source>
+            <source>src/main/resources/alfresco/module/${project.artifactId}/log4j2.properties</source>
             <filtered>false</filtered>
         </file>
     </files>

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/Dockerfile

@@ -1,6 +1,7 @@
 FROM ${docker.acs.image}:${alfresco.platform.version}
 
 ARG TOMCAT_DIR=/usr/local/tomcat
+ARG USERNAME=${alfresco.platform.docker.user}
 
 USER root
 
@@ -13,7 +14,7 @@ RUN java -jar $TOMCAT_DIR/alfresco-mmt/alfresco-mmt*.jar install \
               $TOMCAT_DIR/amps $TOMCAT_DIR/webapps/alfresco -directory -nobackup -force
 
 COPY alfresco-global.properties $TOMCAT_DIR/shared/classes/alfresco-global.properties
-COPY dev-log4j.properties $TOMCAT_DIR/shared/classes/alfresco/extension
+COPY dev-log4j2.properties $TOMCAT_DIR/shared/classes/alfresco/extension
 COPY disable-webscript-caching-context.xml $TOMCAT_DIR/shared/classes/alfresco/extension
 
 # Copy Dockerfile to avoid an error if no license file exists

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/alfresco-global.properties

@@ -62,7 +62,8 @@ db.driver=org.postgresql.Driver
 index.subsystem.name=solr6
 solr.host=${rootArtifactId}-ass
 solr.port=8983
-solr.secureComms=none
+solr.secureComms=secret
+solr.sharedSecret=secret
 
 db.username=alfresco
 db.password=alfresco
@@ -84,4 +85,4 @@ messaging.broker.url=vm://localhost?broker.persistent=false
 # Disable ATS
 transform.service.enabled=false
 local.transform.service.enabled=false
-legacy.transform.service.enabled=false
+legacy.transform.service.enabled=false

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/dev-log4j.properties

@@ -1,270 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-# Set root logger level to error
-log4j.rootLogger=error, Console, File
-
-
-# All outputs currently set to be a ConsoleAppender.
-log4j.appender.Console=org.apache.log4j.ConsoleAppender
-log4j.appender.Console.layout=org.apache.log4j.PatternLayout
-
-# use log4j NDC to replace %x with tenant domain / username
-log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n 
-#log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
-
-log4j.appender.File=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.File.File=alfresco.log
-log4j.appender.File.Append=true
-log4j.appender.File.DatePattern='.'yyyy-MM-dd
-log4j.appender.File.layout=org.apache.log4j.PatternLayout
-log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %m%n
-
-#log4j.appender.file=org.apache.log4j.FileAppender
-#log4j.appender.file.File=hibernate.log
-#log4j.appender.file.layout=org.apache.log4j.PatternLayout
-#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-
-
-# Commented-in loggers will be exposed as JMX MBeans (refer to org.alfresco.repo.admin.Log4JHierarchyInit)
-# Hence, generally useful loggers should be listed with at least ERROR level to allow simple runtime
-# control of the level via a suitable JMX Console. Also, any other loggers can be added transiently via
-# Log4j addLoggerMBean as long as the logger exists and has been loaded.
-
-# Hibernate
-log4j.logger.org.hibernate=error
-log4j.logger.org.hibernate.util.JDBCExceptionReporter=fatal
-log4j.logger.org.hibernate.event.def.AbstractFlushingEventListener=fatal
-log4j.logger.org.hibernate.type=warn
-log4j.logger.org.hibernate.cfg.SettingsFactory=warn
-
-# Spring
-log4j.logger.org.springframework=warn
-# Turn off Spring remoting warnings that should really be info or debug.
-log4j.logger.org.springframework.remoting.support=error
-log4j.logger.org.springframework.util=error
-
-# Axis/WSS4J
-log4j.logger.org.apache.axis=info
-log4j.logger.org.apache.ws=info
-
-# CXF
-log4j.logger.org.apache.cxf=error
-
-# MyFaces
-log4j.logger.org.apache.myfaces.util.DebugUtils=info
-log4j.logger.org.apache.myfaces.el.VariableResolverImpl=error
-log4j.logger.org.apache.myfaces.application.jsp.JspViewHandlerImpl=error
-log4j.logger.org.apache.myfaces.taglib=error
-
-# OpenOfficeConnection
-log4j.logger.net.sf.jooreports.openoffice.connection=fatal
-
-# log prepared statement cache activity log4j.logger.org.hibernate.ps.PreparedStatementCache=info
-
-# Alfresco
-log4j.logger.org.alfresco=error
-log4j.logger.org.alfresco.repo.admin=info
-log4j.logger.org.alfresco.repo.transaction=warn
-log4j.logger.org.alfresco.repo.cache.TransactionalCache=warn
-log4j.logger.org.alfresco.repo.model.filefolder=warn
-log4j.logger.org.alfresco.repo.tenant=info
-log4j.logger.org.alfresco.config=warn
-log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn
-log4j.logger.org.alfresco.config.JBossEnabledWebApplicationContext=warn
-log4j.logger.org.alfresco.repo.management.subsystems=warn
-log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory=info
-log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory$ChildApplicationContext=warn
-log4j.logger.org.alfresco.repo.security.sync=info
-log4j.logger.org.alfresco.repo.security.person=info
-
-log4j.logger.org.alfresco.sample=info
-log4j.logger.org.alfresco.web=info
-#log4j.logger.org.alfresco.web.app.AlfrescoNavigationHandler=debug
-#log4j.logger.org.alfresco.web.ui.repo.component.UIActions=debug
-#log4j.logger.org.alfresco.web.ui.repo.tag.PageTag=debug
-#log4j.logger.org.alfresco.web.bean.clipboard=debug
-log4j.logger.org.alfresco.service.descriptor.DescriptorService=info
-#log4j.logger.org.alfresco.web.page=debug
-
-log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=error
-#log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=info
-
-log4j.logger.org.alfresco.repo.admin.patch.PatchExecuter=info
-log4j.logger.org.alfresco.repo.domain.patch.ibatis.PatchDAOImpl=info
-
-# Specific patches
-log4j.logger.org.alfresco.repo.admin.patch.impl.DeploymentMigrationPatch=info
-log4j.logger.org.alfresco.repo.version.VersionMigrator=info
-
-log4j.logger.org.alfresco.repo.module.ModuleServiceImpl=info
-log4j.logger.org.alfresco.repo.domain.schema.SchemaBootstrap=info
-log4j.logger.org.alfresco.repo.admin.ConfigurationChecker=info
-log4j.logger.org.alfresco.repo.node.index.AbstractReindexComponent=warn
-log4j.logger.org.alfresco.repo.node.index.IndexTransactionTracker=warn
-log4j.logger.org.alfresco.repo.node.index.FullIndexRecoveryComponent=info
-log4j.logger.org.alfresco.util.OpenOfficeConnectionTester=info
-log4j.logger.org.alfresco.repo.node.db.hibernate.HibernateNodeDaoServiceImpl=warn
-log4j.logger.org.alfresco.repo.domain.hibernate.DirtySessionMethodInterceptor=warn
-log4j.logger.org.alfresco.repo.transaction.RetryingTransactionHelper=warn
-log4j.logger.org.alfresco.util.transaction.SpringAwareUserTransaction.trace=warn
-log4j.logger.org.alfresco.util.AbstractTriggerBean=warn
-log4j.logger.org.alfresco.enterprise.repo.cluster=info
-log4j.logger.org.alfresco.repo.version.Version2ServiceImpl=warn
-
-#log4j.logger.org.alfresco.web.app.DebugPhaseListener=debug
-log4j.logger.org.alfresco.repo.node.db.NodeStringLengthWorker=info
-
-log4j.logger.org.alfresco.repo.workflow=info
-
-# CIFS server debugging
-log4j.logger.org.alfresco.smb.protocol=error
-#log4j.logger.org.alfresco.smb.protocol.auth=debug
-#log4j.logger.org.alfresco.acegi=debug
-
-# FTP server debugging
-log4j.logger.org.alfresco.ftp.protocol=error
-#log4j.logger.org.alfresco.ftp.server=debug
-
-# WebDAV debugging
-#log4j.logger.org.alfresco.webdav.protocol=debug
-log4j.logger.org.alfresco.webdav.protocol=info
-
-# NTLM servlet filters
-#log4j.logger.org.alfresco.web.app.servlet.NTLMAuthenticationFilter=debug
-#log4j.logger.org.alfresco.repo.webdav.auth.NTLMAuthenticationFilter=debug
-
-# Kerberos servlet filters
-#log4j.logger.org.alfresco.web.app.servlet.KerberosAuthenticationFilter=debug
-#log4j.logger.org.alfresco.repo.webdav.auth.KerberosAuthenticationFilter=debug
-
-# File servers
-log4j.logger.org.alfresco.fileserver=warn
-
-# Repo filesystem debug logging
-#log4j.logger.org.alfresco.filesys.repo.ContentDiskDriver=debug
-
-# Integrity message threshold - if 'failOnViolation' is off, then WARNINGS are generated
-log4j.logger.org.alfresco.repo.node.integrity=ERROR
-
-# Indexer debugging
-log4j.logger.org.alfresco.repo.search.Indexer=error
-#log4j.logger.org.alfresco.repo.search.Indexer=debug
-
-log4j.logger.org.alfresco.repo.search.impl.lucene.index=error
-log4j.logger.org.alfresco.repo.search.impl.lucene.fts.FullTextSearchIndexerImpl=warn
-#log4j.logger.org.alfresco.repo.search.impl.lucene.index=DEBUG
-
-# Audit debugging
-# log4j.logger.org.alfresco.repo.audit=DEBUG
-# log4j.logger.org.alfresco.repo.audit.model=DEBUG
-
-# Property sheet and modelling debugging
-# change to error to hide the warnings about missing properties and associations
-log4j.logger.alfresco.missingProperties=warn
-
-# Dictionary/Model debugging
-log4j.logger.org.alfresco.repo.dictionary=warn
-log4j.logger.org.alfresco.repo.dictionary.types.period=warn
-
-# Virtualization Server Registry
-log4j.logger.org.alfresco.mbeans.VirtServerRegistry=error
-
-# Spring context runtime property setter
-log4j.logger.org.alfresco.util.RuntimeSystemPropertiesSetter=info
-
-# Debugging options for clustering
-log4j.logger.org.alfresco.repo.content.ReplicatingContentStore=error
-log4j.logger.org.alfresco.repo.content.replication=error
-
-#log4j.logger.org.alfresco.repo.deploy.DeploymentServiceImpl=debug
-
-# Activity service
-log4j.logger.org.alfresco.repo.activities=warn
-
-# User usage tracking
-log4j.logger.org.alfresco.repo.usage=info
-
-# Sharepoint
-log4j.logger.org.alfresco.module.vti=info
-
-# Forms Engine
-log4j.logger.org.alfresco.web.config.forms=info
-log4j.logger.org.alfresco.web.scripts.forms=info
-
-# CMIS
-log4j.logger.org.alfresco.opencmis=error
-log4j.logger.org.alfresco.opencmis.AlfrescoCmisServiceInterceptor=error
-log4j.logger.org.alfresco.cmis=error
-log4j.logger.org.alfresco.cmis.dictionary=warn
-log4j.logger.org.apache.chemistry.opencmis=info
-log4j.logger.org.apache.chemistry.opencmis.server.impl.browser.CmisBrowserBindingServlet=OFF
-log4j.logger.org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet=OFF
-
-# IMAP
-log4j.logger.org.alfresco.repo.imap=info
-
-# JBPM
-# Note: non-fatal errors (eg. logged during job execution) should be handled by Alfresco's retrying transaction handler 
-log4j.logger.org.jbpm.graph.def.GraphElement=fatal
-
-#log4j.logger.org.alfresco.repo.googledocs=debug
-
-
-# Web Framework
-log4j.logger.org.springframework.extensions.webscripts=info
-log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=warn
-log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off
-
-# Repository
-log4j.logger.org.alfresco.repo.web.scripts=warn
-log4j.logger.org.alfresco.repo.web.scripts.BaseWebScriptTest=info
-log4j.logger.org.alfresco.repo.web.scripts.AlfrescoRhinoScriptDebugger=off
-log4j.logger.org.alfresco.repo.jscript=error
-log4j.logger.org.alfresco.repo.jscript.ScriptLogger=warn
-log4j.logger.org.alfresco.repo.cmis.rest.CMISTest=info
-
-log4j.logger.org.alfresco.repo.domain.schema.script.ScriptBundleExecutorImpl=off
-log4j.logger.org.alfresco.repo.domain.schema.script.ScriptExecutorImpl=info
-
-log4j.logger.org.alfresco.repo.search.impl.solr.facet.SolrFacetServiceImpl=info
-
-# Bulk Filesystem Import Tool
-log4j.logger.org.alfresco.repo.bulkimport=warn
-
-# Freemarker
-# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
-log4j.logger.freemarker.runtime=
-
-# Metadata extraction
-log4j.logger.org.alfresco.repo.content.metadata.AbstractMappingMetadataExtracter=warn
-
-# Reduces PDFont error level due to ALF-7105
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDSimpleFont=fatal
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDFont=fatal
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDCIDFont=fatal
-
-# no index support
-log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexIndexer=fatal
-log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexSearchService=fatal
-
-# lucene index warnings
-log4j.logger.org.alfresco.repo.search.impl.lucene.index.IndexInfo=warn
-
-# Warn about RMI socket bind retries.
-log4j.logger.org.alfresco.util.remote.server.socket.HostConfigurableSocketFactory=warn
-
-log4j.logger.org.alfresco.repo.usage.RepoUsageMonitor=info
-
-# Authorization
-log4j.logger.org.alfresco.enterprise.repo.authorization.AuthorizationService=info
-log4j.logger.org.alfresco.enterprise.repo.authorization.AuthorizationsConsistencyMonitor=warn
-
-#-----------------------------------------------------------------------
-# Platform module logging
-#-----------------------------------------------------------------------
-log4j.logger.${package}.platformsample.DemoComponent=debug
-log4j.logger.${package}.platformsample.HelloWorldWebScript=debug
-
-
-

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/dev-log4j2.properties

@@ -0,0 +1,426 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+# Set root logger level to error
+#log4j.rootLogger=error, Console, File
+rootLogger.level=error
+rootLogger.appenderRef.stdout.ref=ConsoleAppender
+rootLogger.appenderRef.rolling.ref=RollingAppender
+
+# All outputs currently set to be a ConsoleAppender.
+appender.console.type=Console
+appender.console.name=ConsoleAppender
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %replace{%m}{[\r\n]+}{}%n
+
+# use log4j NDC to replace %x with tenant domain / username
+appender.console.layout.pattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %replace{%m}{[\r\n]+}{}%n
+
+# File appender definition #
+appender.rolling.type=RollingFile
+appender.rolling.name=RollingAppender
+appender.rolling.fileName=alfresco.log
+appender.rolling.filePattern=alfresco.log.%d{yyyy-MM-dd}
+appender.rolling.layout.type=PatternLayout
+appender.rolling.layout.pattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %replace{%m}{[\r\n]+}{}%n
+appender.rolling.policies.type = Policies
+appender.rolling.policies.time.type = TimeBasedTriggeringPolicy
+appender.rolling.policies.time.interval = 1
+
+# Commented-in loggers will be exposed as JMX MBeans (refer to org.alfresco.repo.admin.Log4JHierarchyInit)
+# Hence, generally useful loggers should be listed with at least ERROR level to allow simple runtime
+# control of the level via a suitable JMX Console. Also, any other loggers can be added transiently via
+# Log4j addLoggerMBean as long as the logger exists and has been loaded.
+
+# Hibernate
+logger.hibernate.name=org.hibernate
+logger.hibernate.level=error
+
+logger.hibernate-util-JDBCExceptionReporter.name=org.hibernate.util.JDBCExceptionReporter
+logger.hibernate-util-JDBCExceptionReporter.level=fatal
+
+logger.hibernate-event-def-AbstractFlushingEventListener.name=org.hibernate.event.def.AbstractFlushingEventListener
+logger.hibernate-event-def-AbstractFlushingEventListener.level=fatal
+
+logger.hibernate-type.name=org.hibernate.type
+logger.hibernate-type.level=warn
+
+logger.hibernate-cfg-SettingsFactory.name=org.hibernate.cfg.SettingsFactory
+logger.hibernate-cfg-SettingsFactory.level=warn
+
+# Spring
+logger.springframework.name=org.springframework
+logger.springframework.level=warn
+
+# Turn off Spring remoting warnings that should really be info or debug.
+logger.springframework-remoting-support.name=org.springframework.remoting.support
+logger.springframework-remoting-support.level=error
+
+logger.springframework-util.name=org.springframework.util
+logger.springframework-util.level=error
+
+# Axis/WSS4J
+logger.apache-axis.name=org.apache.axis
+logger.apache-axis.level=info
+
+logger.apache-ws.name=org.apache.ws
+logger.apache-ws.level=info
+
+# CXF
+logger.apache-cxf.name=org.apache.cxf
+logger.apache-cxf.level=error
+
+# MyFaces
+logger.apache-myfaces-util-DebugUtils.name=org.apache.myfaces.util.DebugUtils
+logger.apache-myfaces-util-DebugUtils.level=info
+
+logger.apache-myfaces-el-VariableResolverImpl.name=org.apache.myfaces.el.VariableResolverImpl
+logger.apache-myfaces-el-VariableResolverImpl.level=error
+
+logger.apache-myfaces-application-jsp-JspViewHandlerImpl.name=org.apache.myfaces.application.jsp.JspViewHandlerImpl
+logger.apache-myfaces-application-jsp-JspViewHandlerImpl.level=error
+
+logger.apache-myfaces-taglib.name=org.apache.myfaces.taglib
+logger.apache-myfaces-taglib.level=error
+
+# OpenOfficeConnection
+logger.sf-jooreports-openoffice-connection.name=net.sf.jooreports.openoffice.connection
+logger.sf-jooreports-openoffice-connection.level=fatal
+
+# log prepared statement cache activity log4j.logger.org.hibernate.ps.PreparedStatementCache=info
+
+# Alfresco
+logger.alfresco.name=org.alfresco
+logger.alfresco.level=error
+
+logger.alfresco-repo-admin.name=org.alfresco.repo.admin
+logger.alfresco-repo-admin.level=info
+
+logger.alfresco-repo-transaction.name=org.alfresco.repo.transaction
+logger.alfresco-repo-transaction.level=warn
+
+logger.alfresco-repo-cache-TransactionalCache.name=org.alfresco.repo.cache.TransactionalCache
+logger.alfresco-repo-cache-TransactionalCache.level=warn
+
+logger.alfresco-repo-model-filefolder.name=org.alfresco.repo.model.filefolder
+logger.alfresco-repo-model-filefolder.level=warn
+
+logger.alfresco-repo-tenant.name=org.alfresco.repo.tenant
+logger.alfresco-repo-tenant.level=info
+
+logger.alfresco-config.name=org.alfresco.config
+logger.alfresco-config.level=warn
+
+logger.alfresco-config-JndiObjectFactoryBean.name=org.alfresco.config.JndiObjectFactoryBean
+logger.alfresco-config-JndiObjectFactoryBean.level=warn
+
+logger.alfresco-config-JBossEnabledWebApplicationContext.name=org.alfresco.config.JBossEnabledWebApplicationContext
+logger.alfresco-config-JBossEnabledWebApplicationContext.level=warn
+
+logger.alfresco-repo-management-subsystems.name=org.alfresco.repo.management.subsystems
+logger.alfresco-repo-management-subsystems.level=warn
+
+logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory.name=org.alfresco.repo.management.subsystems.ChildApplicationContextFactory
+logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory.level=info
+
+logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory$ChildApplicationContext.name=org.alfresco.repo.management.subsystems.ChildApplicationContextFactory$ChildApplicationContext
+logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory$ChildApplicationContext.level=warn
+
+logger.alfresco-repo-security-sync.name=org.alfresco.repo.security.sync
+logger.alfresco-repo-security-sync.level=info
+
+logger.alfresco-repo-security-person.name=org.alfresco.repo.security.person
+logger.alfresco-repo-security-person.level=info
+
+logger.alfresco-sample.name=org.alfresco.sample
+logger.alfresco-sample.level=info
+
+logger.alfresco-web.name=org.alfresco.web
+logger.alfresco-web.level=info
+
+logger.alfresco-service-descriptor-DescriptorService.name=org.alfresco.service.descriptor.DescriptorService
+logger.alfresco-service-descriptor-DescriptorService.level=info
+
+logger.alfresco-repo-importer-ImporterBootstrap.name=org.alfresco.repo.importer.ImporterBootstrap
+logger.alfresco-repo-importer-ImporterBootstrap.level=error
+
+logger.alfresco-repo-admin-patch-PatchExecuter.name=org.alfresco.repo.admin.patch.PatchExecuter
+logger.alfresco-repo-admin-patch-PatchExecuter.level=info
+
+logger.alfresco-repo-domain-patch-ibatis-PatchDAOImpl.name=org.alfresco.repo.domain.patch.ibatis.PatchDAOImpl
+logger.alfresco-repo-domain-patch-ibatis-PatchDAOImpl.level=info
+
+# Specific patches
+logger.alfresco-repo-admin-patch-impl-DeploymentMigrationPatch.name=org.alfresco.repo.admin.patch.impl.DeploymentMigrationPatch
+logger.alfresco-repo-admin-patch-impl-DeploymentMigrationPatch.level=info
+
+logger.alfresco-repo-version-VersionMigrator.name=org.alfresco.repo.version.VersionMigrator
+logger.alfresco-repo-version-VersionMigrator.level=info
+
+logger.alfresco-repo-module-ModuleServiceImpl.name=org.alfresco.repo.module.ModuleServiceImpl
+logger.alfresco-repo-module-ModuleServiceImpl.level=info
+
+logger.alfresco-repo-domain-schema-SchemaBootstrap.name=org.alfresco.repo.domain.schema.SchemaBootstrap
+logger.alfresco-repo-domain-schema-SchemaBootstrap.level=info
+
+logger.alfresco-repo-admin-ConfigurationChecker.name=org.alfresco.repo.admin.ConfigurationChecker
+logger.alfresco-repo-admin-ConfigurationChecker.level=info
+
+logger.alfresco-repo-node-index-AbstractReindexComponent.name=org.alfresco.repo.node.index.AbstractReindexComponent
+logger.alfresco-repo-node-index-AbstractReindexComponent.level=warn
+
+logger.alfresco-repo-node-index-IndexTransactionTracker.name=org.alfresco.repo.node.index.IndexTransactionTracker
+logger.alfresco-repo-node-index-IndexTransactionTracker.level=warn
+
+logger.alfresco-repo-node-index-FullIndexRecoveryComponent.name=org.alfresco.repo.node.index.FullIndexRecoveryComponent
+logger.alfresco-repo-node-index-FullIndexRecoveryComponent.level=info
+
+#logger.alfresco-repo-node-db-hibernate-HibernateNodeDaoServiceImpl.name=org.alfresco.repo.node.db.hibernate.HibernateNodeDaoServiceImpl
+#logger.alfresco-repo-node-db-hibernate-HibernateNodeDaoServiceImpl.level=warn
+
+logger.alfresco-repo-domain-hibernate-DirtySessionMethodInterceptor.name=org.alfresco.repo.domain.hibernate.DirtySessionMethodInterceptor
+logger.alfresco-repo-domain-hibernate-DirtySessionMethodInterceptor.level=warn
+
+logger.alfresco-repo-transaction-RetryingTransactionHelper.name=org.alfresco.repo.transaction.RetryingTransactionHelper
+logger.alfresco-repo-transaction-RetryingTransactionHelper.level=warn
+
+logger.alfresco-util-transaction-SpringAwareUserTransaction-trace.name=org.alfresco.util.transaction.SpringAwareUserTransaction.trace
+logger.alfresco-util-transaction-SpringAwareUserTransaction-trace.level=warn
+
+logger.alfresco-util-AbstractTriggerBean.name=org.alfresco.util.AbstractTriggerBean
+logger.alfresco-util-AbstractTriggerBean.level=warn
+
+logger.alfresco-enterprise-repo-cluster.name=org.alfresco.enterprise.repo.cluster
+logger.alfresco-enterprise-repo-cluster.level=info
+
+logger.alfresco-repo-version-Version2ServiceImpl.name=org.alfresco.repo.version.Version2ServiceImpl
+logger.alfresco-repo-version-Version2ServiceImpl.level=warn
+
+#logger.alfresco-web-app-DebugPhaseListener.name=org.alfresco.web.app.DebugPhaseListener
+#logger.alfresco-web-app-DebugPhaseListener.level=debug
+
+logger.alfresco-repo-node-db-NodeStringLengthWorker.name=org.alfresco.repo.node.db.NodeStringLengthWorker
+logger.alfresco-repo-node-db-NodeStringLengthWorker.level=info
+
+logger.alfresco-repo-workflow.name=org.alfresco.repo.workflow
+logger.alfresco-repo-workflow.level=info
+
+# CIFS server debugging
+logger.alfresco-smb.protocol.name=org.alfresco.smb.protocol
+logger.alfresco-smb.protocol.level=error
+
+# FTP server debugging
+logger.alfresco-ftp-protocol.name=org.alfresco.ftp.protocol
+logger.alfresco-ftp-protocol.level=error
+
+# WebDAV debugging
+logger.alfresco-webdav-protocol.name=org.alfresco.webdav.protocol
+logger.alfresco-webdav-protocol.level=info
+
+# NTLM servlet filters
+#log4j.logger.org.alfresco.web.app.servlet.NTLMAuthenticationFilter=debug
+#log4j.logger.org.alfresco.repo.webdav.auth.NTLMAuthenticationFilter=debug
+
+# Kerberos servlet filters
+#log4j.logger.org.alfresco.web.app.servlet.KerberosAuthenticationFilter=debug
+#log4j.logger.org.alfresco.repo.webdav.auth.KerberosAuthenticationFilter=debug
+
+# File servers
+logger.alfresco-fileserver.name=org.alfresco.fileserver
+logger.alfresco-fileserver.level=warn
+
+# Repo filesystem debug logging
+#log4j.logger.org.alfresco.filesys.repo.ContentDiskDriver=debug
+
+# Integrity message threshold - if 'failOnViolation' is off, then WARNINGS are generated
+logger.alfresco-repo-node-integrity.name=org.alfresco.repo.node.integrity
+logger.alfresco-repo-node-integrity.level=error
+
+# Indexer debugging
+logger.alfresco-repo-search-Indexer.name=org.alfresco.repo.search.Indexer
+logger.alfresco-repo-search-Indexer.level=error
+
+logger.alfresco-repo-search-impl-lucene-index.name=org.alfresco.repo.search.impl.lucene.index
+logger.alfresco-repo-search-impl-lucene-index.level=error
+
+logger.alfresco-repo-search-impl-lucene-fts-FullTextSearchIndexerImpl.name=org.alfresco.repo.search.impl.lucene.fts.FullTextSearchIndexerImpl
+logger.alfresco-repo-search-impl-lucene-fts-FullTextSearchIndexerImpl.level=warn
+
+# Audit debugging
+logger.missingProperties.name=alfresco.missingProperties
+logger.missingProperties.level=warn
+
+# Property sheet and modelling debugging
+logger.missingProperties.name=alfresco.missingProperties
+logger.missingProperties.level=warn
+
+# Dictionary/Model debugging
+logger.alfresco-repo-dictionary.name=org.alfresco.repo.dictionary
+logger.alfresco-repo-dictionary.level=warn
+
+logger.alfresco-repo-dictionary-types-period.name=org.alfresco.repo.dictionary.types.period
+logger.alfresco-repo-dictionary-types-period.level=warn
+
+# Virtualization Server Registry
+logger.alfresco-mbeans-VirtServerRegistry.name=org.alfresco.mbeans.VirtServerRegistry
+logger.alfresco-mbeans-VirtServerRegistry.level=error
+
+# Spring context runtime property setter
+logger.alfresco-util-RuntimeSystemPropertiesSetter.name=org.alfresco.util.RuntimeSystemPropertiesSetter
+logger.alfresco-util-RuntimeSystemPropertiesSetter.level=info
+
+# Debugging options for clustering
+logger.alfresco-repo-content-ReplicatingContentStore.name=org.alfresco.repo.content.ReplicatingContentStore
+logger.alfresco-repo-content-ReplicatingContentStore.level=error
+
+logger.alfresco-repo-content-replication.name=org.alfresco.repo.content.replication
+logger.alfresco-repo-content-replication.level=error
+
+# Activity service
+logger.alfresco-repo-activities.name=org.alfresco.repo.activities
+logger.alfresco-repo-activities.level=warn
+
+# User usage tracking
+logger.alfresco-repo-usage.name=org.alfresco.repo.usage
+logger.alfresco-repo-usage.level=info
+
+# Sharepoint
+logger.alfresco-module-vti.name=org.alfresco.module.vti
+logger.alfresco-module-vti.level=info
+
+# Forms Engine
+logger.alfresco-web-config-forms.name=org.alfresco.web.config.forms
+logger.alfresco-web-config-forms.level=info
+
+logger.alfresco-web-scripts-forms.name=org.alfresco.web.scripts.forms
+logger.alfresco-web-scripts-forms.level=info
+
+# CMIS
+logger.alfresco-opencmis.name=org.alfresco.opencmis
+logger.alfresco-opencmis.level=error
+
+logger.alfresco-opencmis-AlfrescoCmisServiceInterceptor.name=org.alfresco.opencmis.AlfrescoCmisServiceInterceptor
+logger.alfresco-opencmis-AlfrescoCmisServiceInterceptor.level=error
+
+logger.alfresco-cmis.name=org.alfresco.cmis
+logger.alfresco-cmis.level=error
+
+logger.alfresco-cmis-dictionary.name=org.alfresco.cmis.dictionary
+logger.alfresco-cmis-dictionary.level=warn
+
+logger.apache-chemistry-opencmis.name=org.apache.chemistry.opencmis
+logger.apache-chemistry-opencmis.level=info
+
+logger.apache-chemistry-opencmis-server-impl-browser-CmisBrowserBindingServlet.name=org.apache.chemistry.opencmis.server.impl.browser.CmisBrowserBindingServlet
+logger.apache-chemistry-opencmis-server-impl-browser-CmisBrowserBindingServlet.level=off
+
+logger.apache-chemistry-opencmis-server-impl-atompub-CmisAtomPubServlet.name=org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet
+logger.apache-chemistry-opencmis-server-impl-atompub-CmisAtomPubServlet.level=off
+
+# IMAP
+logger.alfresco-repo-imap.name=org.alfresco.repo.imap
+logger.alfresco-repo-imap.level=info
+
+# JBPM
+# Note: non-fatal errors (eg. logged during job execution) should be handled by Alfresco's retrying transaction handler
+logger.jbpm-graph-def-GraphElement.name=org.jbpm.graph.def.GraphElement
+logger.jbpm-graph-def-GraphElement.level=fatal
+
+
+# Web Framework
+logger.springframework-extensions-webscripts.name=org.springframework.extensions.webscripts
+logger.springframework-extensions-webscripts.level=info
+
+logger.springframework-extensions-webscripts-ScriptLogger.name=org.springframework.extensions.webscripts.ScriptLogger
+logger.springframework-extensions-webscripts-ScriptLogger.level=warn
+
+logger.springframework-extensions-webscripts-ScriptDebugger.name=org.springframework.extensions.webscripts.ScriptDebugger
+logger.springframework-extensions-webscripts-ScriptDebugger.level=off
+
+# Repository
+logger.alfresco-repo-web-scripts.name=org.alfresco.repo.web.scripts
+logger.alfresco-repo-web-scripts.level=warn
+
+logger.alfresco-repo-web-scripts-BaseWebScriptTest.name=org.alfresco.repo.web.scripts.BaseWebScriptTest
+logger.alfresco-repo-web-scripts-BaseWebScriptTest.level=info
+
+logger.alfresco-repo-web-scripts-AlfrescoRhinoScriptDebugger.name=org.alfresco.repo.web.scripts.AlfrescoRhinoScriptDebugger
+logger.alfresco-repo-web-scripts-AlfrescoRhinoScriptDebugger.level=off
+
+logger.alfresco-repo-jscript.name=org.alfresco.repo.jscript
+logger.alfresco-repo-jscript.level=error
+
+logger.alfresco-repo-jscript-ScriptLogger.name=org.alfresco.repo.jscript.ScriptLogger
+logger.alfresco-repo-jscript-ScriptLogger.level=warn
+
+logger.alfresco-repo-cmis-rest-CMISTest.name=org.alfresco.repo.cmis.rest.CMISTest
+logger.alfresco-repo-cmis-rest-CMISTest.level=info
+
+logger.alfresco-repo-domain-schema-script-ScriptBundleExecutorImpl.name=org.alfresco.repo.domain.schema.script.ScriptBundleExecutorImpl
+logger.alfresco-repo-domain-schema-script-ScriptBundleExecutorImpl.level=off
+
+logger.alfresco-repo-domain-schema-script-ScriptExecutorImpl.name=org.alfresco.repo.domain.schema.script.ScriptExecutorImpl
+logger.alfresco-repo-domain-schema-script-ScriptExecutorImpl.level=info
+
+logger.alfresco-repo-domain-schema-script-DeleteNotExistsExecutor.name=org.alfresco.repo.domain.schema.script.DeleteNotExistsExecutor
+logger.alfresco-repo-domain-schema-script-DeleteNotExistsExecutor.level=off
+
+logger.alfresco-repo-search-impl-solr-facet-SolrFacetServiceImpl.name=org.alfresco.repo.search.impl.solr.facet.SolrFacetServiceImpl
+logger.alfresco-repo-search-impl-solr-facet-SolrFacetServiceImpl.level=info
+
+# Bulk Filesystem Import Tool
+logger.alfresco-repo-bulkimport.name=org.alfresco.repo.bulkimport
+logger.alfresco-repo-bulkimport.level=warn
+
+# Freemarker
+# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
+logger.runtime.name=freemarker.runtime
+logger.runtime.level=
+
+# Metadata extraction
+logger.alfresco-repo-content-metadata-AbstractMappingMetadataExtracter.name=org.alfresco.repo.content.metadata.AbstractMappingMetadataExtracter
+logger.alfresco-repo-content-metadata-AbstractMappingMetadataExtracter.level=warn
+
+# Reduces PDFont error level due to ALF-7105
+logger.apache-pdfbox-pdmodel-font-PDSimpleFont.name=org.apache.pdfbox.pdmodel.font.PDSimpleFont
+logger.apache-pdfbox-pdmodel-font-PDSimpleFont.level=fatal
+logger.apache-pdfbox-pdmodel-font-PDFont.name=org.apache.pdfbox.pdmodel.font.PDFont
+logger.apache-pdfbox-pdmodel-font-PDFont=fatal
+logger.apache-pdfbox-pdmodel-font-PDCIDFont.name=org.apache.pdfbox.pdmodel.font.PDCIDFont
+logger.apache-pdfbox-pdmodel-font-PDCIDFont.level=fatal
+
+# no index support
+logger.alfresco-repo-search-impl-noindex-NoIndexIndexer.name=org.alfresco.repo.search.impl.noindex.NoIndexIndexer
+logger.alfresco-repo-search-impl-noindex-NoIndexIndexer.level=fatal
+
+logger.alfresco-repo-search-impl-noindex-NoIndexSearchService.name=org.alfresco.repo.search.impl.noindex.NoIndexSearchService
+logger.alfresco-repo-search-impl-noindex-NoIndexSearchService.level=fatal
+
+# lucene index warnings
+logger.alfresco-repo-search-impl-lucene-index-IndexInfo.name=org.alfresco.repo.search.impl.lucene.index.IndexInfo
+logger.alfresco-repo-search-impl-lucene-index-IndexInfo.level=warn
+
+# Warn about RMI socket bind retries.
+logger.alfresco-util-remote-server-socket-HostConfigurableSocketFactory.name=org.alfresco.util.remote.server.socket.HostConfigurableSocketFactory
+logger.alfresco-util-remote-server-socket-HostConfigurableSocketFactory.level=warn
+
+logger.alfresco-repo-usage-RepoUsageMonitor.name=org.alfresco.repo.usage.RepoUsageMonitor
+logger.alfresco-repo-usage-RepoUsageMonitor.level=info
+
+# Authorization
+logger.alfresco-enterprise-repo-authorization-AuthorizationService.name=org.alfresco.enterprise.repo.authorization.AuthorizationService
+logger.alfresco-enterprise-repo-authorization-AuthorizationService.level=info
+
+logger.alfresco-enterprise-repo-authorization-AuthorizationsConsistencyMonitor.name=org.alfresco.enterprise.repo.authorization.AuthorizationsConsistencyMonitor
+logger.alfresco-enterprise-repo-authorization-AuthorizationsConsistencyMonitor.level=warn
+
+#-----------------------------------------------------------------------
+# Platform module logging
+#-----------------------------------------------------------------------
+logger.${package}-platformsample-DemoComponent.name=${package}.platformsample.DemoComponent
+logger.${package}-platformsample-DemoComponent.level=debug
+logger.${package}-platformsample-HelloWorldWebScript.name=${package}.platformsample.HelloWorldWebScript
+logger.${package}-platformsample-HelloWorldWebScript.level=debug
+
+
+

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/log4j.properties

@@ -1 +0,0 @@
-# Add here module-specific custom log4j.properties configuration

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/log4j2.properties

@@ -0,0 +1 @@
+# Add here module-specific custom log4j2.properties configuration

archetypes/alfresco-share-jar-archetype/pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.alfresco.maven</groupId>
         <artifactId>alfresco-sdk-aggregator</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>4.12.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -57,4 +57,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/README.md

@@ -1,6 +1,6 @@
-# Alfresco Share JAR Module - SDK 4.0
+# Alfresco Share JAR Module - SDK 4.11.0
 
-This is a Share project for Alfresco SDK 4.0.
+This is a Share project for Alfresco SDK 4.11.0.
 
 Run with `./run.sh build_start` or `./run.bat build_start` and verify that it
 
@@ -37,4 +37,4 @@ All the services of the project are now run as docker containers. The run script
 # TODO
 
   * Abstract assembly into a dependency so we don't have to ship the assembly in the archetype
-  * Functional/remote unit tests
+  * Functional/remote unit tests

archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml

@@ -24,7 +24,8 @@ services:
 #                -Ddb.url=jdbc:postgresql://${rootArtifactId}-postgres:5432/alfresco
 #                -Dsolr.host=${rootArtifactId}-ass
 #                -Dsolr.port=8983
-#                -Dsolr.secureComms=none
+#                -Dsolr.secureComms=secret
+#                -Dsolr.sharedSecret=secret
 #                -Dsolr.base.url=/solr
 #                -Dindex.subsystem.name=solr6
 #                -Dcsrf.filter.enabled=false
@@ -32,6 +33,7 @@ services:
 #                -Dtransform.service.enabled=false
 #                -Dlocal.transform.service.enabled=false
 #                -Dlegacy.transform.service.enabled=false
+#                ${symbol_dollar}{keystore.settings}
 #                "
 #    ports:
 #      - "${symbol_dollar}{acs.port}:8080"
@@ -51,13 +53,15 @@ services:
 #    volumes:
 #      - ${rootArtifactId}-db-volume:/var/lib/postgresql/data
 #  ${rootArtifactId}-ass:
-#    image: alfresco/alfresco-search-services:1.2.0
+#    image: alfresco/alfresco-search-services:2.0.3
 #    environment:
 #      SOLR_ALFRESCO_HOST: ${rootArtifactId}-acs
 #      SOLR_ALFRESCO_PORT: 8080
 #      SOLR_SOLR_HOST: ${rootArtifactId}-ass
 #      SOLR_SOLR_PORT: 8983
 #      SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
+#      ALFRESCO_SECURE_COMMS: "secret"
+#      JAVA_TOOL_OPTIONS: "-Dalfresco.secureComms.secret=secret"
 #    ports:
 #      - "8983:8983"
 #    volumes:
@@ -69,4 +73,4 @@ services:
 #  ${rootArtifactId}-db-volume:
 #    external: true
 #  ${rootArtifactId}-ass-volume:
-#    external: true
+#    external: true

archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/pom.xml

@@ -19,12 +19,16 @@
         <alfresco.groupId>org.alfresco</alfresco.groupId>
         <alfresco.bomDependencyArtifactId>@@alfresco.bomDependency.artifactId@@</alfresco.bomDependencyArtifactId>
         <alfresco.platform.version>@@alfresco.platform.version@@</alfresco.platform.version>
+        <alfresco.platform.docker.user>@@alfresco.platform.docker.user@@</alfresco.platform.docker.user>
         <alfresco.share.version>@@alfresco.share.version@@</alfresco.share.version>
+        <alfresco.share.docker.version>@@alfresco.share.docker.version@@</alfresco.share.docker.version>
 
         <!-- Docker images -->
         <docker.acs.image>@@alfresco.platform.docker.image@@</docker.acs.image>
         <docker.share.image>@@alfresco.share.docker.image@@</docker.share.image>
 
+        <keystore.settings>@@keystore.settings@@</keystore.settings>
+
         <!-- JRebel Hot reloading of classpath stuff and web resource stuff -->
         <jrebel.version>1.1.8</jrebel.version>
 
@@ -217,51 +221,65 @@
                 </executions>
             </plugin>
 
-            <!-- Compress JavaScript files and store as *-min.js -->
+            <!-- Compress JavaScript files and store as *.min.js -->
             <plugin>
-                <groupId>net.alchim31.maven</groupId>
-                <artifactId>yuicompressor-maven-plugin</artifactId>
-                <version>1.5.1</version>
+                <groupId>com.github.blutorange</groupId>
+                <artifactId>closure-compiler-maven-plugin</artifactId>
+                <version>2.28.0</version>
                 <executions>
                     <!-- Compress the JS files under the assembly folder -->
                     <execution>
                         <id>compress-assembly</id>
+                        <phase>generate-resources</phase>
                         <goals>
-                            <goal>compress</goal>
+                            <goal>minify</goal>
                         </goals>
                         <configuration>
-                            <sourceDirectory>${project.basedir}/src/main/assembly/web</sourceDirectory>
-                            <outputDirectory>${project.basedir}/src/main/assembly/web</outputDirectory>
+                            <baseSourceDir>${project.basedir}/src/main/assembly</baseSourceDir>
+                            <baseTargetDir>${project.basedir}/src/main/assembly</baseTargetDir>
+                            <sourceDir>web</sourceDir>
+                            <targetDir>web</targetDir>
+                            <skipMerge>true</skipMerge>
+                            <includes>
+                                <include>**/*.js</include>
+                            </includes>
                             <excludes>
                                 <exclude>**/webscripts/**</exclude>
                                 <exclude>**/site-webscripts/**</exclude>
                                 <exclude>**/META-INF/**</exclude>
                                 <exclude>**/*.lib.js</exclude>
                                 <exclude>**/*.css</exclude>
-                                <exclude>**/*-min.js</exclude>
-                                <exclude>**/*-min.css</exclude>
+                                <exclude>**/*.min.js</exclude>
+                                <exclude>**/*.min.css</exclude>
                             </excludes>
                             <force>true</force>
-                            <jswarn>false</jswarn>
                         </configuration>
                     </execution>
                     <!-- Compress the JS files under the resources folder -->
                     <execution>
                         <id>compress-resources</id>
+                        <phase>generate-resources</phase>
                         <goals>
-                            <goal>compress</goal>
+                            <goal>minify</goal>
                         </goals>
                         <configuration>
+                            <baseSourceDir>${project.basedir}/src/main</baseSourceDir>
+                            <baseTargetDir>${project.basedir}/src/main</baseTargetDir>
+                            <sourceDir>resources</sourceDir>
+                            <targetDir>resources</targetDir>
+                            <skipMerge>true</skipMerge>
+                            <includes>
+                                <include>**/*.js</include>
+                            </includes>
                             <excludes>
                                 <exclude>**/webscripts/**</exclude>
                                 <exclude>**/site-webscripts/**</exclude>
                                 <exclude>**/*.lib.js</exclude>
                                 <exclude>**/*.css</exclude>
-                                <exclude>**/*-min.js</exclude>
-                                <exclude>**/*-min.css</exclude>
+                                <exclude>**/*.min.js</exclude>
+                                <exclude>**/*.min.css</exclude>
                             </excludes>
                             <force>true</force>
-                            <jswarn>false</jswarn>
                         </configuration>
                     </execution>
                 </executions>
@@ -364,7 +382,7 @@
         <profile>
             <id>java11</id>
             <activation>
-                <jdk>[11.0,)</jdk>
+                <jdk>[11.0,17)</jdk>
             </activation>
             <build>
                 <plugins>
@@ -379,6 +397,24 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>java17</id>
+            <activation>
+                <jdk>[17,)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <version>3.8.0</version>
+                        <configuration>
+                            <release>17</release>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
     <!--
@@ -402,6 +438,10 @@
             <id>alfresco-private-repository</id>
             <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
         </repository>
+        <repository>
+            <id>alfresco-internal</id>
+            <url>https://artifacts.alfresco.com/nexus/content/groups/internal</url>
+        </repository>
     </repositories>
 
     <pluginRepositories>

archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.bat

@@ -55,29 +55,29 @@ EXIT /B %ERRORLEVEL%
     docker volume create ${rootArtifactId}-acs-volume
     docker volume create ${rootArtifactId}-db-volume
     docker volume create ${rootArtifactId}-ass-volume
-    docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d
+    docker compose -f "%COMPOSE_FILE_PATH%" up --build -d
 EXIT /B 0
 :start_share
-    docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-share
+    docker compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-share
 EXIT /B 0
 :down
     if exist "%COMPOSE_FILE_PATH%" (
-        docker-compose -f "%COMPOSE_FILE_PATH%" down
+        docker compose -f "%COMPOSE_FILE_PATH%" down
     )
 EXIT /B 0
 :build
 	call %MVN_EXEC% clean package
 EXIT /B 0
 :build_share
-    docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share
-    docker-compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-share
+    docker compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share
+    docker compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-share
 	call %MVN_EXEC% clean package
 EXIT /B 0
 :tail
-    docker-compose -f "%COMPOSE_FILE_PATH%" logs -f
+    docker compose -f "%COMPOSE_FILE_PATH%" logs -f
 EXIT /B 0
 :tail_all
-    docker-compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"
+    docker compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"
 EXIT /B 0
 :purge
     docker volume rm -f ${rootArtifactId}-acs-volume

archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.sh

@@ -13,16 +13,16 @@ start() {
     docker volume create ${rootArtifactId}-acs-volume
     docker volume create ${rootArtifactId}-db-volume
     docker volume create ${rootArtifactId}-ass-volume
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d
 }
 
 start_share() {
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-share
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-share
 }
 
 down() {
     if [ -f "${symbol_dollar}COMPOSE_FILE_PATH" ]; then
-        docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down
+        docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down
     fi
 }
 
@@ -37,17 +37,17 @@ build() {
 }
 
 build_share() {
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" kill ${rootArtifactId}-share
-    yes | docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" rm -f ${rootArtifactId}-share
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" kill ${rootArtifactId}-share
+    yes | docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" rm -f ${rootArtifactId}-share
     ${symbol_dollar}MVN_EXEC clean package
 }
 
 tail() {
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f
 }
 
 tail_all() {
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all"
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all"
 }
 
 case "${symbol_dollar}1" in

archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/assembly/amp.xml

@@ -35,9 +35,9 @@
             <source>src/main/assembly/file-mapping.properties</source>
             <filtered>false</filtered>
         </file>
-        <!-- Add module-specific log4j.properties configuration at top level in the AMP -->
+        <!-- Add module-specific log4j2.properties configuration at top level in the AMP -->
         <file>
-            <source>src/main/resources/alfresco/module/${project.artifactId}/log4j.properties</source>
+            <source>src/main/resources/alfresco/module/${project.artifactId}/log4j2.properties</source>
             <filtered>false</filtered>
         </file>
     </files>

archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM ${docker.share.image}:${alfresco.share.version}
+FROM ${docker.share.image}:${alfresco.share.docker.version}
 
 ARG TOMCAT_DIR=/usr/local/tomcat
 
@@ -12,5 +12,5 @@ RUN java -jar $TOMCAT_DIR/alfresco-mmt/alfresco-mmt*.jar install \
 
 COPY share-config-custom.xml $TOMCAT_DIR/shared/classes/alfresco/web-extension
 
-COPY log4j.properties $TOMCAT_DIR/webapps/share/WEB-INF/classes
-COPY hotswap-agent.properties $TOMCAT_DIR/webapps/share/WEB-INF/classes
+COPY log4j2.properties $TOMCAT_DIR/webapps/share/WEB-INF/classes
+COPY hotswap-agent.properties $TOMCAT_DIR/webapps/share/WEB-INF/classes

archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/docker/log4j.properties

@@ -1,57 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-# Set root logger level to error
-log4j.rootLogger=error, Console, File
-
-# Console appender definition #
-
-# All outputs currently set to be a ConsoleAppender.
-log4j.appender.Console=org.apache.log4j.ConsoleAppender
-log4j.appender.Console.layout=org.apache.log4j.PatternLayout
-
-# use log4j NDC to replace %x with tenant domain / username
-log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n
-#log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
-
-# File appender definition #
-log4j.appender.File=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.File.File=share.log
-log4j.appender.File.Append=true
-log4j.appender.File.DatePattern='.'yyyy-MM-dd
-log4j.appender.File.layout=org.apache.log4j.PatternLayout
-log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %m%n
-
-# Spring
-log4j.logger.org.springframework=warn
-# Turn off Spring remoting warnings that should really be info or debug.
-log4j.logger.org.springframework.remoting.support=error
-log4j.logger.org.springframework.util=error
-
-# MyFaces
-log4j.logger.org.apache.myfaces.util.DebugUtils=info
-log4j.logger.org.apache.myfaces.el.VariableResolverImpl=error
-log4j.logger.org.apache.myfaces.application.jsp.JspViewHandlerImpl=error
-log4j.logger.org.apache.myfaces.taglib=error
-
-# Alfresco
-log4j.logger.org.alfresco=error
-log4j.logger.org.alfresco.config=warn
-log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn
-log4j.logger.org.alfresco.web=info
-
-# Web Framework
-log4j.logger.org.springframework.extensions.webscripts=info
-log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=warn
-log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off
-
-# Freemarker
-# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
-log4j.logger.freemarker.runtime=
-
-#-----------------------------------------------------------------------
-# Custom Share module logging goes here...
-#-----------------------------------------------------------------------
-
-
-

archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/docker/log4j2.properties

@@ -0,0 +1,124 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+# Set root logger level to error
+#log4j.rootLogger=error, Console, File
+rootLogger.level=error
+rootLogger.appenderRef.stdout.ref=ConsoleAppender
+rootLogger.appenderRef.rolling.ref=RollingAppender
+
+# Console appender definition #
+
+# All outputs currently set to be a ConsoleAppender.
+appender.console.type=Console
+appender.console.name=ConsoleAppender
+appender.console.layout.type=PatternLayout
+
+# use log4j NDC to replace %x with tenant domain / username
+appender.console.layout.pattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %replace{%m}{[\r\n]+}{}%n
+
+# File appender definition #
+appender.rolling.type=RollingFile
+appender.rolling.name=RollingAppender
+appender.rolling.fileName=alfresco.log
+appender.rolling.filePattern=alfresco.log.%d{yyyy-MM-dd}
+appender.rolling.layout.type=PatternLayout
+appender.rolling.layout.pattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %replace{%m}{[\r\n]+}{}%n
+appender.rolling.policies.type = Policies
+appender.rolling.policies.time.type = TimeBasedTriggeringPolicy
+appender.rolling.policies.time.interval = 1
+
+# Spring
+logger.springframework.name=org.springframework
+logger.springframework.level=warn
+
+# Turn off Spring remoting warnings that should really be info or debug.
+logger.springframework-remoting-support.name=org.springframework.remoting.support
+logger.springframework-remoting-support.level=error
+
+logger.springframework-util.name=org.springframework.util
+logger.springframework-util.level=error
+
+# MyFaces
+logger.apache-myfaces-util-DebugUtils.name=org.apache.myfaces.util.DebugUtils
+logger.apache-myfaces-util-DebugUtils.level=info
+
+logger.apache-myfaces-el-VariableResolverImpl.name=org.apache.myfaces.el.VariableResolverImpl
+logger.apache-myfaces-el-VariableResolverImpl.level=error
+
+logger.apache-myfaces-application-jsp-JspViewHandlerImpl.name=org.apache.myfaces.application.jsp.JspViewHandlerImpl
+logger.apache-myfaces-application-jsp-JspViewHandlerImpl.level=error
+
+logger.apache-myfaces-taglib.name=org.apache.myfaces.taglib
+logger.apache-myfaces-taglib.level=error
+
+# Alfresco
+logger.alfresco.name=org.alfresco
+logger.alfresco.level=error
+
+logger.alfresco-repo-admin.name=org.alfresco.repo.admin
+logger.alfresco-repo-admin.level=info
+
+logger.alfresco-repo-transaction.name=org.alfresco.repo.transaction
+logger.alfresco-repo-transaction.level=warn
+
+logger.alfresco-repo-cache-TransactionalCache.name=org.alfresco.repo.cache.TransactionalCache
+logger.alfresco-repo-cache-TransactionalCache.level=warn
+
+logger.alfresco-repo-model-filefolder.name=org.alfresco.repo.model.filefolder
+logger.alfresco-repo-model-filefolder.level=warn
+
+logger.alfresco-repo-tenant.name=org.alfresco.repo.tenant
+logger.alfresco-repo-tenant.level=info
+
+logger.alfresco-config.name=org.alfresco.config
+logger.alfresco-config.level=warn
+
+logger.alfresco-config-JndiObjectFactoryBean.name=org.alfresco.config.JndiObjectFactoryBean
+logger.alfresco-config-JndiObjectFactoryBean.level=warn
+
+logger.alfresco-config-JBossEnabledWebApplicationContext.name=org.alfresco.config.JBossEnabledWebApplicationContext
+logger.alfresco-config-JBossEnabledWebApplicationContext.level=warn
+
+logger.alfresco-repo-management-subsystems.name=org.alfresco.repo.management.subsystems
+logger.alfresco-repo-management-subsystems.level=warn
+
+logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory.name=org.alfresco.repo.management.subsystems.ChildApplicationContextFactory
+logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory.level=info
+
+logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory$ChildApplicationContext.name=org.alfresco.repo.management.subsystems.ChildApplicationContextFactory$ChildApplicationContext
+logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory$ChildApplicationContext.level=warn
+
+logger.alfresco-repo-security-sync.name=org.alfresco.repo.security.sync
+logger.alfresco-repo-security-sync.level=info
+
+logger.alfresco-repo-security-person.name=org.alfresco.repo.security.person
+logger.alfresco-repo-security-person.level=info
+
+logger.alfresco-sample.name=org.alfresco.sample
+logger.alfresco-sample.level=info
+
+logger.alfresco-web.name=org.alfresco.web
+logger.alfresco-web.level=info
+
+# Web Framework
+logger.springframework-extensions-webscripts.name=org.springframework.extensions.webscripts
+logger.springframework-extensions-webscripts.level=info
+
+logger.springframework-extensions-webscripts-ScriptLogger.name=org.springframework.extensions.webscripts.ScriptLogger
+logger.springframework-extensions-webscripts-ScriptLogger.level=warn
+
+logger.springframework-extensions-webscripts-ScriptDebugger.name=org.springframework.extensions.webscripts.ScriptDebugger
+logger.springframework-extensions-webscripts-ScriptDebugger.level=off
+
+# Freemarker
+# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
+logger.runtime.name=freemarker.runtime
+logger.runtime.level=
+
+#-----------------------------------------------------------------------
+# Custom Share module logging goes here...
+#-----------------------------------------------------------------------
+
+
+

archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/docker/share-config-custom.xml

@@ -39,7 +39,7 @@
 
     <!--
         Disable CSRF completely for now
-        It seems Share has issues on 4.2.x with the embedded tomcat and CSRFPolicy
+        It seems Share has issues on 4.x with the embedded tomcat and CSRFPolicy
         -->
     <config evaluator="string-compare" condition="CSRFPolicy" replace="true">
         <filter/>
@@ -101,5 +101,13 @@
             </endpoint>
         </remote>
     </config>
+    <config evaluator="string-compare" condition="Users" replace="true">
+        <users>
+            <username-min-length>2</username-min-length>
+            <password-min-length>3</password-min-length>
+            <show-authorization-status>false</show-authorization-status>
+        </users>
+        <enable-external-users-panel>false</enable-external-users-panel>
+    </config>
 </alfresco-config>
 

archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/log4j.properties

@@ -1 +0,0 @@
-# Add here module-specific custom log4j.properties configuration

archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/log4j2.properties

@@ -0,0 +1 @@
+# Add here module-specific custom log4j2.properties configuration

archetypes/archetypes-it/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.alfresco.maven</groupId>
         <artifactId>alfresco-sdk-aggregator</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>4.12.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.1</version>
+            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -84,4 +84,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>

docs/README.md

@@ -1,11 +1,11 @@
 ---
-Title: Alfresco SDK 4.1
+Title: Alfresco SDK 4.11.0
 Added: v3.0.0
-Last reviewed: 2019-10-18
+Last reviewed: 2025-03-18
 ---
-# Alfresco SDK 4.1
+# Alfresco SDK 4
 
-Alfresco SDK 4.1 is a Maven based development kit that provides an easy to use approach to developing applications and extensions for Alfresco. With this 
+Alfresco SDK 4.x is a Maven based development kit that provides an easy to use approach to developing applications and extensions for Alfresco. With this 
 SDK you can develop, package, test, run, document and release your Alfresco extension project.
 
 For earlier releases of the Alfresco SDK, see the Previous versions of [http://docs.alfresco.com](http://docs.alfresco.com).
@@ -14,22 +14,22 @@ The Alfresco Software Development Kit (Alfresco SDK) is a fundamental tool provi
 the Alfresco Digital Business Platform. It is based on [Apache Maven](http://maven.apache.org/) and [Docker](https://www.docker.com/) and is compatible with 
 major IDEs. This enables Rapid Application Development (RAD) and Test Driven Development (TDD).
 
-Alfresco SDK 4.1 is released under [Apache License version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) and supports Alfresco Content Services both 
+Alfresco SDK 4.x is released under [Apache License version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) and supports Alfresco Content Services both 
 in Community Edition and Enterprise Edition. If you're an Enterprise customer, please check the [Alfresco SDK Support status](https://www.alfresco.com/alfresco-product-support-status) 
 for the version you're using. If your version is in Limited or Full Support and you need help, contact our Support team [http://support.alfresco.com](http://support.alfresco.com/).
 
-Alfresco SDK 4.1 is a minor update to the SDK and provides support for Alfresco 6.2.x.
+Alfresco SDK 4.11.0 is a minor update to the SDK and provides support for Alfresco 25.1.x.
 
 The 4.0 release takes advantage of Semantic Versioning ([SEMVER](http://semver.org/)), which means that this new release is not directly compatible with the 
 previous releases of the SDK.
 
-If you have existing projects that you wish to upgrade to SDK 4.1.x, the recommended approach is to generate a new project from our archetypes and move your 
+If you have existing projects that you wish to upgrade to SDK 4.x, the recommended approach is to generate a new project from our archetypes and move your 
 code into place.
 
 ## Documentation Content
 
 * [What's new?](whats-new.md)
-* [Getting started with Alfresco SDK 4.1](getting-started.md)
+* [Getting started with Alfresco SDK 4](getting-started.md)
 * [Alfresco SDK Maven archetypes](mvn-archetypes.md)
 * [Working with generated projects](working-with-generated-projects/README.md)
     * [All-In-One project structure](working-with-generated-projects/structure-aio.md)
@@ -55,4 +55,4 @@ code into place.
         * [How to configure and use JRebel](advanced-topics/hot-reloading/jrebel.md)
         * [How to configure and use Hotswap Agent](advanced-topics/hot-reloading/hotswap-agent.md)
     * [Switching Alfresco Content Services database](advanced-topics/switching-dbs.md)
-* [Troubleshooting](troubleshooting.md)
+* [Troubleshooting](troubleshooting.md)

docs/advanced-topics/README.md

@@ -1,7 +1,7 @@
 ---
 Title: Advanced topics
 Added: v3.0.0
-Last reviewed: 2019-10-18
+Last reviewed: 2021-02-09
 ---
 # Advanced topics
 

docs/advanced-topics/amps.md

@@ -1,11 +1,11 @@
 ---
 Title: Working with AMPs
 Added: v3.0.0
-Last reviewed: 2019-10-18
+Last reviewed: 2021-02-09
 ---
 # Working with AMPs
 
-Since the early days of the Alfresco SDK, the Alfresco Module Packages (AMP) have been the way customizations were packaged. In Alfresco SDK 4.1 everything 
+Since the early days of the Alfresco SDK, the Alfresco Module Packages (AMP) have been the way customizations were packaged. In Alfresco SDK 4.x everything 
 is packaged as a JAR by default, while the AMPs are still available as an optional assembly. This gives you much more control over packaging, and simple 
 modules can easily be deployed as JARs.
 
@@ -55,7 +55,7 @@ to your needs.
 
 ## Installing AMPs with the SDK
 
-The projects created from the Alfresco SDK 4.1 archetypes are configured to deploy either JARs or AMPs to the ACS / Share docker container. The only thing to
+The projects created from the Alfresco SDK 4.x archetypes are configured to deploy either JARs or AMPs to the ACS / Share docker container. The only thing to
 do is modify the `pom.xml` file of the corresponding docker module / project in order to properly configure the dependencies and the Maven dependency plugin.
 
 ### All-In-One project
@@ -169,10 +169,75 @@ Here is an example of how to install Florian Maul's Javascript Console.
 </project>
 ```
 
+Another option for installing 3rd party AMPs to the projects is to have the amps local to the project. In this approach the amp file, the amp local to the project will be copied and applied from the Docker file. To use local amp you need to:
+    1. Modify the <project>-platform-docker/pom.xml
+    2. Create directory: <project>-platform-docker/src/main/docker/extensions
+    3. Copy the amp file into <project>-platform-docker/src/main/docker/extensions
+
+The project Dockerfile contains directives to apply amp to Alfresco image  
+
+
+in the build element of ./workshop-sdk4-platform-docker/pom.xml,
+exclude *.amp in the copy-and-filter-docker-resources execution step:
+```
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-and-filter-docker-resources</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/docker</directory>
+                                    <filtering>true</filtering>
+                                    <excludes>
+                                        <exclude>**/*.jar</exclude>
+                                        <exclude>**/*.so</exclude>
+                                        <exclude>**/*.gz</exclude>
+                                        <exclude>**/*.amp</exclude>            
+                                    </excludes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+```
+
+include *.amp in the copy-and-filter-docker-resources-non-filtered
+
+```
+                    <execution>
+                        <id>copy-and-filter-docker-resources-non-filtered</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/docker</directory>
+                                    <filtering>false</filtering>
+                                    <includes>
+                                        <include>**/*.jar</include>
+                                        <include>**/*.so</include>
+                                        <include>**/*.gz</include>
+                                        <include>**/*.amp</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+```
+
+
 ## Controlling the order AMPs are applied
 
 Under some specific circumstances it is necessary to apply different AMPs in a development project in a precise order. The default configuration of the 
-projects generated using the Alfresco SDK 4.1 archetypes doesn't specify any concrete order applying the AMPs to the ACS/Share installation.
+projects generated using the Alfresco SDK 4.x archetypes doesn't specify any concrete order applying the AMPs to the ACS/Share installation.
 
 Anyway, that order can be controlled modifying slightly the configuration of the custom Docker images in the project. For instance, let's say we have three
 third party AMPs that we want to apply in the next order `third-party-amp-01.amp -> third-party-amp-02.amp -> third-party-amp-03.amp`. In this example, we're

docs/advanced-topics/debugging/README.md

@@ -1,7 +1,7 @@
 ---
 Title: Debugging
 Added: v3.0.0
-Last reviewed: 2019-10-18
+Last reviewed: 2021-02-09
 ---
 # Debugging
 
@@ -10,4 +10,4 @@ application server. This section outlines the steps needed to configure Alfresco
 and to troubleshoot issues by stepping through the code line by line.
 
 Here we assume you have already generated an Alfresco project using the Alfresco SDK. If you don't have a project already, follow the steps in 
-[Getting started with Alfresco SDK 4.1](../../getting-started.md) to learn how to generate it in a few easy steps.
+[Getting started with Alfresco SDK 4](../../getting-started.md) to learn how to generate it in a few easy steps.

docs/advanced-topics/debugging/debug-eclipse.md

@@ -1,11 +1,11 @@
 ---
 Title: Remote debugging using Eclipse
 Added: v3.0.0
-Last reviewed: 2019-10-18
+Last reviewed: 2021-02-09
 ---
 # Remote debugging using Eclipse
 
-All the projects generated using the Alfresco SDK 4.1 are pre-configured to listen for remote debug connections. Depending on the selected archetypes you'll 
+All the projects generated using the Alfresco SDK 4.x are pre-configured to listen for remote debug connections. Depending on the selected archetypes you'll 
 have a port for remotely debugging ACS, share or both of them.
 
 By default, the remote debug port for ACS is **8888** and for share is **9898**. This configuration can be changed through the maven properties `acs.debug.port` 
@@ -79,7 +79,7 @@ application. In our case, we are going to test the behaviour of debugging by run
 
 8. Open your browser and type `http://localhost:8080/alfresco/s/sample/helloworld`.
 
-This is a sample webscript generated in every project created using SDK 4.1 and the platform artifact.
+This is a sample webscript generated in every project created using SDK 4.x and the platform artifact.
 
 ![Alt text](../../docassets/images/sdk-hellofromjava.png "Hello World webscript original result")
 

docs/advanced-topics/debugging/debug-intellij.md

@@ -1,11 +1,11 @@
 ---
 Title: Remote debugging using IntelliJ
 Added: v3.0.0
-Last reviewed: 2019-10-18
+Last reviewed: 2021-02-09
 ---
 # Remote debugging using IntelliJ
 
-All the projects generated using the Alfresco SDK 4.1 are pre-configured to listen for remote debug connections. Depending on the selected archetypes you'll 
+All the projects generated using the Alfresco SDK 4.x are pre-configured to listen for remote debug connections. Depending on the selected archetypes you'll 
 have a port for remotely debugging ACS, share or both of them.
 
 By default, the remote debug port for ACS is **8888** and for share is **9898**. This configuration can be changed through the maven properties `acs.debug.port` 
@@ -77,7 +77,7 @@ application. In our case, we are going to test the behaviour of debugging by run
 
 7. Open your browser and type `http://localhost:8080/alfresco/s/sample/helloworld`.
 
-This is a sample webscript generated in every project created using SDK 4.1 and the platform artifact.
+This is a sample webscript generated in every project created using SDK 4.x and the platform artifact.
 
 ![Alt text](../../docassets/images/sdk-hellofromjava.png "Hello World webscript original result")
 

docs/advanced-topics/hot-reloading/hotswap-agent.md

@@ -1,14 +1,14 @@
 ---
 Title: How to configure and use Hotswap Agent
 Added: v3.0.0
-Last reviewed: 2019-10-18
+Last reviewed: 2021-02-09
 ---
 # How to configure and use Hotswap Agent
 
 [HotSwapAgent](http://hotswapagent.org/index.html) is the agent that enables you to do hot reloading. This allows you to modify the application code, and 
 view the changes without having to restart Alfresco Tomcat (or the ACS Docker container).
 
-A prerequisite for this tutorial is to have a project created with the Alfresco SDK 4.1, using the All-In-One archetype or the Platform JAR archetype. It's 
+A prerequisite for this tutorial is to have a project created with the Alfresco SDK 4, using the All-In-One archetype or the Platform JAR archetype. It's 
 worth noting that hot reloading is only supported on the platform, and not in Alfresco Share.
 
 As an alternative to the HotSwapAgent you can also try out JRebel. It has more features but isn't free.
@@ -112,7 +112,7 @@ For more information about HotSwapAgent configuration for Java 8, please check t
 Using Java 11 and HotSwapAgent, it isn't necessary to configure the java agent and the alternative JVM as in previous versions. Instead, it is required 
 to use an alternative pre-built JDK distribution. That JDK is based on OpenJDK and includes all the required modifications to run the HotSwapAgent properly.
 
-In the context of the Alfresco SDK 4.1, this change is an issue because the JDK installation is inherited from the [Alfresco java docker image](https://github.com/Alfresco/alfresco-docker-base-java). 
+In the context of the Alfresco SDK 4, this change is an issue because the JDK installation is inherited from the [Alfresco java docker image](https://github.com/Alfresco/alfresco-docker-base-java). 
 It is necessary to modify the project ACS docker image to change the default java installation of the container's OS to the one provided by HotSwapAgent.
 
 A way to implement the required modifications would be:
@@ -250,7 +250,7 @@ You'll recognize HotSwapAgent is working when you see similar log messages:
 
 2. Before making any changes, let's run the sample webscript by opening your browser and typing `http://localhost:8080/alfresco/s/sample/helloworld`.
 
-This is a sample webscript generated in every project created using SDK 4.1 and the platform artifact.
+This is a sample webscript generated in every project created using SDK 4.x and the platform artifact.
 
 ![Alt text](../../docassets/images/sdk-hellofromjava.png "Hello World webscript original result")
 

docs/advanced-topics/hot-reloading/jrebel.md

@@ -8,7 +8,7 @@ Last reviewed: 2019-10-18
 [JRebel](https://zeroturnaround.com/software/jrebel/) is the agent that enables you to do hot reloading. This allows you to modify the application code, 
 and view the changes without having to restart Alfresco Tomcat (or the ACS Docker container).
 
-A prerequisite to this tutorial is having an Alfresco project created with Alfresco SDK 4.1, using the All-In-One archetype, or the Platform JAR archetype. 
+A prerequisite to this tutorial is having an Alfresco project created with Alfresco SDK 4, using the All-In-One archetype, or the Platform JAR archetype. 
 It's worth noting that hot reloading is only supported on the platform, and not in Alfresco Share.
 
 An open source and free of charge alternative to JRebel is HotSwapAgent. For more details, see the [HotSwapAgent website](http://hotswapagent.org/index.html).

docs/advanced-topics/integration-testing/README.md

@@ -1,7 +1,7 @@
 ---
 Title: Integration testing
 Added: v3.0.0
-Last reviewed: 2019-10-18
+Last reviewed: 2021-02-09
 ---
 # Integration testing
 
@@ -11,11 +11,11 @@ in an integration test plan to those aggregates, and delivers as its output the
 
 Even if the definition of integration testing is a general description, the concept is also valid for Alfresco projects. 
 
-The Alfresco SDK 4.1 keeps the same general idea of integration testing provided by SDK 3.0, but this new version reshapes it slightly to leverage on a 
+The Alfresco SDK 4.x keeps the same general idea of integration testing provided by SDK 3.0, but this new version reshapes it slightly to leverage on a 
 Docker-oriented environment.
 
 Here are the basics to understanding and using integration testing in the context of projects created with the SDK, from a technical perspective:
-* SDK 4.1 develops integration tests for the platform only. Currently, the integration tests that the SDK is able to manage by default is related to 
+* SDK 4.x develops integration tests for the platform only. Currently, the integration tests that the SDK is able to manage by default is related to 
 Alfresco Content Services (ACS) only.
 * Integration tests require an ACS instance to be up and running. You will see that all the scripts and commands are designed to easily manage this 
 requirement, but the prerequisite for the SDK is that an ACS instance is available.

docs/advanced-topics/integration-testing/it-running.md

@@ -1,11 +1,11 @@
 ---
 Title: How to run SDK's integration tests
 Added: v3.0.0
-Last reviewed: 2019-10-18
+Last reviewed: 2021-02-09
 ---
 # How to run SDK's integration tests
 
-Running the integration tests of a project generated from the Alfresco SDK 4.1 archetypes is pretty easy. Let's distinguish different cases of executing the
+Running the integration tests of a project generated from the Alfresco SDK 4.x archetypes is pretty easy. Let's distinguish different cases of executing the
 integration tests. 
 
 ## Command line

docs/advanced-topics/integration-testing/it-working.md

@@ -36,7 +36,7 @@ or set the Java system property `acs.endpoint.path`.
 
 ## Integration tests configuration in the All-In-One project
 
-So, taking into account the previous section, let's see how the integration tests are configured in a project generated from the SDK 4.1 All-In-One archetype.
+So, taking into account the previous section, let's see how the integration tests are configured in a project generated from the SDK 4.x All-In-One archetype.
 
 * The maven dependencies required to execute the integration tests are deployed to the ACS Docker image in the `PROJECT_ARTEFACTID-platform-docker` maven 
 module using the `maven-dependency-plugin`. The configuration is done in the file `PROJECT_ARTEFACTID-platform-docker/pom.xml`: 

docs/advanced-topics/switching-dbs.md

@@ -5,7 +5,7 @@ Last reviewed: 2019-10-18
 ---
 # Switching Alfresco Content Services database
 
-By default, the projects generated making use of the archetypes provided by the Alfresco SDK 4 are pre-configured to work with a specific database, which is 
+By default, the projects generated making use of the archetypes provided by the Alfresco SDK 4.x are pre-configured to work with a specific database, which is 
 PostgreSQL. 
 
 Anyway, ACS is developed and tested to [support a wide range of platforms and languages](https://www.alfresco.com/services/subscription/supported-platforms). 

docs/advanced-topics/switching-versions.md

@@ -1,22 +1,22 @@
 ---
 Title: Switching Alfresco Content Services and Share versions
 Added: v3.0.0
-Last reviewed: 2019-10-18
+Last reviewed: 2021-02-09
 ---
 # Switching Alfresco Content Services and Share versions
 
 The latest version of the Alfresco SDK supports different versions for Alfresco Content Services and Alfresco Share. Since each product is no longer 
 released under one common version number, ACS (i.e. alfresco.war) and the Share UI (share.war) are now released with individual version numbers.
 
-By default, SDK 4 is configured to generate projects using the most recent version of ACS and Share. You can easily change one (or both) versions by 
+By default, SDK 4.x is configured to generate projects using the most recent version of ACS and Share. You can easily change one (or both) versions by 
 simply updating the `pom.xml` file in your project. The compatibility of these versions is up to you, however you should check in advance the right versions 
 to use.
 
 When editing `pom.xml` you will see a number of properties that define the Alfresco Content Services platform version and the Alfresco Share version, such as:
 
 ```
-<alfresco.platform.version>6.1.2-ga</alfresco.platform.version>
-<alfresco.share.version>6.1.0-RC3</alfresco.share.version>
+<alfresco.platform.version>7.0.0-A20</alfresco.platform.version>
+<alfresco.share.version>7.0.0-M3</alfresco.share.version>
 ```
 
 Before continuing, always remember to start from a newly generated SDK project before changing the version numbers. We do not recommend changing the versions 
@@ -28,7 +28,7 @@ The supported versions are explained in the next sections of this article.
 
 ## Switch to Alfresco version 6.0.x
 
-Starting from a newly created Alfresco SDK 4.1 project (All-In-One, Platform JAR, or Share JAR), let’s replace the two properties with the following ones.
+Starting from a newly created Alfresco SDK 4.x project (All-In-One, Platform JAR, or Share JAR), let’s replace the two properties with the following ones.
 
 1. Open the pom.xml in your generated project.
 
@@ -58,9 +58,9 @@ $ ./run.sh build_start
 switch from version 6.1+ to 6.0.x. If you compile Alfresco 6.0.x with JDK 11 you'll experience the issue described in the [Troubleshooting page](../troubleshooting.md) 
 about wrong JDK versions.
 
-## Switch to Alfresco version 6.1.x
+## Switch to Alfresco version 6.1.x or 6.2.x
 
-Starting from a newly created Alfresco SDK 4.1 project (All-In-One, Platform JAR, or Share JAR), let’s replace the two properties with the following ones.
+Starting from a newly created Alfresco SDK 4.x project (All-In-One, Platform JAR, or Share JAR), let’s replace the two properties with the following ones.
 
 1. Open the pom.xml in your generated project.
 

docs/advanced-topics/upgrading.md

@@ -3,13 +3,13 @@ Title: Upgrading
 Added: v4.0.0
 Last reviewed: 2019-01-29
 ---
-# Upgrading an SDK 3.0 project to SDK 4.1
+# Upgrading an SDK 3.0 project to SDK 4
 
-In these instructions, "base" refers to a freshly instantiated SDK 4.1 and "target" refers to the SDK 3.0.1 project that is being upgraded.
+In these instructions, "base" refers to a freshly instantiated SDK 4.x and "target" refers to the SDK 3.0.1 project that is being upgraded.
 
 ## Download a base
 
-Download or instantiate an SDK 4.1 project to use as a base for copying files.
+Download or instantiate an SDK 4.x project to use as a base for copying files.
 
 For example, you might create a new project called `test-aio-400` to use as a base from which to copy files into the target project that is to be upgraded.
 
@@ -65,7 +65,7 @@ Similar to previous step, the directory should follow the same pattern as the ex
 
 Need to smartly do this merge so that target project maintains its dependencies, name, version, description, etc.
 
-1. Copy the entire `<properties>` element from the base 4.1 pom.xml into the target 3.0 pom.xml, replacing the existing one completely.
+1. Copy the entire `<properties>` element from the base 4.x pom.xml into the target 3.0 pom.xml, replacing the existing one completely.
 
 2. Change the `acs.host` property to match the target project name.
 
@@ -220,7 +220,7 @@ Then that would need to be moved into the share docker module's pom.xml file in
 
 ## Changes to the integration-tests module
 
-1. Completely replace the pom.xml file with the pom.xml file from the 4.1 pom.xml file under integration-tests.
+1. Completely replace the pom.xml file with the pom.xml file from the 4.x pom.xml file under integration-tests.
 
 2. Edit the integration-tests pom.xml to replace references to the base project name with references to the target project name.
 
@@ -230,7 +230,7 @@ Then that would need to be moved into the share docker module's pom.xml file in
 
 ## Changes to the platform-jar module
 
-Smartly merge the pom.xml file from the 4.1 platform-jar module into the existing platform-jar module pom.xml file.
+Smartly merge the pom.xml file from the 4.x platform-jar module into the existing platform-jar module pom.xml file.
 
 Maintain the dependencies from the 3.0 platform-jar module pom.xml.
 
@@ -238,13 +238,13 @@ Any old "platformModule" dependencies, which are typically AMPs or JARs that nee
 
 ## Changes to the share-jar module
 
-Smartly merge the pom.xml file from the 4.1 share-jar module into the existing share-jar module pom.xml file.
+Smartly merge the pom.xml file from the 4.x share-jar module into the existing share-jar module pom.xml file.
 
 Maintain the dependencies from the 3.0 share-jar module pom.xml.
 
 Any old "shareModule" dependencies, which are typically AMPs or JARs that need to be installed in the Share tier need to be copied into this pom.xml's depdencies.
 
-Remove the spring-surf-api dependency from the 4.1 share-jar module. Remove:
+Remove the spring-surf-api dependency from the 4.x share-jar module. Remove:
 
 ```
 <dependency>

docs/advanced-topics/working-with-enterprise/README.md

@@ -35,10 +35,32 @@ You'll need to update the following settings in the `pom.xml` file:
 <alfresco.bomDependencyArtifactId>acs-packaging</alfresco.bomDependencyArtifactId>
 ```
 
-* Change the Docker ACS image name:
+* Change the Docker ACS image name (by also prepending the Enterprise Docker Registry, Quay.io):
 
 ```
-<docker.acs.image>alfresco/alfresco-content-repository</docker.acs.image>
+<docker.acs.image>quay.io/alfresco/alfresco-content-repository</docker.acs.image>
+```
+
+In case the desired Platform version is 6.x, you'll also need to deal with the Keystore settings, by either:
+
+* Removing the keystore settings:
+
+```
+<keystore.settings></keystore.settings>
+```
+
+or
+
+* Adding the Keystore creation to the existing Dockerfile:
+
+```
+#Add Keystore
+ARG CERT_DNAME="CN=Alfresco Repository, OU=Unknown, O=Alfresco Software Ltd., L=Maidenhead, ST=UK, C=GB"
+ARG CERT_VALIDITY=36525
+ARG KEYSTORE_PASSWORD=mp6yc0UD9e
+ARG KEYSTORE_METADATA_PASSWORD=oKIWzVdEdA
+RUN mkdir -p $TOMCAT_DIR/shared/classes/alfresco/extension/keystore
+RUN keytool -genseckey -dname "$CERT_DNAME" -validity ${CERT_VALIDITY} -alias metadata -keypass ${KEYSTORE_METADATA_PASSWORD} -keyalg AES -keysize 256 -keystore ${TOMCAT_DIR}/shared/classes/alfresco/extension/keystore/keystore -storetype JCEKS -storepass ${KEYSTORE_PASSWORD}
 ```
 
 Changing these parameters instructs the project to use the proper maven dependencies and Docker images.
@@ -58,7 +80,7 @@ You'll need to update the following settings in the `pom.xml` file:
 <alfresco.share.version>6.2.0</alfresco.share.version>
 ```
 
-Making use of the Alfresco SDK 4 it is no longer required the configuration of the Alfresco Surf versions. The inclusion of the BOM and the custom Docker
+Making use of the Alfresco SDK 4.x it is no longer required the configuration of the Alfresco Surf versions. The inclusion of the BOM and the custom Docker
 images will take care of that task automatically for you.
 
 ## Purging the project data and running the project

docs/getting-started.md

@@ -1,15 +1,15 @@
 ---
-Title: Getting started with Alfresco SDK 4.1
+Title: Getting started with Alfresco SDK 4.x
 Added: v2.1.1
-Last reviewed: 2019-10-18
+Last reviewed: 2021-09-30
 ---
-# Getting started with Alfresco SDK 4.1
+# Getting started with Alfresco SDK 4.x
 
-Use these instructions to get started with using Alfresco SDK 4.1.
+Use these instructions to get started with using Alfresco SDK 4.x.
 
 ## Prerequisites
    
-There are a number of software requirements for using Alfresco SDK 4.1.
+There are a number of software requirements for using Alfresco SDK 4.x.
 * Java Development Kit (JDK) - Version 11
 * Maven - Version 3.3
 * Docker - Latest stable version
@@ -46,7 +46,7 @@ JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-11.0.1.jdk/Contents/Home
 Alfresco recommends that you keep up-to-date with all the Maven releases. Linux distributions and package managers tend to bundle older releases and this is 
 the most common pitfall.
 
-Alfresco SDK 4.1 requires Maven 3.3.0+, but you are recommended to download the latest version.
+Alfresco SDK 4.x requires Maven 3.3.0+, but you are recommended to download the latest version.
 
 1. Download and install [Apache Maven](https://maven.apache.org/download.cgi) and make sure it is configured correctly on your path.
 
@@ -82,8 +82,8 @@ install it separately after you've installed Docker.
 4. Verify the installation of Docker Compose.
 
 ```
-$ docker-compose -v
-docker-compose version 1.22.0, build f46880f
+$ docker compose version
+Docker Compose version v2.28.1-desktop.1
 ```
 
 ## Generate your project from the archetypes
@@ -95,7 +95,7 @@ mvn archetype:generate -Dfilter=org.alfresco:
 ```
 
 You'll be prompted to select the archetype you want. The previously available archetypes, alfresco-amp-archetype and share-amp-archetype will still show up 
-as an option, however these archetypes are not part of Alfresco SDK 4.1.
+as an option, however these archetypes are not part of Alfresco SDK 4.x.
 
 Attention: You'll need double quotes around the filter part if you are using Windows Powershell: mvn archetype:generate "-Dfilter=org.alfresco:".
 
@@ -118,7 +118,7 @@ Choose archetype:
 * `org.alfresco.maven.archetype:alfresco-platform-jar-archetype`
 * `org.alfresco.maven.archetype:alfresco-share-jar-archetype`
 
-3. Choose the latest version, such as 4.1.0.
+3. Choose the latest version, such as 4.11.0.
 
 ```
 Choose org.alfresco.maven.archetype:alfresco-allinone-archetype version:
@@ -132,8 +132,20 @@ Choose org.alfresco.maven.archetype:alfresco-allinone-archetype version:
 8: 2.2.0
 9: 3.0.0
 10: 3.0.1
-11: 4.0.0
-12: 4.1.0
+11: 3.1.0
+12: 4.0.0-beta-1
+13: 4.0.0
+14: 4.1.0
+15: 4.2.0
+16: 4.3.0
+17: 4.4.0
+18: 4.5.0
+19: 4.6.0
+20: 4.7.0
+21: 4.8.0
+22: 4.9.0
+23: 4.10.0
+24: 4.11.0
 ```
 
 4. Next you will be prompted for additional values, like groupId, artifactId, and package, as shown below:
@@ -162,7 +174,7 @@ If everything has been configured correctly, you should see something similar to
 
 ```
 [INFO] ----------------------------------------------------------------------------
-[INFO] Using following parameters for creating project from Archetype: alfresco-allinone-archetype:4.1.0-SNAPSHOT
+[INFO] Using following parameters for creating project from Archetype: alfresco-allinone-archetype:4.11.0
 [INFO] ----------------------------------------------------------------------------
 [INFO] Parameter: groupId, Value: com.acme
 [INFO] Parameter: artifactId, Value: my-all-in-one
@@ -189,7 +201,7 @@ If everything has been configured correctly, you should see something similar to
 [INFO] ------------------------------------------------------------------------
 ```
 
-7. You have successfully generated your first SDK 4.1 project.
+7. You have successfully generated your first SDK 4.x project.
 
 Inside the project, you will find the `run.bat` and `run.sh` scripts. These are convenience scripts for you to quickly compile / test / run your project.
 
@@ -200,4 +212,4 @@ In the terminal window, use:
 If this is the first time you are doing this, it will take a while for Maven to download all the required dependencies and for Docker to download all the
 required images.
 
-For more information about how to work with the projects, please visit [Working with generated projects](working-with-generated-projects/README.md).
+For more information about how to work with the projects, please visit [Working with generated projects](working-with-generated-projects/README.md).

docs/mvn-archetypes.md

@@ -1,21 +1,21 @@
 ---
 Title: Alfresco SDK Maven archetypes
 Added: v2.1.1
-Last reviewed: 2019-10-18
+Last reviewed: 2021-02-09
 ---
 # Alfresco SDK Maven archetypes
 
-The Alfresco SDK 4.1 comes with a number of Maven archetypes that can be used to generate Alfresco extension projects.
+The Alfresco SDK 4.x comes with a number of Maven archetypes that can be used to generate Alfresco extension projects.
 
-For more details, see [Getting started with Alfresco SDK 4.1](getting-started.md).
+For more details, see [Getting started with Alfresco SDK 4](getting-started.md).
 
 These archetypes are available during the creation of a brand new project. In short, a [Maven archetype](https://maven.apache.org/guides/introduction/introduction-to-archetypes.html) 
 is a project templating toolkit. It's defined as an original pattern or model from which all other things of the same kind are made. Using archetypes 
 provides a great way to enable developers to quickly follow best practice in a consistent way. This is valid for every project built with Apache Maven and 
-it's valid in particular when using Alfresco SDK 4.1.
+it's valid in particular when using Alfresco SDK 4.
 
-In this section we are going to introduce all the available archetypes in Alfresco SDK 4.1, with a brief description of their purpose and main use. 
-After reading this information, you should be able to understand the various possibilities that Alfresco SDK 4.1 can offer to developers, in terms of 
+In this section we are going to introduce all the available archetypes in Alfresco SDK 4, with a brief description of their purpose and main use. 
+After reading this information, you should be able to understand the various possibilities that Alfresco SDK 4.x can offer to developers, in terms of 
 projects.
 
 When generating your project, you'll be prompted to select the Maven archetype you want to use through an interactive menu, similar to what you can see below.

docs/setting-up-your-development-environment/dev-env-eclipse.md

@@ -1,7 +1,7 @@
 ---
 Title: Setting up your development environment using Eclipse
 Added: v3.0.0
-Last reviewed: 2019-10-18
+Last reviewed: 2021-02-09
 ---
 # Setting up your development environment using Eclipse
 
@@ -9,7 +9,7 @@ The Maven Alfresco SDK is designed to work well with Eclipse. This support inclu
 Alfresco SDK.
 
 Here we assume you already have an Eclipse installation up and running, together with an available Alfresco project created using the Alfresco SDK. If you 
-don't have a project already, follow the steps in [Getting started with Alfresco SDK 4.1](../getting-started.md) to learn how to quickly generate it in a few 
+don't have a project already, follow the steps in [Getting started with Alfresco SDK 4.x](../getting-started.md) to learn how to quickly generate it in a few 
 easy steps.
 
 ## Importing the Alfresco project into Eclipse

docs/setting-up-your-development-environment/dev-env-intellij.md

@@ -1,7 +1,7 @@
 ---
 Title: Setting up your development environment using Intellij IDEA
 Added: v3.0.0
-Last reviewed: 2019-10-18
+Last reviewed: 2021-02-09
 ---
 # Setting up your development environment using Intellij IDEA
 
@@ -9,7 +9,7 @@ The Maven Alfresco SDK is designed to work well with Eclipse. This support inclu
 Alfresco SDK.
 
 Here we assume you already have an Eclipse installation up and running, together with an available Alfresco project created using the Alfresco SDK. If you 
-don't have a project already, follow the steps in [Getting started with Alfresco SDK 4.1](../getting-started.md) to learn how to quickly generate it in a few 
+don't have a project already, follow the steps in [Getting started with Alfresco SDK 4.x](../getting-started.md) to learn how to quickly generate it in a few 
 easy steps.
 
 ## Importing the Alfresco project into Intellij IDEA

docs/troubleshooting.md

@@ -1,11 +1,11 @@
 ---
 Title: Troubleshooting
 Added: v3.0.0
-Last reviewed: 2019-10-18
+Last reviewed: 2021-02-09
 ---
 # Troubleshooting
 
-This article describes a list of common issues with the projects generated from the Alfresco SDK 4.1 archetypes and the way to troubleshoot them.
+This article describes a list of common issues with the projects generated from the Alfresco SDK 4.x archetypes and the way to troubleshoot them.
 
 * [Incorrect JDK version](#incorrect-jdk-version)
 * [Containers synchronization](#containers-synchronization)
@@ -157,7 +157,7 @@ Transformation Service (ATS) is not working. ATS is required to generate the con
 
 ### Solution
 
-By default, ATS is not included in the basic configuration of the projects generated making use of the Alfresco SDK 4 archetypes.
+By default, ATS is not included in the basic configuration of the projects generated making use of the Alfresco SDK 4.x archetypes.
 
 To enable it, you simply need to follow the steps described in the article [How to set up Alfresco Transform Service](advanced-topics/alfresco-transform-service.md).
 If you're working with Alfresco Enterprise you must follow [this guide](advanced-topics/working-with-enterprise/alfresco-transform-service.md). 

docs/whats-new.md

@@ -1,14 +1,17 @@
 ---
 Title: What's new?
 Added: v2.1.1
-Last reviewed: 2019-10-18
+Last reviewed: 2021-02-09
 ---
 # What's new?
 
-Alfresco SDK 4.0 brings some changes oriented to assist the way the customizations are built, packaged, run and tested for Alfresco Content Services 6 and 
+Alfresco SDK 4.0 brought some changes oriented to assist the way the customizations are built, packaged, run and tested for Alfresco Content Services 6 and 
 Alfresco Share 6.
 
-This is a mayor release oriented to support Alfresco 6, so it is not compatible with previous versions of the SDK.
+This was a mayor release oriented to support Alfresco 6, so it is not compatible with previous versions of the SDK.
+
+Alfresco SDK 4.11.0 extends the support to Alfresco 25.1. 
+Use an older SDK version for Alfresco 6. 
 
 ## Embracing containers and Docker
 
@@ -60,3 +63,14 @@ environment can be more similar to a real one, including whatever other service
 ## Support for Alfresco 6.2.x
 
 Alfresco SDK 4.1 provides support for Alfresco 6.2.x.
+
+## Support for Alfresco 7.0.x, 7.1.x, 7.2.x, 7.3.x, 7.4.x. 23.1.x, 23.2.x, 23.3.x, 23.4.x and 25.1.x
+
+Alfresco SDK 4.11.0 provides support for Alfresco 7.0.x, 7.1.x, 7.2.x, 7.3.x, 7.4.x, 23.1.x, 23.2.x, 23.3.x, 23.4.x and 25.1.x
+
+## Support for Java 17
+[Java 17](https://openjdk.java.net/projects/jdk/17/) is the latest stable long term (8 year support) version after Java 11. Alfresco 7.3.x already offers
+support for this version of the Java platform.
+
+Alfresco SDK 4.9 has been modified to add support for Java 17 as well. This way, if you're working as a developer in customisations for Alfresco 7.3.x or 7.4.x , 23.1.x, 23.2.x, 23.3.x or 23.4.x you can
+now use SDK 4.9 (or greater) + JDK 17 to work on them. The Apache Maven plugins included in the archetypes has been updated to avoid any issue with Java 17.

docs/working-with-generated-projects/README.md

@@ -1,14 +1,14 @@
 ---
 Title: Working with generated projects
 Added: v3.0.0
-Last reviewed: 2019-10-18
+Last reviewed: 2021-02-09
 ---
 # Working with generated projects
 
-After generating a project using one of the Alfresco SDK 4.1 Maven archetypes, it is important to know how to build / run / test these projects.
+After generating a project using one of the Alfresco SDK 4.x Maven archetypes, it is important to know how to build / run / test these projects.
 
 The Alfresco Platform 6 deployment architecture is highly based on container technologies, specifically in [Docker](http://docs.alfresco.com/6.0/concepts/master-deploy.html). 
-Due to that, the projects generated using the Alfresco SDK 4.1 archetypes set up their local environment making an intensive use of Docker and Docker compose 
+Due to that, the projects generated using the Alfresco SDK 4.x archetypes set up their local environment making an intensive use of Docker and Docker compose 
 technologies.
 
 If you're not familiar with these technologies, it is highly recommended visiting the [Docker documentation website](https://docs.docker.com). This site offers
@@ -21,7 +21,7 @@ a great quantity of training resources about [Docker](https://docs.docker.com/ge
 ## Project structures
 
 After generating your project, using one of the Maven archetypes, review the project structure. The directory structure and content of each folder and file 
-can help you to understand how to start developing with the Alfresco SDK 4.1. Before continuing, make sure that you have read and completed the tasks in the 
+can help you to understand how to start developing with the Alfresco SDK 4.x. Before continuing, make sure that you have read and completed the tasks in the 
 [Getting started](../getting-started.md) tutorial.
 
 The structure of the project and the purpose of the files it contains vary according to the [Maven archetype](../mvn-archetypes.md) used to generate the project 
@@ -33,7 +33,7 @@ itself. The following links provide detailed descriptions of the different proje
 
 ## Run script
 
-All the projects generated using the Alfresco SDK 4.1 archetypes provide a utility script to work with the project. This script is `run.sh` for Unix systems
+All the projects generated using the Alfresco SDK 4.x archetypes provide a utility script to work with the project. This script is `run.sh` for Unix systems
 and `run.bat` for Windows systems.
 
 The execution of this script must be followed by a parameter that dictates the task to be executed in the project. The list of available tasks is:

docs/working-with-generated-projects/structure-aio.md

@@ -41,7 +41,7 @@ my-all-in-one-project
 │       └── main
 │           └── docker
 │               ├── alfresco-global.properties
-│               ├── dev-log4j.properties
+│               ├── dev-log4j2.properties
 │               ├── disable-webscript-caching-context.xml
 │               ├── Dockerfile
 │               ├── hotswap-agent.properties
@@ -106,7 +106,7 @@ my-all-in-one-project
 │           └── docker
 │               ├── Dockerfile
 │               ├── hotswap-agent.properties
-│               ├── log4j.properties
+│               ├── log4j2.properties
 │               └── share-config-custom.xml
 └── my-all-in-one-project-share
     ├── pom.xml

docs/working-with-generated-projects/structure-platform.md

@@ -30,7 +30,7 @@ my-platform-jar-project
     │   ├── docker
     │   │   ├── Dockerfile
     │   │   ├── alfresco-global.properties
-    │   │   ├── dev-log4j.properties
+    │   │   ├── dev-log4j2.properties
     │   │   ├── disable-webscript-caching-context.xml
     │   │   ├── hotswap-agent.properties
     │   │   └── license
@@ -62,7 +62,7 @@ my-platform-jar-project
     │                   │   ├── bootstrap-context.xml
     │                   │   ├── service-context.xml
     │                   │   └── webscript-context.xml
-    │                   ├── log4j.properties
+    │                   ├── log4j2.properties
     │                   ├── messages
     │                   │   ├── content-model.properties
     │                   │   └── workflow-messages.properties

docs/working-with-generated-projects/structure-share.md

@@ -28,7 +28,7 @@ my-share-jar-project
     │   ├── docker
     │   │   ├── Dockerfile
     │   │   ├── hotswap-agent.properties
-    │   │   ├── log4j.properties
+    │   │   ├── log4j2.properties
     │   │   └── share-config-custom.xml
     │   ├── java
     │   │   └── com

docs/working-with-generated-projects/working-with-aio.md

@@ -1,15 +1,15 @@
 ---
 Title: Working with an All-In-One project
 Added: v4.0.0
-Last reviewed: 2019-10-18
+Last reviewed: 2021-02-09
 ---
 
 # Working with an All-In-One project
 
-Before you continue make sure that you have read and completed the tasks in the 
-[Getting started](../getting-started.md) tutorial to generate an All-In-One (AIO) project, 
-which means selecting the `org.alfresco.maven.archetype:alfresco-allinone-archetype` 
-Maven archetype when generating the project. The following information assumes that 
+Before you continue make sure that you have read and completed the tasks in the
+[Getting started](../getting-started.md) tutorial to generate an All-In-One (AIO) project,
+which means selecting the `org.alfresco.maven.archetype:alfresco-allinone-archetype`
+Maven archetype when generating the project. The following information assumes that
 the AIO project was generated with the name `my-all-in-one-project`.
 
 -   [Introduction](#introduction)
@@ -21,23 +21,23 @@ the AIO project was generated with the name `my-all-in-one-project`.
 -   [Stopping the project](#stopping-the-project)
 
 ## Introduction
-An AIO SDK project is used to build extensions for both [Alfresco Content Services (ACS) Repository](https://docs.alfresco.com/6.1/concepts/dev-platform-extensions.html) 
-and [Alfresco Share UI](https://docs.alfresco.com/6.1/concepts/dev-extensions-share.html). The runtime environment
-for ACS is Docker so not only is this project building the source code for your extensions but also the 
-custom Docker images for the Alfresco Repository and Alfresco Share. The custom Docker images includes the 
-JARs, or AMPs, with your extension code. 
+An AIO SDK project is used to build extensions for both [Alfresco Content Services (ACS) Repository](https://docs.alfresco.com/6.2/concepts/dev-platform-extensions.html)
+and [Alfresco Share UI](https://docs.alfresco.com/6.2/concepts/dev-extensions-share.html). The runtime environment
+for ACS is Docker so not only is this project building the source code for your extensions but also the
+custom Docker images for the Alfresco Repository and Alfresco Share. The custom Docker images includes the
+JARs, or AMPs, with your extension code.
 
-Looking into the generated AIO parent project we can see that we got a Docker Compose file (**my-all-in-one-project/docker/docker-compose.yml**) 
-that will be used to build custom Docker images and run the project, one sub-project called `my-all-in-one-project-platform` that will be 
+Looking into the generated AIO parent project we can see that we got a Docker Compose file (**my-all-in-one-project/docker/docker-compose.yml**)
+that will be used to build custom Docker images and run the project, one sub-project called `my-all-in-one-project-platform` that will be
 used to build Repository customizations, and one sub-project called `my-all-in-one-project-share` that can be used to build Alfresco Share UI customizations.
 
-There are also the `my-all-in-one-project-platform-docker` and `my-all-in-one-project-share-docker` projects that are 
-used to assemble (aggregate) all the Repository and Share extensions 
-(there are usually more than one of each in a bigger project) and then build the custom Docker images with the 
+There are also the `my-all-in-one-project-platform-docker` and `my-all-in-one-project-share-docker` projects that are
+used to assemble (aggregate) all the Repository and Share extensions
+(there are usually more than one of each in a bigger project) and then build the custom Docker images with the
 extension(s) applied.
 
-The Repository and Share extensions that are aggregated can either be extensions that you develop locally or extensions 
-that are available in a Maven repository somewhere. 
+The Repository and Share extensions that are aggregated can either be extensions that you develop locally or extensions
+that are available in a Maven repository somewhere.
 
 ## Configuration properties
 There are a number of properties that we can customise when we run the Alfresco SDK project.
@@ -47,8 +47,8 @@ The following table explains some of these properties:
 
 | Name | Type | Default value | Description |
 | ---- | ---- | ------------- | ----------- |
-| alfresco.platform.version | `string` | 6.1.2-ga | The version of the ACS Repository (i.e. alfresco.war) that the Repository Extension should be applied to. This also specifies the version of the ACS Repository Docker Image that the custom built Repository image should be based on. See **my-all-in-one-project-platform-docker/src/main/docker/Dockerfile** |
-| alfresco.share.version | `string` | 6.1.0-RC3 | The version of Alfresco Share (i.e. share.war) that the Share Extension should be applied to. This also specifies the version of the Alfresco Share Docker Image that the custom built Share image should be based on. See **my-all-in-one-project-share-docker/src/main/docker/Dockerfile**|
+| alfresco.platform.version | `string` | 7.0.0-A20 | The version of the ACS Repository (i.e. alfresco.war) that the Repository Extension should be applied to. This also specifies the version of the ACS Repository Docker Image that the custom built Repository image should be based on. See **my-all-in-one-project-platform-docker/src/main/docker/Dockerfile** |
+| alfresco.share.version | `string` | 7.0.0-M3 | The version of Alfresco Share (i.e. share.war) that the Share Extension should be applied to. This also specifies the version of the Alfresco Share Docker Image that the custom built Share image should be based on. See **my-all-in-one-project-share-docker/src/main/docker/Dockerfile**|
 | docker.acs.image | `string` | alfresco/alfresco-content-repository-community | The name of the ACS Repository Docker image in Docker Hub. This changes if you switch to Enterprise Edition.|
 | docker.share.image | `string` | alfresco/alfresco-share | The name of the Alfresco Share Docker image in Docker Hub. This changes if you switch to Enterprise Edition.|
 | share.port | `number` | 8180 | The external port (i.e. outside container) for the Alfresco Share webapp.|
@@ -62,12 +62,12 @@ When you first start out you don't need to change any of these properties, just
 
 ## Building and running the project
 The first thing you need to do before you can run anything is to build the custom ACS Docker images with the custom extensions.
-We can build images and extensions at the same time as we start (run) the project by using the `./run.sh build_start` script 
+We can build images and extensions at the same time as we start (run) the project by using the `./run.sh build_start` script
 (on Windows use the `run.bat build_start` script instead).
 
-Note that if you have another Alfresco SDK project running, then you need to stop it first. Also, make sure that the 
+Note that if you have another Alfresco SDK project running, then you need to stop it first. Also, make sure that the
 following ports are free: 8180 (Share), 8080 (Alfresco Repo), 9898 (Share Debug), 8888 (Alfresco Repo Debug), 5555 (Postgres).
-If you want to change the ports see the properties section of **my-all-in-one-project/pom.xml**. This project file also 
+If you want to change the ports see the properties section of **my-all-in-one-project/pom.xml**. This project file also
 contains the versions of Alfresco Repository and Alfresco Share that will be used.  
 
 ```
@@ -77,8 +77,8 @@ my-all-in-one-project mbergljung$ ./run.sh build_start
 [WARNING] The project com.example:my-all-in-one-project:pom:1.0-SNAPSHOT uses prerequisites which is only intended for maven-plugin projects but not for non maven-plugin projects. For such purposes you should use the maven-enforcer-plugin. See https://maven.apache.org/enforcer/enforcer-rules/requireMavenVersion.html
 [INFO] ------------------------------------------------------------------------
 [INFO] Reactor Build Order:
-[INFO] 
-[INFO] AIO - SDK 4.1
+[INFO]
+[INFO] AIO - SDK 4.11.0
 [INFO] Alfresco Platform/Repository JAR Module
 [INFO] Alfresco Share JAR Module
 [INFO] Integration Tests Module
@@ -87,8 +87,8 @@ my-all-in-one-project mbergljung$ ./run.sh build_start
 ...
 [INFO] ------------------------------------------------------------------------
 [INFO] Reactor Summary:
-[INFO] 
-[INFO] AIO - SDK 4.1 ...................................... SUCCESS [  0.680 s]
+[INFO]
+[INFO] AIO - SDK 4.11.0 ...................................... SUCCESS [  0.680 s]
 [INFO] Alfresco Platform/Repository JAR Module ............ SUCCESS [  5.461 s]
 [INFO] Alfresco Share JAR Module .......................... SUCCESS [  0.557 s]
 [INFO] Integration Tests Module ........................... SUCCESS [  0.900 s]
@@ -103,22 +103,22 @@ my-all-in-one-project-db-volume
 my-all-in-one-project-ass-volume
 ...
 Building my-all-in-one-project-share
-Step 1/8 : FROM alfresco/alfresco-share:6.1.0-RC3
+Step 1/8 : FROM alfresco/alfresco-share:7.0.0-M3
 ...
 Successfully tagged alfresco-share-my-all-in-one-project:development
 Building my-all-in-one-project-acs
-Step 1/9 : FROM alfresco/alfresco-content-repository-community:6.1.2-ga
+Step 1/9 : FROM alfresco/alfresco-content-repository-community:7.0.0-A20
 ...
 Successfully tagged alfresco-content-services-my-all-in-one-project:development
 ...
 my-all-in-one-project-acs_1       | 27-Mar-2019 06:53:39.191 INFO [main] org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler ["http-nio-8080"]
 my-all-in-one-project-acs_1       | 27-Mar-2019 06:53:39.233 INFO [main] org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler ["ajp-nio-8009"]
 my-all-in-one-project-acs_1       | 27-Mar-2019 06:53:39.249 INFO [main] org.apache.catalina.startup.Catalina.start Server startup in 84022 ms
-``` 
+```
 
 The `./run.sh build_start` script will do the following:
 
-* Stop anything running already with this project's Docker Compose file: **my-all-in-one-project/docker/docker-compose.yml** 
+* Stop anything running already with this project's Docker Compose file: **my-all-in-one-project/docker/docker-compose.yml**
 * Build the Repository and Share Extension JARs so we are sure to get the latest changes
 * Assemble/Aggregate all Repository extension JARs into the **my-all-in-one-project/my-all-in-one-project-platform-docker/target/extensions** directory
 * Assemble/Aggregate all Share extension JARs into the **my-all-in-one-project/my-all-in-one-project-share-docker/target/extensions** directory
@@ -128,12 +128,12 @@ The `./run.sh build_start` script will do the following:
 
 This will build the following two Docker images:
 
-``` 
+```
 $ docker image ls|more
 REPOSITORY                                                       TAG                                          IMAGE ID            CREATED             SIZE
 alfresco-content-services-my-all-in-one-project                  development                                  48e61e882567        16 hours ago        2.07GB
 alfresco-share-my-all-in-one-project                             development                                  d6cbb6143578        16 hours ago        749MB
-``` 
+```
 
 The different web applications should now be accessible:
 
@@ -141,49 +141,49 @@ The different web applications should now be accessible:
 * **ACS Share**: http://localhost:8180/share/ - login with admin/admin
 
 ## Trying out the sample code
-The AIO project has some sample extension code that you can try out. There is a one Repository extension and one Share extension 
+The AIO project has some sample extension code that you can try out. There is a one Repository extension and one Share extension
 that you can test to make sure the extension JARs have been applied properly.
 
 The Repository extension is a Web Script that can be called with the following URL: `http://localhost:8080/alfresco/service/sample/helloworld`.
-The source code for the Web Script is located here: **my-all-in-one-project/my-all-in-one-project-platform/src/main/resources/alfresco/extension/templates/webscripts/alfresco/tutorials** 
+The source code for the Web Script is located here: **my-all-in-one-project/my-all-in-one-project-platform/src/main/resources/alfresco/extension/templates/webscripts/alfresco/tutorials**
 and here: **my-all-in-one-project/my-all-in-one-project-platform/src/main/java/ com/example/platformsample/HelloWorldWebScript.java**.
 
 The Share extension is a custom Aikau page with a custom widget, you reach it with the following URL: `http://localhost:8180/share/page/hdp/ws/simple-page`.
-The source code for the Page and Widget is located here: **my-all-in-one-project/my-all-in-one-project-share/src/main/resources/alfresco/web-extension/site-webscripts/com/example/pages** 
+The source code for the Page and Widget is located here: **my-all-in-one-project/my-all-in-one-project-share/src/main/resources/alfresco/web-extension/site-webscripts/com/example/pages**
 and here: **my-all-in-one-project/my-all-in-one-project-share/src/main/resources/META-INF/resources/my-all-in-one-project-share/js/tutorials/widgets**.
 
 
 ## Looking inside the containers
-Sometimes it's good to be able to look at what has actually been deployed in the containers. For example, how do I 
-access the Repository container and list the custom Repository extension JARs that have been deployed? 
+Sometimes it's good to be able to look at what has actually been deployed in the containers. For example, how do I
+access the Repository container and list the custom Repository extension JARs that have been deployed?
 
 You can do that as follows:
 
 First **Ctrl-C** out of the log tailing:
-``` 
+```
 my-all-in-one-project-acs_1       | 27-Mar-2019 07:26:23.893 INFO [main] org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler ["http-nio-8080"]
 my-all-in-one-project-acs_1       | 27-Mar-2019 07:26:23.914 INFO [main] org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler ["ajp-nio-8009"]
 my-all-in-one-project-acs_1       | 27-Mar-2019 07:26:23.940 INFO [main] org.apache.catalina.startup.Catalina.start Server startup in 83197 ms
 my-all-in-one-project-acs_1       |  2019-03-27 07:26:24,304  INFO  [management.subsystems.ChildApplicationContextFactory] [http-nio-8080-exec-3] Starting 'Search' subsystem, ID: [Search, managed, solr6]
 my-all-in-one-project-acs_1       |  2019-03-27 07:26:25,555  INFO  [management.subsystems.ChildApplicationContextFactory] [http-nio-8080-exec-3] Startup of 'Search' subsystem, ID: [Search, managed, solr6] complete
 ^CERROR: Aborting.
-my-all-in-one-project mbergljung$ 
-``` 
+my-all-in-one-project mbergljung$
+```
 
 Then check the name of the ACS Repository container:
 
-``` 
+```
 $ docker container ls
 CONTAINER ID        IMAGE                                                         COMMAND                  CREATED             STATUS              PORTS                                                      NAMES
 733867a70117        alfresco-content-services-my-all-in-one-project:development   "catalina.sh run -se…"   5 minutes ago       Up 5 minutes        0.0.0.0:8080->8080/tcp, 0.0.0.0:8888->8888/tcp             docker_my-all-in-one-project-acs_1
-1f197e52b4f2        alfresco/alfresco-search-services:1.2.0                       "/bin/sh -c '$DIST_D…"   5 minutes ago       Up 5 minutes        0.0.0.0:8983->8983/tcp                                     docker_my-all-in-one-project-ass_1
+1f197e52b4f2        alfresco/alfresco-search-services:2.0.3                       "/bin/sh -c '$DIST_D…"   5 minutes ago       Up 5 minutes        0.0.0.0:8983->8983/tcp                                     docker_my-all-in-one-project-ass_1
 4eff0cc9cc25        alfresco-share-my-all-in-one-project:development              "/usr/local/tomcat/s…"   5 minutes ago       Up 5 minutes        8000/tcp, 0.0.0.0:8180->8080/tcp, 0.0.0.0:9898->8888/tcp   docker_my-all-in-one-project-share_1
 a7854ff16d72        postgres:9.6                                                  "docker-entrypoint.s…"   5 minutes ago       Up 5 minutes        0.0.0.0:5555->5432/tcp                                     docker_my-all-in-one-project-postgres_1
-``` 
+```
 
 Then open up a shell into the ACS Repository container:
 
-``` 
+```
 my-all-in-one-project mbergljung$ docker exec -it docker_my-all-in-one-project-acs_1 /bin/bash
 [root@733867a70117 tomcat]# pwd
 /usr/local/tomcat
@@ -191,55 +191,55 @@ my-all-in-one-project mbergljung$ docker exec -it docker_my-all-in-one-project-a
 -rw-r--r-- 1 root root    17220 Mar 27 07:24 my-all-in-one-project-platform-1.0-SNAPSHOT.jar
 [root@733867a70117 tomcat]# exit
 exit
-``` 
+```
 
 ## Updating extension code
-So now you probably want to write some new code, or update the existing code, and see how that works with the containers running. 
-What do you need to do, restart etc. First just update the code. For example, let's update the Repository Web Script 
-to return a different message. Open up the **my-all-in-one-project/my-all-in-one-project-platform/src/main/resources/alfresco/extension/templates/webscripts/alfresco/tutorials/helloworld.get.html.ftl** 
+So now you probably want to write some new code, or update the existing code, and see how that works with the containers running.
+What do you need to do, restart etc. First just update the code. For example, let's update the Repository Web Script
+to return a different message. Open up the **my-all-in-one-project/my-all-in-one-project-platform/src/main/resources/alfresco/extension/templates/webscripts/alfresco/tutorials/helloworld.get.html.ftl**
 file and change it to look as follows:
 
-``` 
+```
 Message: '${fromJS}' '${fromJava}' UPDATED!
-``` 
+```
 
 To get this code update deployed we just have to run the following command in another console then where we are tailing the logs,
 and stand in the directory where the `run.sh` script is located:
 
-``` 
+```
 my-all-in-one-project mbergljung$ ./run.sh reload_acs
-``` 
+```
 
 What this will do is the following:
 
-* Kill the `my-all-in-one-project-acs` container 
+* Kill the `my-all-in-one-project-acs` container
 * Remove the killed (stopped) `my-all-in-one-project-acs` container, so a new Docker image can be created with `development` tag
-* Build the Repository extension JAR: **my-all-in-one-project/my-all-in-one-project-platform** 
+* Build the Repository extension JAR: **my-all-in-one-project/my-all-in-one-project-platform**
 * Copy the newly built Repository extension JAR over to the **my-all-in-one-project/my-all-in-one-project-platform-docker/target/extensions** where it will be picked up when the new Docker image is built.
 * Build a new `alfresco-content-services-my-all-in-one-project:development` image
 * Start up the `my-all-in-one-project-acs` container based on new image  
 
-You will be left with the console tailing the logs, but you can **Ctrl-C** out of this as you are already tailing the logs 
+You will be left with the console tailing the logs, but you can **Ctrl-C** out of this as you are already tailing the logs
 in the initial console where we started things up.
 
 You can now check if the change took effect by accessing the `http://localhost:8080/alfresco/service/sample/helloworld` Web Script.
- 
+
 ## Stopping the project
-To stop the solution you need to first `Ctrl-C` out of the log tailing. This does not stop the containers 
+To stop the solution you need to first `Ctrl-C` out of the log tailing. This does not stop the containers
 as they run in daemon mode in the background. Check this by executing the following command that lists running containers:
 
-``` 
+```
 $ docker container ls
 CONTAINER ID        IMAGE                                                         COMMAND                  CREATED             STATUS              PORTS                                                      NAMES
 49015432f1b2        alfresco-content-services-my-all-in-one-project:development   "catalina.sh run -se…"   20 minutes ago      Up 20 minutes       0.0.0.0:8080->8080/tcp, 0.0.0.0:8888->8888/tcp             docker_my-all-in-one-project-acs_1
 edb9ea129a5d        postgres:9.6                                                  "docker-entrypoint.s…"   20 minutes ago      Up 20 minutes       0.0.0.0:5555->5432/tcp                                     docker_my-all-in-one-project-postgres_1
-6992d183986f        alfresco/alfresco-search-services:1.2.0                       "/bin/sh -c '$DIST_D…"   20 minutes ago      Up 20 minutes       0.0.0.0:8983->8983/tcp                                     docker_my-all-in-one-project-ass_1
+6992d183986f        alfresco/alfresco-search-services:2.0.3                       "/bin/sh -c '$DIST_D…"   20 minutes ago      Up 20 minutes       0.0.0.0:8983->8983/tcp                                     docker_my-all-in-one-project-ass_1
 107d00733efd        alfresco-share-my-all-in-one-project:development              "/usr/local/tomcat/s…"   20 minutes ago      Up 20 minutes       8000/tcp, 0.0.0.0:8180->8080/tcp, 0.0.0.0:9898->8888/tcp   docker_my-all-in-one-project-share_1
-``` 
+```
 
 Now, standing in the directory where the `run.sh` script is located execute the following command to stop and remove the containers:
 
-``` 
+```
 my-all-in-one-project mbergljung$ ./run.sh stop
 Stopping docker_my-all-in-one-project-acs_1      ... done
 Stopping docker_my-all-in-one-project-postgres_1 ... done
@@ -250,7 +250,4 @@ Removing docker_my-all-in-one-project-postgres_1 ... done
 Removing docker_my-all-in-one-project-ass_1      ... done
 Removing docker_my-all-in-one-project-share_1    ... done
 Removing network docker_default
-``` 
-
-
-
+```

docs/working-with-generated-projects/working-with-platform.md

@@ -1,15 +1,15 @@
 ---
 Title: Working with a Platform (Repository) project
 Added: v4.0.0
-Last reviewed: 2019-10-18
+Last reviewed: 2021-02-09
 ---
 
 # Working with a Platform (Repository) project
 
-Before you continue make sure that you have read and completed the tasks in the 
-[Getting started](../getting-started.md) tutorial to generate a Platform project, 
-which means selecting the `org.alfresco.maven.archetype:alfresco-platform-jar-archetype` 
-Maven archetype when generating the project. The following information assumes that 
+Before you continue make sure that you have read and completed the tasks in the
+[Getting started](../getting-started.md) tutorial to generate a Platform project,
+which means selecting the `org.alfresco.maven.archetype:alfresco-platform-jar-archetype`
+Maven archetype when generating the project. The following information assumes that
 the Platform project was generated with the name `my-platform-project`.
 
 -   [Introduction](#introduction)
@@ -21,13 +21,13 @@ the Platform project was generated with the name `my-platform-project`.
 -   [Stopping the project](#stopping-the-project)
 
 ## Introduction
-A Platform project is used to build extensions for the [Alfresco Content Services (ACS) Repository](https://docs.alfresco.com/6.1/concepts/dev-platform-extensions.html). 
-The runtime environment for ACS is Docker so not only is this project building the source code for your extensions but also the 
-custom Docker image for the Alfresco Repository. The custom Docker images includes the JARs, or AMPs, with your extension code. 
+A Platform project is used to build extensions for the [Alfresco Content Services (ACS) Repository](https://docs.alfresco.com/6.2/concepts/dev-platform-extensions.html).
+The runtime environment for ACS is Docker so not only is this project building the source code for your extensions but also the
+custom Docker image for the Alfresco Repository. The custom Docker images includes the JARs, or AMPs, with your extension code.
 
-Looking into the generated Platform project we can see that we got a Docker Compose file (**my-platform-project/docker/docker-compose.yml**) 
-that will be used to build custom Docker images and run the project. We also got a directory for our extension source code: 
-**my-platform-project/src/main/java** and one directory with the Docker related stuff, such as the **Dockerfile** used to 
+Looking into the generated Platform project we can see that we got a Docker Compose file (**my-platform-project/docker/docker-compose.yml**)
+that will be used to build custom Docker images and run the project. We also got a directory for our extension source code:
+**my-platform-project/src/main/java** and one directory with the Docker related stuff, such as the **Dockerfile** used to
 build the custom ACS Repository Docker image: **my-platform-project/src/main/docker**.
 
 ## Configuration properties
@@ -38,8 +38,8 @@ The following table explains some of these properties:
 
 | Name | Type | Default value | Description |
 | ---- | ---- | ------------- | ----------- |
-| alfresco.platform.version | `string` | 6.1.2-ga | The version of the ACS Repository (i.e. alfresco.war) that the Repository Extension should be applied to. This also specifies the version of the ACS Repository Docker Image that the custom built Repository image should be based on. See **my-platform-project-platform-docker/src/main/docker/Dockerfile** |
-| alfresco.share.version | `string` | 6.1.0-RC3 | The version of Alfresco Share (i.e. share.war) that the Share Extension should be applied to. This also specifies the version of the Alfresco Share Docker Image that the custom built Share image should be based on. See **my-platform-project-share-docker/src/main/docker/Dockerfile**|
+| alfresco.platform.version | `string` | 7.0.0-A20 | The version of the ACS Repository (i.e. alfresco.war) that the Repository Extension should be applied to. This also specifies the version of the ACS Repository Docker Image that the custom built Repository image should be based on. See **my-platform-project-platform-docker/src/main/docker/Dockerfile** |
+| alfresco.share.version | `string` | 7.0.0-M3 | The version of Alfresco Share (i.e. share.war) that the Share Extension should be applied to. This also specifies the version of the Alfresco Share Docker Image that the custom built Share image should be based on. See **my-platform-project-share-docker/src/main/docker/Dockerfile**|
 | docker.acs.image | `string` | alfresco/alfresco-content-repository-community | The name of the ACS Repository Docker image in Docker Hub. This changes if you switch to Enterprise Edition.|
 | docker.share.image | `string` | alfresco/alfresco-share | The name of the Alfresco Share Docker image in Docker Hub. This changes if you switch to Enterprise Edition.|
 | share.port | `number` | 8180 | The external port (i.e. outside container) for the Alfresco Share webapp.|
@@ -49,27 +49,27 @@ The following table explains some of these properties:
 | acs.debug.port | `number` | 8888 | The external port (i.e. outside container) for ACS Repository remote debugging.|
 | postgres.port | `number` | 5555 | The external port (i.e. outside container) for PostgreSQL database.|
 
-There are some Alfresco Share related properties listed here, but they are not used unless you uncomment some code in the 
+There are some Alfresco Share related properties listed here, but they are not used unless you uncomment some code in the
 Docker Compose file (**my-platform-project/docker/docker-compose.yml**) to run the Alfresco Share container.
 
 When you first start out you don't need to change any of these properties, just use the defaults and try it out.
 
 ## Building and running the project
 The first thing you need to do before you can run anything is to build the custom ACS Repository Docker image with the custom extensions.
-We can build the image and extensions at the same time as we start (run) the project by using the `./run.sh build_start` script 
+We can build the image and extensions at the same time as we start (run) the project by using the `./run.sh build_start` script
 (on Windows use the `run.bat build_start` script instead).
 
-Note that if you have another Alfresco SDK project running, then you need to stop it first. Also, make sure that the 
-following ports are free: 8180 (Share - if enabled in Docker Compose), 8080 (Alfresco Repo), 9898 (Share Debug - if enabled in Docker Compose), 
+Note that if you have another Alfresco SDK project running, then you need to stop it first. Also, make sure that the
+following ports are free: 8180 (Share - if enabled in Docker Compose), 8080 (Alfresco Repo), 9898 (Share Debug - if enabled in Docker Compose),
 8888 (Alfresco Repo Debug), 5555 (Postgres).
-If you want to change the ports see the properties section of **my-platform-project/pom.xml**. This project file also 
+If you want to change the ports see the properties section of **my-platform-project/pom.xml**. This project file also
 contains the versions of Alfresco Repository and Alfresco Share (if enabled) that will be used.  
 
 ```
 $ cd my-platform-project/
 MBP512-MBERGLJUNG-0917:my-platform-project mbergljung$ ./run.sh build_start
 [INFO] Scanning for projects...
-[INFO] 
+[INFO]
 [INFO] ------------------------------------------------------------------------
 [INFO] Building my-platform-project Platform/Repository JAR Module 1.0-SNAPSHOT
 [INFO] ------------------------------------------------------------------------
@@ -95,12 +95,12 @@ Attaching to docker_my-platform-project-acs_1, docker_my-platform-project-ass_1,
 ...
 my-platform-project-acs_1       | 27-Mar-2019 09:25:12.923 INFO [main] org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler ["http-nio-8080"]
 my-platform-project-acs_1       | 27-Mar-2019 09:25:12.947 INFO [main] org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler ["ajp-nio-8009"]
-my-platform-project-acs_1       | 27-Mar-2019 09:25:12.955 INFO [main] org.apache.catalina.startup.Catalina.start Server startup in 91144 ms``` 
+my-platform-project-acs_1       | 27-Mar-2019 09:25:12.955 INFO [main] org.apache.catalina.startup.Catalina.start Server startup in 91144 ms```
 ```
 
 The `./run.sh build_start` script will do the following:
 
-* Stop anything running already with this project's Docker Compose file: **my-platform-project/docker/docker-compose.yml** 
+* Stop anything running already with this project's Docker Compose file: **my-platform-project/docker/docker-compose.yml**
 * Build the Repository Extension JARs so we are sure to get the latest changes
 * Assemble/Aggregate all Repository extension JARs into the **my-platform-project/target/extensions** directory
 * Create Docker Volumes for Repository (alf_data), Search index, and Database so data is persisted outside the containers
@@ -109,11 +109,11 @@ The `./run.sh build_start` script will do the following:
 
 This will build the following Docker image:
 
-``` 
+```
 $ docker image ls|more
 REPOSITORY                                                       TAG                                          IMAGE ID            CREATED             SIZE
 alfresco-content-services-my-platform-project                    development                                  b2b9a7b730f5        5 minutes ago       2.07GB
-``` 
+```
 
 The different web applications should now be accessible:
 
@@ -121,20 +121,20 @@ The different web applications should now be accessible:
 * And optionally (if enabled in Docker Compose file) **ACS Share**: http://localhost:8180/share/ - login with admin/admin
 
 ## Trying out the sample code
-The Platform project has some sample extension code that you can try out. 
+The Platform project has some sample extension code that you can try out.
 
 The Repository extension is a Web Script that can be called with the following URL: `http://localhost:8080/alfresco/service/sample/helloworld`.
-The source code for the Web Script is located here: **my-platform-project/src/main/resources/alfresco/extension/templates/webscripts/alfresco/tutorials** 
+The source code for the Web Script is located here: **my-platform-project/src/main/resources/alfresco/extension/templates/webscripts/alfresco/tutorials**
 and here: **my-platform-project/src/main/java/ com/example/platformsample/HelloWorldWebScript.java**.
 
 ## Looking inside the containers
-Sometimes it's good to be able to look at what has actually been deployed in the containers. For example, how do I 
-access the Repository container and list the custom Repository extension JARs that have been deployed? 
+Sometimes it's good to be able to look at what has actually been deployed in the containers. For example, how do I
+access the Repository container and list the custom Repository extension JARs that have been deployed?
 
 You can do that as follows:
 
 First **Ctrl-C** out of the log tailing:
-``` 
+```
 my-platform-project-acs_1       | 27-Mar-2019 09:25:12.923 INFO [main] org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler ["http-nio-8080"]
 my-platform-project-acs_1       | 27-Mar-2019 09:25:12.947 INFO [main] org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler ["ajp-nio-8009"]
 my-platform-project-acs_1       | 27-Mar-2019 09:25:12.955 INFO [main] org.apache.catalina.startup.Catalina.start Server startup in 91144 ms
@@ -142,21 +142,21 @@ my-platform-project-acs_1       |  2019-03-27 09:25:40,406  INFO  [management.su
 my-platform-project-acs_1       |  2019-03-27 09:25:40,948  INFO  [management.subsystems.ChildApplicationContextFactory] [http-nio-8080-exec-6] Startup of 'Transformers' subsystem, ID: [Transformers, default] complete
 ^[[B^CERROR: Aborting.
 my-platform-project mbergljung$
-``` 
+```
 
 Then check the name of the ACS Repository container:
 
-``` 
+```
 $ docker container ls
 CONTAINER ID        IMAGE                                                       COMMAND                  CREATED             STATUS              PORTS                                            NAMES
 ba90b1648470        alfresco-content-services-my-platform-project:development   "catalina.sh run -se…"   8 minutes ago       Up 8 minutes        0.0.0.0:8080->8080/tcp, 0.0.0.0:8888->8888/tcp   docker_my-platform-project-acs_1
-0435b09e687c        alfresco/alfresco-search-services:1.2.0                     "/bin/sh -c '$DIST_D…"   8 minutes ago       Up 8 minutes        0.0.0.0:8983->8983/tcp                           docker_my-platform-project-ass_1
+0435b09e687c        alfresco/alfresco-search-services:2.0.3                     "/bin/sh -c '$DIST_D…"   8 minutes ago       Up 8 minutes        0.0.0.0:8983->8983/tcp                           docker_my-platform-project-ass_1
 c9145e7cdb20        postgres:9.6                                                "docker-entrypoint.s…"   8 minutes ago       Up 8 minutes        0.0.0.0:5555->5432/tcp                           docker_my-platform-project-postgres_1
-``` 
+```
 
 Then open up a shell into the ACS Repository container:
 
-``` 
+```
 my-platform-project mbergljung$ docker exec -it docker_my-platform-project-acs_1 /bin/bash
 [root@ba90b1648470 tomcat]# pwd
 /usr/local/tomcat
@@ -165,17 +165,17 @@ my-platform-project mbergljung$ docker exec -it docker_my-platform-project-acs_1
 -rw-r--r-- 1 root root    13692 Mar 27 09:23 my-platform-project-1.0-SNAPSHOT-tests.jar
 [root@ba90b1648470 tomcat]# exit
 exit
-``` 
+```
 
 ## Updating extension code
-So now you probably want to write some new code, or update the existing code, and see how that works with the containers running. 
-What do you need to do, restart etc. First just update the code. For example, let's update the Repository Web Script 
-to return a different message. Open up the **my-platform-project/src/main/resources/alfresco/extension/templates/webscripts/alfresco/tutorials/helloworld.get.html.ftl** 
+So now you probably want to write some new code, or update the existing code, and see how that works with the containers running.
+What do you need to do, restart etc. First just update the code. For example, let's update the Repository Web Script
+to return a different message. Open up the **my-platform-project/src/main/resources/alfresco/extension/templates/webscripts/alfresco/tutorials/helloworld.get.html.ftl**
 file and change it to look as follows:
 
-``` 
+```
 Message: '${fromJS}' '${fromJava}' UPDATED!
-``` 
+```
 
 To get this code update deployed we have to run the following commands:
 
@@ -183,7 +183,7 @@ First `Ctrl-C` out of the log tailing.
 
 Then stop the project:
 
-``` 
+```
 my-platform-project mbergljung$ ./run.sh stop
 Stopping docker_my-platform-project-acs_1      ... done
 Stopping docker_my-platform-project-ass_1      ... done
@@ -192,18 +192,18 @@ Removing docker_my-platform-project-acs_1      ... done
 Removing docker_my-platform-project-ass_1      ... done
 Removing docker_my-platform-project-postgres_1 ... done
 Removing network docker_default
-``` 
+```
 
 Now build and start again:
 
-``` 
+```
 my-platform-project mbergljung$ ./run.sh build_start
 ...
-``` 
+```
 
 What this will do is the following:
 
-* Kill the `my-platform-project-acs` container 
+* Kill the `my-platform-project-acs` container
 * Removed the killed (stopped) `my-platform-project-acs` container, so a new Docker image can be created with `development` tag
 * Build the Repository extension JAR
 * Copy the newly built Repository extension JAR over to the **my-platform-project/target/extensions** where it will be picked up when the new Docker image is built.
@@ -211,22 +211,22 @@ What this will do is the following:
 * Start up the `my-platform-project-acs` container based on new image  
 
 You can now check if the change took effect by accessing the `http://localhost:8080/alfresco/service/sample/helloworld` Web Script.
- 
+
 ## Stopping the project
-To stop the solution you need to first `Ctrl-C` out of the log tailing. This does not stop the containers 
+To stop the solution you need to first `Ctrl-C` out of the log tailing. This does not stop the containers
 as they run in daemon mode in the background. Check this by executing the following command that lists running containers:
 
-``` 
+```
 $ docker container ls
 CONTAINER ID        IMAGE                                                       COMMAND                  CREATED             STATUS              PORTS                                            NAMES
 61de829092f3        alfresco-content-services-my-platform-project:development   "catalina.sh run -se…"   3 minutes ago       Up 3 minutes        0.0.0.0:8080->8080/tcp, 0.0.0.0:8888->8888/tcp   docker_my-platform-project-acs_1
-07300ddb6714        alfresco/alfresco-search-services:1.2.0                     "/bin/sh -c '$DIST_D…"   3 minutes ago       Up 3 minutes        0.0.0.0:8983->8983/tcp                           docker_my-platform-project-ass_1
+07300ddb6714        alfresco/alfresco-search-services:2.0.3                     "/bin/sh -c '$DIST_D…"   3 minutes ago       Up 3 minutes        0.0.0.0:8983->8983/tcp                           docker_my-platform-project-ass_1
 09922ce36d90        postgres:9.6                                                "docker-entrypoint.s…"   3 minutes ago       Up 3 minutes        0.0.0.0:5555->5432/tcp                           docker_my-platform-project-postgres_1
-``` 
+```
 
 Now, standing in the directory where the `run.sh` script is located execute the following command to stop and remove the containers:
 
-``` 
+```
 my-platform-project mbergljung$ ./run.sh stop
 Stopping docker_my-platform-project-acs_1      ... done
 Stopping docker_my-platform-project-ass_1      ... done
@@ -235,7 +235,4 @@ Removing docker_my-platform-project-acs_1      ... done
 Removing docker_my-platform-project-ass_1      ... done
 Removing docker_my-platform-project-postgres_1 ... done
 Removing network docker_default
-``` 
-
-
-
+```

docs/working-with-generated-projects/working-with-share.md

@@ -1,15 +1,15 @@
 ---
 Title: Working with a Share project
 Added: v4.0.0
-Last reviewed: 2019-10-18
+Last reviewed: 2021-02-09
 ---
 
 # Working with a Share project
 
-Before you continue make sure that you have read and completed the tasks in the 
-[Getting started](../getting-started.md) tutorial to generate an Alfresco Share project, 
-which means selecting the `org.alfresco.maven.archetype:alfresco-share-jar-archetype` 
-Maven archetype when generating the project. The following information assumes that 
+Before you continue make sure that you have read and completed the tasks in the
+[Getting started](../getting-started.md) tutorial to generate an Alfresco Share project,
+which means selecting the `org.alfresco.maven.archetype:alfresco-share-jar-archetype`
+Maven archetype when generating the project. The following information assumes that
 the Share project was generated with the name `my-share-project`.
 
 -   [Introduction](#introduction)
@@ -21,14 +21,14 @@ the Share project was generated with the name `my-share-project`.
 -   [Stopping the project](#stopping-the-project)
 
 ## Introduction
-An Alfresco Sharte project is used to build extensions for [Alfresco Share UI](https://docs.alfresco.com/6.1/concepts/dev-extensions-share.html). 
-The runtime environment for ACS is Docker so not only is this project building the source code for your extensions but also the 
-custom Docker image for Alfresco Share. The custom Docker images includes the 
-JARs, or AMPs, with your extension code. 
+An Alfresco Sharte project is used to build extensions for [Alfresco Share UI](https://docs.alfresco.com/6.2/concepts/dev-extensions-share.html).
+The runtime environment for ACS is Docker so not only is this project building the source code for your extensions but also the
+custom Docker image for Alfresco Share. The custom Docker images includes the
+JARs, or AMPs, with your extension code.
 
-Looking into the generated Share project we can see that we got a Docker Compose file (**my-share-project/docker/docker-compose.yml**) 
-that will be used to build custom Docker images and run the project. We also got a directory for our extension source code: 
-**my-share-project/src/main/java** and one directory with the Docker related stuff, such as the **Dockerfile** used to 
+Looking into the generated Share project we can see that we got a Docker Compose file (**my-share-project/docker/docker-compose.yml**)
+that will be used to build custom Docker images and run the project. We also got a directory for our extension source code:
+**my-share-project/src/main/java** and one directory with the Docker related stuff, such as the **Dockerfile** used to
 build the custom Alfresco Share Docker image: **my-share-project/src/main/docker**.
 
 ## Configuration properties
@@ -39,8 +39,8 @@ The following table explains some of these properties:
 
 | Name | Type | Default value | Description |
 | ---- | ---- | ------------- | ----------- |
-| alfresco.platform.version | `string` | 6.1.2-ga | The version of the ACS Repository (i.e. alfresco.war) that the Repository Extension should be applied to. This also specifies the version of the ACS Repository Docker Image that the custom built Repository image should be based on. See **my-share-project-platform-docker/src/main/docker/Dockerfile** |
-| alfresco.share.version | `string` | 6.1.0-RC3 | The version of Alfresco Share (i.e. share.war) that the Share Extension should be applied to. This also specifies the version of the Alfresco Share Docker Image that the custom built Share image should be based on. See **my-share-project-share-docker/src/main/docker/Dockerfile**|
+| alfresco.platform.version | `string` | 7.0.0-A20 | The version of the ACS Repository (i.e. alfresco.war) that the Repository Extension should be applied to. This also specifies the version of the ACS Repository Docker Image that the custom built Repository image should be based on. See **my-share-project-platform-docker/src/main/docker/Dockerfile** |
+| alfresco.share.version | `string` | 7.0.0-M3 | The version of Alfresco Share (i.e. share.war) that the Share Extension should be applied to. This also specifies the version of the Alfresco Share Docker Image that the custom built Share image should be based on. See **my-share-project-share-docker/src/main/docker/Dockerfile**|
 | docker.acs.image | `string` | alfresco/alfresco-content-repository-community | The name of the ACS Repository Docker image in Docker Hub. This changes if you switch to Enterprise Edition.|
 | docker.share.image | `string` | alfresco/alfresco-share | The name of the Alfresco Share Docker image in Docker Hub. This changes if you switch to Enterprise Edition.|
 | share.port | `number` | 8180 | The external port (i.e. outside container) for the Alfresco Share webapp.|
@@ -52,23 +52,23 @@ The following table explains some of these properties:
 
 There are some ACS Repository related properties listed here, such as `acs.host` and `acs.port`. Alfresco Share will use those
 to connect to the Alfresco Repository. This is however a bit tricky when we are running in a container environment. You cannot
-just start the Repository and make it available on `localhost:8080`. It would not be accessible like that from inside the 
-Share container. For Share to be able to connect to the Repository both containers need to be attached to the same 
+just start the Repository and make it available on `localhost:8080`. It would not be accessible like that from inside the
+Share container. For Share to be able to connect to the Repository both containers need to be attached to the same
 Docker Network. This way you can just use the Docker Compose service name for the Repository, such as `my-share-project-acs`.
-So the best way to test your Share extension is to uncomment the code in the Docker Compose file 
+So the best way to test your Share extension is to uncomment the code in the Docker Compose file
 (**my-share-project/docker/docker-compose.yml**) to also run the ACS Repository container, Search, and Postgres.
 
 ## Building and running the project
 The first thing you need to do before you can run anything is to build the custom Share Docker image with the custom extensions.
-We can build the image and extensions at the same time as we start (run) the project by using the `./run.sh build_start` script 
+We can build the image and extensions at the same time as we start (run) the project by using the `./run.sh build_start` script
 (on Windows use the `run.bat build_start` script instead).
 
-Note that if you have another Alfresco SDK project running, then you need to stop it first. Also, make sure that the 
+Note that if you have another Alfresco SDK project running, then you need to stop it first. Also, make sure that the
 following ports are free: 8180 (Share), 8080 (Alfresco Repo - if enabled in Docker Compose), 9898 (Share Debug), 8888 (Alfresco Repo Debug - if enabled), 5555 (Postgres).
-If you want to change the ports see the properties section of **my-share-project/pom.xml**. This project file also 
+If you want to change the ports see the properties section of **my-share-project/pom.xml**. This project file also
 contains the versions of Alfresco Repository (if enabled) and Alfresco Share that will be used.  
 
-When I run the project I have uncommented the code (make sure to also remove the "# Optional" line) that starts 
+When I run the project I have uncommented the code (make sure to also remove the "# Optional" line) that starts
 the Repository, Search, and PostgresSQL in the (**my-share-project/docker/docker-compose.yml**) file, so I can test the Share extension:  
 
 ```
@@ -97,11 +97,11 @@ Successfully tagged alfresco-share-my-share-project:development...
 my-share-project-acs_1       | 27-Mar-2019 10:09:01.158 INFO [main] org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler ["http-nio-8080"]
 my-share-project-acs_1       | 27-Mar-2019 10:09:01.175 INFO [main] org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler ["ajp-nio-8009"]
 my-share-project-acs_1       | 27-Mar-2019 10:09:01.213 INFO [main] org.apache.catalina.startup.Catalina.start Server startup in 95189 ms
-``` 
+```
 
 The `./run.sh build_start` script will do the following:
 
-* Stop anything running already with this project's Docker Compose file: **my-share-project/docker/docker-compose.yml** 
+* Stop anything running already with this project's Docker Compose file: **my-share-project/docker/docker-compose.yml**
 * Build the Share Extension JARs so we are sure to get the latest changes
 * Assemble/Aggregate all Share extension JARs into the **my-share-project/target/extensions** directory
 * Create Docker Volumes for Repository (alf_data), Search index, and Database so data is persisted outside the containers
@@ -110,11 +110,11 @@ The `./run.sh build_start` script will do the following:
 
 This will build the following Docker image:
 
-``` 
+```
 $ docker image ls
 REPOSITORY                                                       TAG                                          IMAGE ID            CREATED              SIZE
 alfresco-share-my-share-project                                  development                                  b8b9acdb3425        About a minute ago   749MB
-``` 
+```
 
 The different web applications should now be accessible:
 
@@ -122,43 +122,43 @@ The different web applications should now be accessible:
 * **ACS Share**: http://localhost:8180/share/ - login with admin/admin
 
 ## Trying out the sample code
-The Share project has some sample extension code that you can try out. 
+The Share project has some sample extension code that you can try out.
 
 The Share extension is a custom Aikau page with a custom widget, you reach it with the following URL: `http://localhost:8180/share/page/hdp/ws/simple-page`.
-The source code for the Page and Widget is located here: **my-share-project/src/main/resources/alfresco/web-extension/site-webscripts/com/example/pages** 
+The source code for the Page and Widget is located here: **my-share-project/src/main/resources/alfresco/web-extension/site-webscripts/com/example/pages**
 and here: **my-share-project/src/main/resources/META-INF/resources/my-share-project-share/js/tutorials/widgets**.
 
 ## Looking inside the containers
-Sometimes it's good to be able to look at what has actually been deployed in the containers. For example, how do I 
-access the Share container and list the custom Share extension JARs that have been deployed? 
+Sometimes it's good to be able to look at what has actually been deployed in the containers. For example, how do I
+access the Share container and list the custom Share extension JARs that have been deployed?
 
 You can do that as follows:
 
 First **Ctrl-C** out of the log tailing:
-``` 
+```
 my-share-project-acs_1       | 27-Mar-2019 10:09:01.213 INFO [main] org.apache.catalina.startup.Catalina.start Server startup in 95189 ms
 my-share-project-acs_1       |  2019-03-27 10:09:30,278  INFO  [management.subsystems.ChildApplicationContextFactory] [http-nio-8080-exec-5] Starting 'Transformers' subsystem, ID: [Transformers, default]
 my-share-project-acs_1       |  2019-03-27 10:09:30,618  INFO  [management.subsystems.ChildApplicationContextFactory] [http-nio-8080-exec-5] Startup of 'Transformers' subsystem, ID: [Transformers, default] complete
 my-share-project-share_1     | 2019-03-27 10:11:50,150  INFO  [web.site.EditionInterceptor] [http-nio-8080-exec-1] Successfully retrieved license information from Alfresco.
 my-share-project-share_1     | 2019-03-27 10:12:11,652  INFO  [web.scripts.ImapServerStatus] [http-nio-8080-exec-7] Successfully retrieved IMAP server status from Alfresco: disabled
 ^CERROR: Aborting.
-my-share-project mbergljung$ 
-``` 
+my-share-project mbergljung$
+```
 
 Then check the name of the Alfresco Share container:
 
-``` 
+```
 $ docker container ls
 CONTAINER ID        IMAGE                                                     COMMAND                  CREATED             STATUS              PORTS                                                      NAMES
 dda89172506c        alfresco/alfresco-content-repository-community:6.1.2-ga   "catalina.sh run -se…"   6 minutes ago       Up 6 minutes        0.0.0.0:8080->8080/tcp                                     docker_my-share-project-acs_1
 2b4fa4b4a3f6        alfresco-share-my-share-project:development               "/usr/local/tomcat/s…"   6 minutes ago       Up 6 minutes        8000/tcp, 0.0.0.0:8180->8080/tcp, 0.0.0.0:9898->8888/tcp   docker_my-share-project-share_1
 ad8857f3574b        postgres:9.6                                              "docker-entrypoint.s…"   6 minutes ago       Up 6 minutes        0.0.0.0:5555->5432/tcp                                     docker_my-share-project-postgres_1
-92902d7ae624        alfresco/alfresco-search-services:1.2.0                   "/bin/sh -c '$DIST_D…"   6 minutes ago       Up 6 minutes        0.0.0.0:8983->8983/tcp                                     docker_my-share-project-ass_1
-``` 
+92902d7ae624        alfresco/alfresco-search-services:2.0.3                   "/bin/sh -c '$DIST_D…"   6 minutes ago       Up 6 minutes        0.0.0.0:8983->8983/tcp                                     docker_my-share-project-ass_1
+```
 
 Then open up a shell into the Alfresco Share container:
 
-``` 
+```
 my-share-project mbergljung$ docker exec -it docker_my-share-project-share_1 /bin/bash
 [root@2b4fa4b4a3f6 tomcat]# pwd
 /usr/local/tomcat
@@ -166,15 +166,15 @@ my-share-project mbergljung$ docker exec -it docker_my-share-project-share_1 /bi
 -rw-r--r-- 1 root root    18920 Mar 27 10:07 my-share-project-1.0-SNAPSHOT.jar
 [root@2b4fa4b4a3f6 tomcat]# exit
 exit
-``` 
+```
 
 ## Updating extension code
-So now you probably want to write some new code, or update the existing code, and see how that works with the containers running. 
-What do you need to do, restart etc. First just update the code. For example, let's update the Share Page title. 
-Open up the **my-share-project/src/main/resources/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.js** 
+So now you probably want to write some new code, or update the existing code, and see how that works with the containers running.
+What do you need to do, restart etc. First just update the code. For example, let's update the Share Page title.
+Open up the **my-share-project/src/main/resources/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.js**
 file and change it to look as follows:
 
-``` 
+```
 model.jsonModel = {
     widgets: [{
         id: "SET_PAGE_TITLE",
@@ -204,45 +204,45 @@ model.jsonModel = {
             }
         }]
 };
-``` 
+```
 
 To get this code update deployed we just have to run the following command in another console then where we are tailing the logs,
 and stand in the directory where the `run.sh` script is located:
 
-``` 
+```
 my-share-project mbergljung$ ./run.sh reload_share
-``` 
+```
 
 What this will do is the following:
 
-* Kill the `my-share-project-acs` container 
+* Kill the `my-share-project-acs` container
 * Remove the killed (stopped) `my-share-project-acs` container, so a new Docker image can be created with `development` tag
 * Build the Share extension JAR
 * Copy the newly built Share extension JAR over to the **my-share-project/target/extensions** where it will be picked up when the new Docker image is built.
 * Build a new `alfresco-share-my-share-project:development` image
 * Start up the `my-share-project-acs` container based on new image  
 
-You will be left with the console tailing the logs, but you can **Ctrl-C** out of this as you are already tailing the logs 
+You will be left with the console tailing the logs, but you can **Ctrl-C** out of this as you are already tailing the logs
 in the initial console where we started things up.
 
 You can now check if the change took effect by accessing the `http://localhost:8180/share/page/hdp/ws/simple-page` Web Script.
- 
+
 ## Stopping the project
-To stop the solution you need to first `Ctrl-C` out of the log tailing. This does not stop the containers 
+To stop the solution you need to first `Ctrl-C` out of the log tailing. This does not stop the containers
 as they run in daemon mode in the background. Check this by executing the following command that lists running containers:
 
-``` 
+```
 $ docker container ls
 CONTAINER ID        IMAGE                                                     COMMAND                  CREATED             STATUS              PORTS                                                      NAMES
 59f02060955a        alfresco-share-my-share-project:development               "/usr/local/tomcat/s…"   4 minutes ago       Up 4 minutes        8000/tcp, 0.0.0.0:8180->8080/tcp, 0.0.0.0:9898->8888/tcp   docker_my-share-project-share_1
 dda89172506c        alfresco/alfresco-content-repository-community:6.1.2-ga   "catalina.sh run -se…"   16 minutes ago      Up 16 minutes       0.0.0.0:8080->8080/tcp                                     docker_my-share-project-acs_1
 ad8857f3574b        postgres:9.6                                              "docker-entrypoint.s…"   16 minutes ago      Up 16 minutes       0.0.0.0:5555->5432/tcp                                     docker_my-share-project-postgres_1
-92902d7ae624        alfresco/alfresco-search-services:1.2.0                   "/bin/sh -c '$DIST_D…"   16 minutes ago      Up 16 minutes       0.0.0.0:8983->8983/tcp                                     docker_my-share-project-ass_1
-``` 
+92902d7ae624        alfresco/alfresco-search-services:2.0.3                   "/bin/sh -c '$DIST_D…"   16 minutes ago      Up 16 minutes       0.0.0.0:8983->8983/tcp                                     docker_my-share-project-ass_1
+```
 
 Now, standing in the directory where the `run.sh` script is located execute the following command to stop and remove the containers:
 
-``` 
+```
 my-share-project mbergljung$ ./run.sh stop
 Stopping docker_my-share-project-share_1    ... done
 Stopping docker_my-share-project-acs_1      ... done
@@ -253,7 +253,4 @@ Removing docker_my-share-project-acs_1      ... done
 Removing docker_my-share-project-postgres_1 ... done
 Removing docker_my-share-project-ass_1      ... done
 Removing network docker_default
-``` 
-
-
-
+```

modules/alfresco-rad/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.alfresco.maven</groupId>
         <artifactId>alfresco-sdk-aggregator</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>4.12.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -38,17 +38,15 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>3.2.17.RELEASE</version>
         </dependency>
 
         <!-- Access to JUnit runner classes -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.13.1</version>
             <scope>compile</scope>
         </dependency>
 
     </dependencies>
-
-</project>
+</project>

plugins/alfresco-maven-plugin/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco.maven</groupId>
         <artifactId>alfresco-sdk-aggregator</artifactId>
-        <version>4.1.0-SNAPSHOT</version>
+        <version>4.12.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-archiver</artifactId>
-            <version>3.1.1</version>
+            <version>3.6.0</version>
             <exclusions>
                 <exclusion>
                     <artifactId>maven-core</artifactId>
@@ -92,7 +92,7 @@
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-archiver</artifactId>
-            <version>3.4</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
@@ -102,22 +102,27 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>3.2.5</version>
+            <version>3.9.7</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.3</version>
+            <version>4.5.13</version>
         </dependency>
         <dependency>
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>
-            <version>3.6</version>
+            <version>3.10.0</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.17.1</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.5</version>
+            <version>2.17.0</version>
         </dependency>
         <dependency>
             <groupId>org.alfresco</groupId>
@@ -127,7 +132,12 @@
         <dependency>
             <groupId>org.alfrescolabs.alfresco-technical-validation</groupId>
             <artifactId>org.alfrescolabs.alfresco-technical-validation</artifactId>
-            <version>0.4.0</version>
+            <version>0.6.0</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
         </dependency>
         <dependency>
             <groupId>org.twdata.maven</groupId>
@@ -138,7 +148,7 @@
         <dependency>
             <groupId>org.zeroturnaround</groupId>
             <artifactId>zt-zip</artifactId>
-            <version>1.11</version>
+            <version>1.17</version>
         </dependency>
         <dependency>
             <groupId>de.schlichtherle.truezip</groupId>
@@ -157,11 +167,4 @@
         </plugins>
     </reporting>
 
-    <repositories>
-        <!-- Used for the ATV donwload -->
-        <repository>
-            <id>clojars.org</id>
-            <url>http://clojars.org/repo</url>
-        </repository>
-    </repositories>
-</project>
+</project>

plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRunMojo.java

@@ -131,12 +131,12 @@ public abstract class AbstractRunMojo extends AbstractMojo {
     protected String shareContextPath;
 
     /**
-     * Share Log4j.properties configuration cannot be customized via extension
+     * Share Log4j2.properties configuration cannot be customized via extension
      * put on the classpath, like on the platform side.
-     * So we need to override the log4j.properties in share/WEB-INF/classes
+     * So we need to override the log4j2.properties in share/WEB-INF/classes
      * to be able to log from custom code.
      * This property can be used to turn off this overriding, to produce a WAR with
-     * the standard Share log4j.properties file.
+     * the standard Share log4j2.properties file.
      */
     @Parameter(property = "maven.alfresco.useCustomShareLog4jConfig", defaultValue = "true")
     protected boolean useCustomShareLog4jConfig;
@@ -452,22 +452,22 @@ public abstract class AbstractRunMojo extends AbstractMojo {
 
 
     /**
-     * Copy a custom Share Log4J config into the share-war/WEB-INF/classes dir.
-     * There is no custom classpath resolve mechanism for Share log4j,
-     * to log custom stuff overriding standard log4j.properties is needed.
+     * Copy a custom Share Log4J2 config into the share-war/WEB-INF/classes dir.
+     * There is no custom classpath resolve mechanism for Share log4j2,
+     * to log custom stuff overriding standard log4j2.properties is needed.
      *
      * @throws MojoExecutionException when any problem appears copying the share log4j configuration
      */
     protected void copyShareLog4jConfig() throws MojoExecutionException {
         if (!useCustomShareLog4jConfig) {
-            getLog().info("NOT overriding share/WEB-INF/classes/log4j.properties");
+            getLog().info("NOT overriding share/WEB-INF/classes/log4j2.properties");
             return;
         }
 
         final String warOutputDir = getWarOutputDir(SHARE_WAR_PREFIX_NAME);
         final String logConfDestDir = warOutputDir + "/WEB-INF/classes";
 
-        getLog().info("Copying Share log4j.properties to: " + logConfDestDir);
+        getLog().info("Copying Share log4j2.properties to: " + logConfDestDir);
 
         executeMojo(
                 plugin(
@@ -482,7 +482,7 @@ public abstract class AbstractRunMojo extends AbstractMojo {
                                 element(name("resource"),
                                         element(name("directory"), "src/test/resources/share"),
                                         element(name("includes"),
-                                                element(name("include"), "log4j.properties")
+                                                element(name("include"), "log4j2.properties")
                                         ),
                                         element(name("filtering"), "true")
                                 )
@@ -886,7 +886,7 @@ public abstract class AbstractRunMojo extends AbstractMojo {
                             own repositories (i.e. the usual Java2 delegation model).
                             Prevent parent classloader delegation, each webapp loads.
                             If set to true then you will get a truckload of Solr logging as
-                            the alf_data_dev/solr4/config/log4j-solr.properties file is not picked up.
+                            the alf_data_dev/solr4/config/log4j2-solr.properties file is not picked up.
                             This also fixes issues with the Google Guava Library, which this tomcat plugin uses
                             version 10.0.1 of but Solr uses 14.0.1 */
                         element(name("delegate"), "false"),

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.alfresco.maven</groupId>
     <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.12.0</version>
     <name>Alfresco SDK</name>
     <description>This aggregator Project builds all modules required for the Alfresco SDK</description>
     <packaging>pom</packaging>
@@ -16,8 +16,8 @@
 
     <licenses>
         <license>
-            <name>GNU Lesser General Public License v3.0 or later</name>
-            <url>http://www.gnu.org/licenses/lgpl-3.0-standalone.html</url>
+            <name>Apache License 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
         </license>
     </licenses>
 
@@ -30,88 +30,9 @@
         <connection>scm:git:${scm.url.base}.git</connection>
         <developerConnection>scm:git:${scm.url.base}</developerConnection>
         <url>${scm.url.base}</url>
-        <tag>alfresco-sdk-aggregator-4.1.0-SNAPSHOT</tag>
+        <tag>alfresco-sdk-aggregator-4.12.0</tag>
     </scm>
 
-    <developers>
-
-        <developer>
-            <id>ohej</id>
-            <name>Ole Hejlskov</name>
-            <email>ole@phpfreak.dk</email>
-            <url>http://ohej.dk/</url>
-            <organization>Alfresco</organization>
-            <organizationUrl>http://www.alfresco.com</organizationUrl>
-            <timezone>+1</timezone>
-            <roles>
-                <role>Developer</role>
-            </roles>
-        </developer>
-        <developer>
-            <id>gravitonian</id>
-            <name>Martin Bergljung</name>
-            <email>martin.bergljung@alfresco.com</email>
-            <url>https://sites.google.com/site/gravitonian/</url>
-            <organization>Alfresco Software</organization>
-            <organizationUrl>http://www.alfresco.com</organizationUrl>
-            <timezone>+0</timezone>
-            <roles>
-                <role>Architect</role>
-                <role>Developer</role>
-            </roles>
-        </developer>
-    </developers>
-
-    <contributors>
-        <contributor>
-            <name>Gabriele Columbro</name>
-            <email>gabriele.columbro@alfresco.com</email>
-            <url>http://mindthegab.com</url>
-            <organization>Alfresco Software</organization>
-            <organizationUrl>http://www.alfresco.com</organizationUrl>
-            <timezone>-5</timezone>
-        </contributor>
-        <contributor>
-            <name>Maurizio Pillitu</name>
-            <email>maurizio.pillitu@alfresco.com</email>
-            <url>http://session.it</url>
-            <organization>Alfresco Software</organization>
-            <organizationUrl>http://www.alfresco.com</organizationUrl>
-            <timezone>+1</timezone>
-        </contributor>
-        <contributor>
-            <name>Carlo Sciolla</name>
-            <email>carlo@backbase.com</email>
-            <organization>Backbase</organization>
-            <organizationUrl>http://www.backbase.com</organizationUrl>
-            <timezone>+1</timezone>
-            <url>http://skuro.tk</url>
-        </contributor>
-        <contributor>
-            <name>Samuel Langlois</name>
-            <email>samuel.langlois@alfresco.com</email>
-            <organization>Alfresco Software</organization>
-            <organizationUrl>http://www.alfresco.com</organizationUrl>
-            <timezone>+0</timezone>
-            <url>https://twitter.com/samuel_langlois</url>
-        </contributor>
-        <contributor>
-            <name>Ray Gauss II</name>
-            <email>ray.gauss@alfresco.com</email>
-            <organization>Alfresco Software</organization>
-            <organizationUrl>http://www.alfresco.com</organizationUrl>
-            <timezone>-5</timezone>
-            <url>http://rgauss.com/</url>
-        </contributor>
-        <contributor>
-            <name>Jose Luis Osorno Gil</name>
-            <email>joseluis.osorno@ixxus.com</email>
-            <organization>Ixxus</organization>
-            <organizationUrl>http://www.ixxus.com</organizationUrl>
-            <timezone>+1</timezone>
-        </contributor>
-    </contributors>
-
     <!-- All the modules of the Alfresco SDK -->
     <modules>
         <!-- Modules -->
@@ -123,28 +44,449 @@
         <module>archetypes/alfresco-share-jar-archetype</module>
         <module>archetypes/alfresco-allinone-archetype</module>
         <module>archetypes/archetypes-it</module>
-
-  </modules>
+    </modules>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
         <maven.archetype.version>3.0.0</maven.archetype.version>
         <alfresco.sdk.parent.version>${project.version}</alfresco.sdk.parent.version>
         <alfresco.sdk.tests.exclude>*/*-enterprise*/*</alfresco.sdk.tests.exclude>
 
         <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
-        <alfresco.platform.version>6.2.0-ea</alfresco.platform.version>
-        <alfresco.share.version>6.2.0</alfresco.share.version>
+        <alfresco.platform.version>25.2.0</alfresco.platform.version>
+        <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
+        <alfresco.share.docker.version>25.2.0</alfresco.share.docker.version>
+        <!--
+             The following value is now obtained by looking at the
+             - alfresco-community-share.version (eg. https://github.com/Alfresco/acs-community-packaging/blob/25.1.0/pom.xml#L17)
+             or
+             - alfresco-enterprise-share.version (eg. https://github.com/Alfresco/acs-packaging/blob/25.1.0/pom.xml#L18)
+             for the GitHub Tag related to the above Docker version.
+         -->
+        <alfresco.share.version>25.2.0.46</alfresco.share.version>
         <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
         <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
+        <keystore.settings>
+            -Dencryption.keystore.type=JCEKS -Dencryption.cipherAlgorithm=AES/CBC/PKCS5Padding -Dencryption.keyAlgorithm=AES -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore -Dmetadata-keystore.password=mp6yc0UD9e -Dmetadata-keystore.aliases=metadata -Dmetadata-keystore.metadata.password=oKIWzVdEdA -Dmetadata-keystore.metadata.algorithm=AES
+        </keystore.settings>
 
-        <test.acs.endpoint.path />
-
+        <test.acs.endpoint.path/>
         <scm.url.base>https://github.com/Alfresco/alfresco-sdk</scm.url.base>
     </properties>
 
+    <profiles>
+        <profile>
+            <id>internal-release</id>
+            <activation>
+                <property>
+                    <name>internal.release</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <distributionManagement>
+                <repository>
+                    <id>alfresco-releases</id>
+                    <url>https://artifacts.alfresco.com/nexus/content/repositories/releases/</url>
+                </repository>
+            </distributionManagement>
+        </profile>
+
+        <!-- 7.1 -->
+        <profile>
+            <id>community-71-tests</id>
+            <properties>
+                <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
+                <alfresco.platform.version>7.1.1.2</alfresco.platform.version>
+                <alfresco.share.docker.version>7.1.1.2</alfresco.share.docker.version>
+                <alfresco.share.version>13.10</alfresco.share.version>
+                <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
+                <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
+                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
+            </properties>
+        </profile>
+        <profile>
+            <id>enterprise-71-tests</id>
+            <properties>
+                <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
+                <alfresco.platform.version>7.1.1.2</alfresco.platform.version>
+                <alfresco.share.docker.version>7.1.1.2</alfresco.share.docker.version>
+                <alfresco.share.version>13.10</alfresco.share.version>
+                <alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image>
+                <alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image>
+                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
+            </properties>
+        </profile>
+
+        <!-- 7.2 -->
+        <profile>
+            <id>community-72-tests</id>
+            <properties>
+                <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
+                <alfresco.platform.version>7.2.1</alfresco.platform.version>
+                <alfresco.share.docker.version>7.2.1</alfresco.share.docker.version>
+                <alfresco.share.version>15.17</alfresco.share.version>
+                <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
+                <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
+                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
+            </properties>
+        </profile>
+        <profile>
+            <id>enterprise-72-tests</id>
+            <properties>
+                <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
+                <alfresco.platform.version>7.2.1</alfresco.platform.version>
+                <alfresco.share.docker.version>7.2.1</alfresco.share.docker.version>
+                <alfresco.share.version>15.17</alfresco.share.version>
+                <alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image>
+                <alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image>
+                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
+            </properties>
+        </profile>
+
+        <!-- 7.3 -->
+        <profile>
+            <id>community-73-tests</id>
+            <properties>
+                <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
+                <alfresco.platform.version>7.3.0</alfresco.platform.version>
+                <alfresco.share.docker.version>7.3.0</alfresco.share.docker.version>
+                <alfresco.share.version>17.137</alfresco.share.version>
+                <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
+                <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
+                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
+            </properties>
+        </profile>
+        <profile>
+            <id>enterprise-73-tests</id>
+            <properties>
+                <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
+                <alfresco.platform.version>7.3.0</alfresco.platform.version>
+                <alfresco.share.docker.version>7.3.0</alfresco.share.docker.version>
+                <alfresco.share.version>17.137</alfresco.share.version>
+                <alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image>
+                <alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image>
+                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
+            </properties>
+        </profile>
+
+        <!-- 7.4 -->
+        <profile>
+            <id>community-74-tests</id>
+            <properties>
+                <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
+                <alfresco.platform.version>7.4.0.1</alfresco.platform.version>
+                <alfresco.share.docker.version>7.4.0.1</alfresco.share.docker.version>
+                <alfresco.share.version>20.165</alfresco.share.version>
+                <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
+                <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
+                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
+            </properties>
+        </profile>
+        <profile>
+            <id>enterprise-74-tests</id>
+            <properties>
+                <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
+                <alfresco.platform.version>7.4.0.1</alfresco.platform.version>
+                <alfresco.share.docker.version>7.4.0.1</alfresco.share.docker.version>
+                <alfresco.share.version>20.165</alfresco.share.version>
+                <alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image>
+                <alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image>
+                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
+            </properties>
+        </profile>
+
+        <!-- 23.1 -->
+        <profile>
+            <id>community-231-tests</id>
+            <properties>
+                <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
+                <alfresco.platform.version>23.1.0</alfresco.platform.version>
+                <alfresco.share.docker.version>23.1.0</alfresco.share.docker.version>
+                <alfresco.share.version>23.1.0.269</alfresco.share.version>
+                <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
+                <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
+                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
+            </properties>
+        </profile>
+        <profile>
+            <id>enterprise-231-tests</id>
+            <properties>
+                <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
+                <alfresco.platform.version>23.1.0</alfresco.platform.version>
+                <alfresco.share.docker.version>23.1.0</alfresco.share.docker.version>
+                <alfresco.share.version>23.1.0.269</alfresco.share.version>
+                <alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image>
+                <alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image>
+                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
+            </properties>
+        </profile>
+
+        <!-- 23.2 -->
+        <profile>
+            <id>community-232-tests</id>
+            <properties>
+                <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
+                <alfresco.platform.version>23.2.1</alfresco.platform.version>
+                <alfresco.share.docker.version>23.2.1</alfresco.share.docker.version>
+                <alfresco.share.version>23.2.0.72</alfresco.share.version>
+                <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
+                <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
+                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
+            </properties>
+        </profile>
+        <profile>
+            <id>enterprise-232-tests</id>
+            <properties>
+                <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
+                <alfresco.platform.version>23.2.1</alfresco.platform.version>
+                <alfresco.share.docker.version>23.2.1</alfresco.share.docker.version>
+                <alfresco.share.version>23.2.0.72</alfresco.share.version>
+                <alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image>
+                <alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image>
+                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
+            </properties>
+        </profile>
+
+        <!-- 23.3 -->
+        <profile>
+            <id>community-233-tests</id>
+            <properties>
+                <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
+                <alfresco.platform.version>23.3.3</alfresco.platform.version>
+                <alfresco.share.docker.version>23.3.3</alfresco.share.docker.version>
+                <alfresco.share.version>23.3.0.85</alfresco.share.version>
+                <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
+                <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
+                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
+            </properties>
+        </profile>
+        <profile>
+            <id>enterprise-233-tests</id>
+            <properties>
+                <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
+                <alfresco.platform.version>23.3.3</alfresco.platform.version>
+                <alfresco.share.docker.version>23.3.3</alfresco.share.docker.version>
+                <alfresco.share.version>23.3.0.85</alfresco.share.version>
+                <alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image>
+                <alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image>
+                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
+            </properties>
+        </profile>
+
+        <!-- 23.4 -->
+        <profile>
+            <id>community-234-tests</id>
+            <properties>
+                <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
+                <alfresco.platform.version>23.4.1</alfresco.platform.version>
+                <alfresco.share.docker.version>23.4.1</alfresco.share.docker.version>
+                <alfresco.share.version>23.4.0.46</alfresco.share.version>
+                <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
+                <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
+                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
+            </properties>
+        </profile>
+        <profile>
+            <id>enterprise-234-tests</id>
+            <properties>
+                <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
+                <alfresco.platform.version>23.4.1</alfresco.platform.version>
+                <alfresco.share.docker.version>23.4.1</alfresco.share.docker.version>
+                <alfresco.share.version>23.4.0.46</alfresco.share.version>
+                <alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image>
+                <alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image>
+                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
+            </properties>
+        </profile>
+
+        <!-- 23.5 -->
+        <profile>
+            <id>enterprise-235-tests</id>
+            <properties>
+                <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
+                <alfresco.platform.version>23.5.0</alfresco.platform.version>
+                <alfresco.share.docker.version>23.5.0</alfresco.share.docker.version>
+                <alfresco.share.version>23.5.0.11</alfresco.share.version>
+                <alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image>
+                <alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image>
+                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
+            </properties>
+        </profile>
+
+        <!-- 25.1 -->
+        <profile>
+            <id>community-251-tests</id>
+            <properties>
+                <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
+                <alfresco.platform.version>25.1.0</alfresco.platform.version>
+                <alfresco.share.docker.version>25.1.0</alfresco.share.docker.version>
+                <alfresco.share.version>25.1.0.56</alfresco.share.version>
+                <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
+                <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
+                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
+            </properties>
+        </profile>
+        <profile>
+            <id>enterprise-251-tests</id>
+            <properties>
+                <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
+                <alfresco.platform.version>25.1.0</alfresco.platform.version>
+                <alfresco.share.docker.version>25.1.0</alfresco.share.docker.version>
+                <alfresco.share.version>25.1.0.56</alfresco.share.version>
+                <alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image>
+                <alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image>
+                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
+            </properties>
+        </profile>
+
+        <!-- 25.2 -->
+        <profile>
+            <id>community-252-tests</id>
+            <properties>
+                <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
+                <alfresco.platform.version>25.2.0</alfresco.platform.version>
+                <alfresco.share.docker.version>25.2.0</alfresco.share.docker.version>
+                <alfresco.share.version>25.2.0.46</alfresco.share.version>
+                <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
+                <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
+                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
+            </properties>
+        </profile>
+        <profile>
+            <id>enterprise-252-tests</id>
+            <properties>
+                <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
+                <alfresco.platform.version>25.2.0</alfresco.platform.version>
+                <alfresco.share.docker.version>25.2.0</alfresco.share.docker.version>
+                <alfresco.share.version>25.2.0.46</alfresco.share.version>
+                <alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image>
+                <alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image>
+                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>sdk-release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.sonatype.central</groupId>
+                        <artifactId>central-publishing-maven-plugin</artifactId>
+                        <version>0.8.0</version>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <publishingServerId>central</publishingServerId>
+                            <autoPublish>true</autoPublish>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <version>3.3.1</version>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>3.8.0</version>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.6</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                                <configuration>
+                                    <gpgArguments>
+                                        <arg>--pinentry-mode</arg>
+                                        <arg>loopback</arg>
+                                    </gpgArguments>
+                                    <passphrase>${gpg.passphrase}</passphrase>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-release-plugin</artifactId>
+                        <version>2.5.3</version>
+                        <configuration>
+                            <preparationGoals>clean install</preparationGoals>
+                            <goals>${maven.release.goals}</goals>
+                            <autoVersionSubmodules>true</autoVersionSubmodules>
+                            <releaseProfiles>sdk-release,enterprise-tests</releaseProfiles>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-project-info-reports-plugin</artifactId>
+                        <version>2.9</version>
+                    </plugin>
+                </plugins>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-site-plugin</artifactId>
+                            <version>3.6</version>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+            <reporting>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-changes-plugin</artifactId>
+                        <version>2.12.1</version>
+                        <reportSets>
+                            <reportSet>
+                                <reports>
+                                    <report>github-report</report>
+                                </reports>
+                            </reportSet>
+                        </reportSets>
+                        <configuration>
+                            <onlyCurrentVersion>true</onlyCurrentVersion>
+                            <includeOpenIssues>false</includeOpenIssues>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </reporting>
+        </profile>
+
+        <profile>
+            <id>docker-toolbox</id>
+            <properties>
+                <!-- Define the ACS endpoint path when docker toolbox is used (docker container are not exposed through localhost) -->
+                <test.acs.endpoint.path>http://192.168.99.100:8080/alfresco</test.acs.endpoint.path>
+            </properties>
+        </profile>
+    </profiles>
+
     <build>
         <pluginManagement>
             <plugins>
@@ -237,10 +579,18 @@
                 </excludes>
             </testResource>
         </testResources>
-
     </build>
 
     <repositories>
+        <repository>
+            <id>central</id>
+            <name>Central Repository</name>
+            <url>https://repo.maven.apache.org/maven2</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
         <repository>
             <id>alfresco-public</id>
             <url>https://artifacts.alfresco.com/nexus/content/groups/public
@@ -254,21 +604,29 @@
                 <enabled>true</enabled>
             </snapshots>
         </repository>
-        <!-- Activiti Enterprise Edition Artifacts, put username/pwd for server in settings.xml -->
+        <repository>
+            <id>alfresco-private-repository</id>
+            <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
+        </repository>
+        <!-- Activiti Enterprise Edition Artifacts, put username/pwd for server in .ci.settings.xml -->
         <repository>
             <id>activiti-private-repository</id>
             <url>https://artifacts.alfresco.com/nexus/content/repositories/activiti-enterprise-releases</url>
         </repository>
+        <repository>
+            <id>alfresco-internal</id>
+            <url>https://artifacts.alfresco.com/nexus/content/groups/internal</url>
+        </repository>
     </repositories>
 
     <distributionManagement>
         <repository>
-            <id>central-releases-staging</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
+            <id>alfresco-public</id>
+            <url>https://nexus.alfresco.com/nexus/repository/releases</url>
         </repository>
         <snapshotRepository>
-            <id>central-snapshots</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <id>alfresco-public-snapshots</id>
+            <url>https://artifacts.alfresco.com/nexus/content/repositories/snapshots</url>
         </snapshotRepository>
         <site>
             <id>alfresco-docs</id>
@@ -276,207 +634,81 @@
         </site>
     </distributionManagement>
 
-    <profiles>
-        <profile>
-            <id>internal-release</id>
-            <activation>
-                <property>
-                    <name>internal.release</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <distributionManagement>
-                <repository>
-                    <id>alfresco-releases</id>
-                    <url>https://artifacts.alfresco.com/nexus/content/repositories/releases/</url>
-                </repository>
-            </distributionManagement>
-        </profile>
+    <developers>
+        <developer>
+            <id>ohej</id>
+            <name>Ole Hejlskov</name>
+            <email>ole@phpfreak.dk</email>
+            <url>http://ohej.dk/</url>
+            <organization>Alfresco</organization>
+            <organizationUrl>http://www.alfresco.com</organizationUrl>
+            <timezone>+1</timezone>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <id>gravitonian</id>
+            <name>Martin Bergljung</name>
+            <email>martin.bergljung@alfresco.com</email>
+            <url>https://sites.google.com/site/gravitonian/</url>
+            <organization>Alfresco Software</organization>
+            <organizationUrl>http://www.alfresco.com</organizationUrl>
+            <timezone>+0</timezone>
+            <roles>
+                <role>Architect</role>
+                <role>Developer</role>
+            </roles>
+        </developer>
+    </developers>
 
-        <!-- 6.0 -->
-        <profile>
-            <id>community-60-tests</id>
-            <properties>
-                <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
-                <alfresco.platform.version>6.0.7-ga</alfresco.platform.version>
-                <alfresco.share.version>6.0.b</alfresco.share.version>
-                <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
-                <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>enterprise-60-tests</id>
-            <properties>
-                <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
-                <alfresco.platform.version>6.0.0.2</alfresco.platform.version>
-                <alfresco.share.version>6.0</alfresco.share.version>
-                <alfresco.platform.docker.image>alfresco/alfresco-content-repository</alfresco.platform.docker.image>
-                <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
-            </properties>
-        </profile>
-
-        <!-- 6.1 -->
-        <!-- This profiles requires to be executed using Java 11 -->
-        <profile>
-            <id>community-61-tests</id>
-            <properties>
-                <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
-                <alfresco.platform.version>6.1.2-ga</alfresco.platform.version>
-                <alfresco.share.version>6.1.0-RC3</alfresco.share.version>
-                <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
-                <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>enterprise-61-tests</id>
-            <properties>
-                <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
-                <alfresco.platform.version>6.1.0</alfresco.platform.version>
-                <alfresco.share.version>6.1.0</alfresco.share.version>
-                <alfresco.platform.docker.image>alfresco/alfresco-content-repository</alfresco.platform.docker.image>
-                <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
-            </properties>
-        </profile>
-
-        <!-- 6.2 -->
-        <!-- This profiles requires to be executed using Java 11 -->
-        <profile>
-            <id>community-62-tests</id>
-            <properties>
-                <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
-                <alfresco.platform.version>6.2.0-ea</alfresco.platform.version>
-                <alfresco.share.version>6.2.0</alfresco.share.version>
-                <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
-                <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>enterprise-62-tests</id>
-            <properties>
-                <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
-                <alfresco.platform.version>6.2.0</alfresco.platform.version>
-                <alfresco.share.version>6.2.0</alfresco.share.version>
-                <alfresco.platform.docker.image>alfresco/alfresco-content-repository</alfresco.platform.docker.image>
-                <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
-            </properties>
-        </profile>
-
-        <profile>
-            <id>sdk-release</id>
-            <properties>
-                <maven.site.url>https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-sdk-aggregator/latest</maven.site.url>
-                <maven.release.goals>deploy site-deploy</maven.release.goals>
-            </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.6</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-release-plugin</artifactId>
-                        <version>2.5.3</version>
-                        <configuration>
-                            <preparationGoals>clean install</preparationGoals>
-                            <goals>${maven.release.goals}</goals>
-                            <autoVersionSubmodules>true</autoVersionSubmodules>
-                            <releaseProfiles>sdk-release,enterprise-tests</releaseProfiles>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-project-info-reports-plugin</artifactId>
-                        <version>2.9</version>
-                    </plugin>
-                </plugins>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-site-plugin</artifactId>
-                            <version>3.6</version>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-            <reporting>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-changes-plugin</artifactId>
-                        <version>2.12.1</version>
-                        <reportSets>
-                            <reportSet>
-                                <reports>
-                                    <report>github-report</report>
-                                </reports>
-                            </reportSet>
-                        </reportSets>
-                        <configuration>
-                            <onlyCurrentVersion>true</onlyCurrentVersion>
-                            <includeOpenIssues>false</includeOpenIssues>
-
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </reporting>
-        </profile>
-
-        <profile>
-            <id>docker-toolbox</id>
-            <properties>
-                <!-- Define the ACS endpoint path when docker toolbox is used (docker container are not exposed through localhost) -->
-                <test.acs.endpoint.path>http://192.168.99.100:8080/alfresco</test.acs.endpoint.path>
-            </properties>
-        </profile>
-
-        <!-- Attempt (failed) to retain run.sh permissions. Zip files are bad at this, full stop.
-        <profile>
-            <id>set-executables-permissions</id>
-            <activation>
-                <file>
-                    <exists>src/main/resources/archetype-resources/run.sh</exists>
-                </file>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.6</version>
-                        <executions>
-                            <execution>
-                                <id>set-executable-resources</id>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <phase>process-resources</phase>
-                                <configuration>
-                                    <target>
-                                        <chmod file="${project.build.outputDirectory}/archetype-resources/run.sh" perm="755" />
-                                    </target>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-         -->
-    </profiles>
-
-</project>
+    <contributors>
+        <contributor>
+            <name>Gabriele Columbro</name>
+            <email>gabriele.columbro@alfresco.com</email>
+            <url>http://mindthegab.com</url>
+            <organization>Alfresco Software</organization>
+            <organizationUrl>http://www.alfresco.com</organizationUrl>
+            <timezone>-5</timezone>
+        </contributor>
+        <contributor>
+            <name>Maurizio Pillitu</name>
+            <email>maurizio.pillitu@alfresco.com</email>
+            <url>http://session.it</url>
+            <organization>Alfresco Software</organization>
+            <organizationUrl>http://www.alfresco.com</organizationUrl>
+            <timezone>+1</timezone>
+        </contributor>
+        <contributor>
+            <name>Carlo Sciolla</name>
+            <email>carlo@backbase.com</email>
+            <organization>Backbase</organization>
+            <organizationUrl>http://www.backbase.com</organizationUrl>
+            <timezone>+1</timezone>
+            <url>http://skuro.tk</url>
+        </contributor>
+        <contributor>
+            <name>Samuel Langlois</name>
+            <email>samuel.langlois@alfresco.com</email>
+            <organization>Alfresco Software</organization>
+            <organizationUrl>http://www.alfresco.com</organizationUrl>
+            <timezone>+0</timezone>
+            <url>https://twitter.com/samuel_langlois</url>
+        </contributor>
+        <contributor>
+            <name>Ray Gauss II</name>
+            <email>ray.gauss@alfresco.com</email>
+            <organization>Alfresco Software</organization>
+            <organizationUrl>http://www.alfresco.com</organizationUrl>
+            <timezone>-5</timezone>
+            <url>http://rgauss.com/</url>
+        </contributor>
+        <contributor>
+            <name>Jose Luis Osorno Gil</name>
+            <email>joseluis.osorno@ixxus.com</email>
+            <organization>Ixxus</organization>
+            <organizationUrl>http://www.ixxus.com</organizationUrl>
+            <timezone>+1</timezone>
+        </contributor>
+    </contributors>
+</project>

src/site/apt/prerequisites.apt.vm

@@ -20,7 +20,7 @@ Alfresco SDK\x99 Pre-Requisites
      Alfresco platform is retrieved automatically from {{{https://artifacts.alfresco.com} the Alfresco Artifacts Repository}}
      based on the <<<alfresco.groupId>>> and <<<alfresco.version>>> POM properties 
 
-    * If you're an Alfresco customer, you can setup a ~/.m2/settings.xml as documented on {{{http://docs.alfresco.com/4.2/tasks/dev-extensions-maven-sdk-tutorials-configure-maven-enterprise.html} Alfresco Docs page}} and specify <<<-Penterprise>>> on your Maven build command to use the latest Alfresco Enterprise version
+    * If you're an Alfresco customer, you can setup a ~/.m2/settings.xml as documented on {{{https://docs.alfresco.com/content-services/latest/develop/sdk/#how-to-configure-private-alfresco-nexus-repository-enterprisemvnrepo} Alfresco Docs page}} and specify <<<-Penterprise>>> on your Maven build command to use the latest Alfresco Enterprise version
 
 
 Enable hot class reload with spring-loaded

srcclr.yml

@@ -0,0 +1,3 @@
+# To avoid the provided dependencies we set the scope to runtime. See: https://docs.veracode.com/r/c_sc_scan_directives
+# runtime: to restrict the scan to compile and runtime dependencies.
+scope: runtime