ACS-5413 Prepare SDK 4.6 Release (#650)

Alfresco · Jun 21, 2023 · 019c5c7 · 019c5c7
1 parent 693fde6
commit 019c5c7
Show file tree

Hide file tree

Showing 14 changed files with 88 additions and 48 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -56,6 +56,18 @@ jobs:
             java-version: 17
           - name: "current version Java 11"
             java-version: 11
+          - 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

diff --git a/README.md b/README.md
@@ -15,6 +15,7 @@ If you are an Enterprise customer check the [Support](#alfresco-enterprise-custo
 
 ## News
 
+- 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
@@ -76,7 +77,7 @@ the `alfresco.log` file has also been moved to a more appropriate location (Tomc
 
 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 or SDK 4.4 instead of SDK 4.5.
+Depending on the Platform version desired, you might need to use SDK 4.1, 4.3, 4.4 or SDK 4.5 instead of SDK 4.6.
 
 - 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
@@ -90,23 +91,24 @@ It's also important to remember that:
 - Enterprise Docker images are published on *Quay.io*
 
 ### Latest Documentation
-To get started with **Alfresco SDK 4.5.x** (latest) visit the [Alfresco Documentation](docs/README.md).
+To get started with **Alfresco SDK 4.6.x** (latest) visit the [Alfresco Documentation](docs/README.md).
 
 #### Documentation about Previous Versions
-| SDK Version |          Alfresco Enterprise Version           |       Alfresco Community Version       | Documentation  |
-|-------------|:----------------------------------------------:|:--------------------------------------:|:-----|
-| 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 |
+| SDK Version |          Alfresco Enterprise Version           |           Alfresco Community Version           | Documentation                                                              |
+|-------------|:----------------------------------------------:|:----------------------------------------------:|:---------------------------------------------------------------------------|
+| 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/).

diff --git a/...es/alfresco-allinone-archetype/src/main/resources/archetype-resources/README.md b/...es/alfresco-allinone-archetype/src/main/resources/archetype-resources/README.md
@@ -1,6 +1,6 @@
-# Alfresco AIO Project - SDK 4.5
+# Alfresco AIO Project - SDK 4.6
 
-This is an All-In-One (AIO) project for Alfresco SDK 4.5.
+This is an All-In-One (AIO) project for Alfresco SDK 4.6.
 
 Run with `./run.sh build_start` or `./run.bat build_start` and verify that it
 

diff --git a/...etype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/pom.xml b/...etype/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.5</description>
+    <description>Integration Tests module for in-container integration testing - part of AIO - SDK 4.6</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) -->
 

diff --git a/...none-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/pom.xml b/...none-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.5
-    </description>
+    <description>Platform/Repo JAR Module (to be included in the alfresco.war) - part of AIO - SDK 4.6</description>
     <packaging>jar</packaging>
 
     <parent>

diff --git a/...llinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/pom.xml b/...llinone-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.5</description>
+    <description>Sample Share JAR Module (to be included in the share.war) - part of AIO - SDK 4.6</description>
 
     <parent>
         <groupId>${groupId}</groupId>

diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml b/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.5</name>
-    <description>All-In-One (AIO) project for SDK 4.5</description>
+    <name>AIO - SDK 4.6</name>
+    <description>All-In-One (AIO) project for SDK 4.6</description>
     <packaging>pom</packaging>
 
     <prerequisites>

diff --git a/...lfresco-platform-jar-archetype/src/main/resources/archetype-resources/README.md b/...lfresco-platform-jar-archetype/src/main/resources/archetype-resources/README.md
@@ -1,6 +1,6 @@
-# Alfresco ACS JAR Module - SDK 4.5
+# Alfresco ACS JAR Module - SDK 4.6
 
-This is an ACS project for Alfresco SDK 4.5.
+This is an ACS project for Alfresco SDK 4.6.
 
 Run with `./run.sh build_start` or `./run.bat build_start` and verify that it
 

diff --git a/...s/alfresco-share-jar-archetype/src/main/resources/archetype-resources/README.md b/...s/alfresco-share-jar-archetype/src/main/resources/archetype-resources/README.md
@@ -1,6 +1,6 @@
-# Alfresco Share JAR Module - SDK 4.5
+# Alfresco Share JAR Module - SDK 4.6
 
-This is a Share project for Alfresco SDK 4.5.
+This is a Share project for Alfresco SDK 4.6.
 
 Run with `./run.sh build_start` or `./run.bat build_start` and verify that it
 

diff --git a/docs/README.md b/docs/README.md
@@ -1,7 +1,7 @@
 ---
-Title: Alfresco SDK 4.5
+Title: Alfresco SDK 4.6
 Added: v3.0.0
-Last reviewed: 2022-09-22
+Last reviewed: 2023-06-20
 ---
 # Alfresco SDK 4
 
@@ -18,7 +18,7 @@ Alfresco SDK 4.x is released under [Apache License version 2.0](http://www.apach
 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.5 is a minor update to the SDK and provides support for Alfresco 7.3.x.
+Alfresco SDK 4.6 is a minor update to the SDK and provides support for Alfresco 7.4.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.

diff --git a/docs/getting-started.md b/docs/getting-started.md
@@ -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.5.0.
+3. Choose the latest version, such as 4.6.0.
 
 ```
 Choose org.alfresco.maven.archetype:alfresco-allinone-archetype version:
@@ -140,6 +140,7 @@ Choose org.alfresco.maven.archetype:alfresco-allinone-archetype version:
 16: 4.3.0
 17: 4.4.0
 18: 4.5.0
+19: 4.6.0
 ```
 
 4. Next you will be prompted for additional values, like groupId, artifactId, and package, as shown below:
@@ -168,7 +169,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.5.0
+[INFO] Using following parameters for creating project from Archetype: alfresco-allinone-archetype:4.6.0
 [INFO] ----------------------------------------------------------------------------
 [INFO] Parameter: groupId, Value: com.acme
 [INFO] Parameter: artifactId, Value: my-all-in-one

diff --git a/docs/whats-new.md b/docs/whats-new.md
@@ -10,7 +10,7 @@ Alfresco Share 6.
 
 This was a mayor release oriented to support Alfresco 6, so it is not compatible with previous versions of the SDK.
 
-Alfresco SDK 4.4 extends the support to Alfresco 7.2. 
+Alfresco SDK 4.6 extends the support to Alfresco 7.4. 
 Use an older SDK version for Alfresco 6. 
 
 ## Embracing containers and Docker
@@ -64,13 +64,13 @@ environment can be more similar to a real one, including whatever other service
 
 Alfresco SDK 4.1 provides support for Alfresco 6.2.x.
 
-## Support for Alfresco 7.0.x, 7.1.x, and 7.2.x
+## Support for Alfresco 7.0.x, 7.1.x, 7.2.x, 7.3.x and 7.4.x
 
-Alfresco SDK 4.4 provides support for Alfresco 7.0.x, 7.1.x, and 7.2.x.
+Alfresco SDK 4.6 provides support for Alfresco 7.0.x, 7.1.x, 7.2.x, 7.3.x and 7.4.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.5 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 you can
-now use SDK 4.5 + JDK 17 to work on them. The Apache Maven plugins included in the archetypes has been updated to avoid any issue with Java 17.
+Alfresco SDK 4.5 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 you can
+now use SDK 4.5 (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.
diff --git a/docs/working-with-generated-projects/working-with-aio.md b/docs/working-with-generated-projects/working-with-aio.md
@@ -78,7 +78,7 @@ my-all-in-one-project mbergljung$ ./run.sh build_start
 [INFO] ------------------------------------------------------------------------
 [INFO] Reactor Build Order:
 [INFO]
-[INFO] AIO - SDK 4.5
+[INFO] AIO - SDK 4.6
 [INFO] Alfresco Platform/Repository JAR Module
 [INFO] Alfresco Share JAR Module
 [INFO] Integration Tests Module
@@ -88,7 +88,7 @@ my-all-in-one-project mbergljung$ ./run.sh build_start
 [INFO] ------------------------------------------------------------------------
 [INFO] Reactor Summary:
 [INFO]
-[INFO] AIO - SDK 4.5 ...................................... SUCCESS [  0.680 s]
+[INFO] AIO - SDK 4.6 ...................................... 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]

diff --git a/pom.xml b/pom.xml
@@ -30,7 +30,7 @@
         <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.4.0</tag>
+        <tag>alfresco-sdk-aggregator-4.6.0-SNAPSHOT</tag>
     </scm>
 
     <!-- All the modules of the Alfresco SDK -->
@@ -49,24 +49,24 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
+        <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>7.3.0</alfresco.platform.version>
+        <alfresco.platform.version>7.4.0.1</alfresco.platform.version>
         <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
-        <alfresco.share.docker.version>7.3.0</alfresco.share.docker.version>
+        <alfresco.share.docker.version>7.4.0.1</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/7.2.1/pom.xml#L17)
+             - alfresco-community-share.version (eg. https://github.com/Alfresco/acs-community-packaging/blob/7.4.0.1/pom.xml#L17)
              or
-             - alfresco-enterprise-share.version (eg. https://github.com/Alfresco/acs-packaging/blob/7.2.1/pom.xml#L18)
+             - alfresco-enterprise-share.version (eg. https://github.com/Alfresco/acs-packaging/blob/7.4.0.1/pom.xml#L18)
              for the GitHub Tag related to the above Docker version.
          -->
-        <alfresco.share.version>17.137</alfresco.share.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>
         <keystore.settings>
@@ -198,6 +198,32 @@
             </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>
+
         <profile>
             <id>sdk-release</id>
             <properties>