Skip to content

Commit

Permalink
SDK 4.5
Browse files Browse the repository at this point in the history
Add tests for ACS 7.3.
Add java 17 profile.

Co-authored-by: Grzegorz Oleksy <grzegorz.oleksy@hyland.com>
Co-authored-by: mstrankowski <marcin.strankowski@hyland.com>
  • Loading branch information
3 people authored Oct 27, 2022
1 parent 35e2800 commit 0a082f3
Show file tree
Hide file tree
Showing 21 changed files with 130 additions and 54 deletions.
48 changes: 44 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ import:

dist: focal

jdk:
- openjdk17
- openjdk11

git:
depth: false
quiet: true
Expand All @@ -15,7 +19,7 @@ branches:
- master
- /feature\/.*/
- /fix\/.*/
- sdk-4.4
- sdk-4.5

stages:
- name: test
Expand All @@ -29,38 +33,74 @@ env:

jobs:
include:

- name: "current version"
- name: "current version Java 17"
stage: test
script:
jdk: openjdk17
script:
- ${MAVEN_INSTALL_CMD}

- name: "current version Java 11"
stage: test
jdk: openjdk11
script:
- ${MAVEN_INSTALL_CMD}

- name: "7.3 Enterprise Java 17"
stage: test
jdk: openjdk17
script:
- ${MAVEN_INSTALL_CMD} -Penterprise-73-tests

- name: "7.3 Community Java 17"
stage: test
jdk: openjdk17
script:
- ${MAVEN_INSTALL_CMD} -Pcommunity-73-tests

- name: "7.3 Enterprise Java 11"
stage: test
jdk: openjdk11
script:
- ${MAVEN_INSTALL_CMD} -Penterprise-73-tests

- name: "7.3 Community Java 11"
stage: test
jdk: openjdk11
script:
- ${MAVEN_INSTALL_CMD} -Pcommunity-73-tests

- name: "7.2 Enterprise"
stage: test
jdk: openjdk11
script:
- ${MAVEN_INSTALL_CMD} -Penterprise-72-tests

- name: "7.2 Community"
stage: test
jdk: openjdk11
script:
- ${MAVEN_INSTALL_CMD} -Pcommunity-72-tests

- name: "7.1 Enterprise"
stage: test
jdk: openjdk11
script:
- ${MAVEN_INSTALL_CMD} -Penterprise-71-tests

- name: "7.1 Community"
stage: test
jdk: openjdk11
script:
- ${MAVEN_INSTALL_CMD} -Pcommunity-71-tests

- name: "7.0 Enterprise"
stage: test
jdk: openjdk11
script:
- ${MAVEN_INSTALL_CMD} -Penterprise-70-tests

- name: "7.0 Community"
stage: test
jdk: openjdk11
script:
- ${MAVEN_INSTALL_CMD} -Pcommunity-70-tests
34 changes: 18 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ If you are an Enterprise customer check the [Support](#alfresco-enterprise-custo

## News

- 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
Expand Down Expand Up @@ -75,9 +76,9 @@ 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 or SDK 4.3 instead of SDK 4.4.
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.

- For Enterprise and Community versions of 7.x, SDK 4.4 must be used
- 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

Expand All @@ -89,22 +90,23 @@ It's also important to remember that:
- Enterprise Docker images are published on *Quay.io*

### Latest Documentation
To get started with **Alfresco SDK 4.4.x** (latest) visit the [Alfresco Documentation](docs/README.md).
To get started with **Alfresco SDK 4.5.x** (latest) visit the [Alfresco Documentation](docs/README.md).

#### Documentation about Previous Versions
| SDK Version | Alfresco Enterprise Version | Alfresco Community Version | Documentation |
| ------------- |:-------------:| :-----:|:-----|
| 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.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/).
Expand Down
2 changes: 1 addition & 1 deletion archetypes/alfresco-allinone-archetype/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.alfresco.maven</groupId>
<artifactId>alfresco-sdk-aggregator</artifactId>
<version>4.5.0-SNAPSHOT</version>
<version>4.5.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Alfresco AIO Project - SDK 4.4
# Alfresco AIO Project - SDK 4.5

This is an All-In-One (AIO) project for Alfresco SDK 4.4.
This is an All-In-One (AIO) project for Alfresco SDK 4.5.

Run with `./run.sh build_start` or `./run.bat build_start` and verify that it

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.4</description>
<description>Integration Tests module for in-container integration testing - part of AIO - SDK 4.5</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) -->

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +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.4
<description>Platform/Repo JAR Module (to be included in the alfresco.war) - part of AIO - SDK 4.5
</description>
<packaging>jar</packaging>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.4</description>
<description>Sample Share JAR Module (to be included in the share.war) - part of AIO - SDK 4.5</description>

<parent>
<groupId>${groupId}</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
<name>AIO - SDK 4.4</name>
<description>All-In-One (AIO) project for SDK 4.4</description>
<name>AIO - SDK 4.5</name>
<description>All-In-One (AIO) project for SDK 4.5</description>
<packaging>pom</packaging>

<prerequisites>
Expand Down Expand Up @@ -59,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>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/alfresco-platform-jar-archetype/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>org.alfresco.maven</groupId>
<artifactId>alfresco-sdk-aggregator</artifactId>
<version>4.5.0-SNAPSHOT</version>
<version>4.5.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Alfresco ACS JAR Module - SDK 4.4
# Alfresco ACS JAR Module - SDK 4.5

This is an ACS project for Alfresco SDK 4.4.
This is an ACS project for Alfresco SDK 4.5.

Run with `./run.sh build_start` or `./run.bat build_start` and verify that it

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,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>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/alfresco-share-jar-archetype/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>org.alfresco.maven</groupId>
<artifactId>alfresco-sdk-aggregator</artifactId>
<version>4.5.0-SNAPSHOT</version>
<version>4.5.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Alfresco Share JAR Module - SDK 4.4
# Alfresco Share JAR Module - SDK 4.5

This is a Share project for Alfresco SDK 4.4.
This is a Share project for Alfresco SDK 4.5.

Run with `./run.sh build_start` or `./run.bat build_start` and verify that it

Expand Down
2 changes: 1 addition & 1 deletion archetypes/archetypes-it/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.alfresco.maven</groupId>
<artifactId>alfresco-sdk-aggregator</artifactId>
<version>4.5.0-SNAPSHOT</version>
<version>4.5.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
6 changes: 3 additions & 3 deletions docs/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
Title: Alfresco SDK 4.4
Title: Alfresco SDK 4.5
Added: v3.0.0
Last reviewed: 2022-03-22
Last reviewed: 2022-09-22
---
# Alfresco SDK 4

Expand All @@ -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.4 is a minor update to the SDK and provides support for Alfresco 7.2.x.
Alfresco SDK 4.5 is a minor update to the SDK and provides support for Alfresco 7.3.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.
Expand Down
5 changes: 3 additions & 2 deletions docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.0.
3. Choose the latest version, such as 4.5.0.

```
Choose org.alfresco.maven.archetype:alfresco-allinone-archetype version:
Expand All @@ -139,6 +139,7 @@ Choose org.alfresco.maven.archetype:alfresco-allinone-archetype version:
15: 4.2.0
16: 4.3.0
17: 4.4.0
18: 4.5.0
```

4. Next you will be prompted for additional values, like groupId, artifactId, and package, as shown below:
Expand Down Expand Up @@ -167,7 +168,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.4.0
[INFO] Using following parameters for creating project from Archetype: alfresco-allinone-archetype:4.5.0
[INFO] ----------------------------------------------------------------------------
[INFO] Parameter: groupId, Value: com.acme
[INFO] Parameter: artifactId, Value: my-all-in-one
Expand Down
7 changes: 7 additions & 0 deletions docs/whats-new.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,10 @@ Alfresco SDK 4.1 provides support for Alfresco 6.2.x.
## Support for Alfresco 7.0.x, 7.1.x, and 7.2.x

Alfresco SDK 4.4 provides support for Alfresco 7.0.x, 7.1.x, and 7.2.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.
4 changes: 2 additions & 2 deletions docs/working-with-generated-projects/working-with-aio.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ my-all-in-one-project mbergljung$ ./run.sh build_start
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Build Order:
[INFO]
[INFO] AIO - SDK 4.4
[INFO] AIO - SDK 4.5
[INFO] Alfresco Platform/Repository JAR Module
[INFO] Alfresco Share JAR Module
[INFO] Integration Tests Module
Expand All @@ -88,7 +88,7 @@ my-all-in-one-project mbergljung$ ./run.sh build_start
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO]
[INFO] AIO - SDK 4.4 ...................................... SUCCESS [ 0.680 s]
[INFO] AIO - SDK 4.5 ...................................... 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]
Expand Down
2 changes: 1 addition & 1 deletion modules/alfresco-rad/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.alfresco.maven</groupId>
<artifactId>alfresco-sdk-aggregator</artifactId>
<version>4.5.0-SNAPSHOT</version>
<version>4.5.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion plugins/alfresco-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco.maven</groupId>
<artifactId>alfresco-sdk-aggregator</artifactId>
<version>4.5.0-SNAPSHOT</version>
<version>4.5.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Loading

0 comments on commit 0a082f3

Please sign in to comment.