Skip to content

Commit 0a082f3

Browse files
kmagdziarzgoleksyalfrescomstrankowski
authored
SDK 4.5
Add tests for ACS 7.3. Add java 17 profile. Co-authored-by: Grzegorz Oleksy <[email protected]> Co-authored-by: mstrankowski <[email protected]>
1 parent 35e2800 commit 0a082f3

File tree

21 files changed

+130
-54
lines changed

21 files changed

+130
-54
lines changed

‎.travis.yml

+44-4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ import:
66

77
dist: focal
88

9+
jdk:
10+
- openjdk17
11+
- openjdk11
12+
913
git:
1014
depth: false
1115
quiet: true
@@ -15,7 +19,7 @@ branches:
1519
- master
1620
- /feature\/.*/
1721
- /fix\/.*/
18-
- sdk-4.4
22+
- sdk-4.5
1923

2024
stages:
2125
- name: test
@@ -29,38 +33,74 @@ env:
2933

3034
jobs:
3135
include:
32-
33-
- name: "current version"
36+
- name: "current version Java 17"
3437
stage: test
35-
script:
38+
jdk: openjdk17
39+
script:
3640
- ${MAVEN_INSTALL_CMD}
3741

42+
- name: "current version Java 11"
43+
stage: test
44+
jdk: openjdk11
45+
script:
46+
- ${MAVEN_INSTALL_CMD}
47+
48+
- name: "7.3 Enterprise Java 17"
49+
stage: test
50+
jdk: openjdk17
51+
script:
52+
- ${MAVEN_INSTALL_CMD} -Penterprise-73-tests
53+
54+
- name: "7.3 Community Java 17"
55+
stage: test
56+
jdk: openjdk17
57+
script:
58+
- ${MAVEN_INSTALL_CMD} -Pcommunity-73-tests
59+
60+
- name: "7.3 Enterprise Java 11"
61+
stage: test
62+
jdk: openjdk11
63+
script:
64+
- ${MAVEN_INSTALL_CMD} -Penterprise-73-tests
65+
66+
- name: "7.3 Community Java 11"
67+
stage: test
68+
jdk: openjdk11
69+
script:
70+
- ${MAVEN_INSTALL_CMD} -Pcommunity-73-tests
71+
3872
- name: "7.2 Enterprise"
3973
stage: test
74+
jdk: openjdk11
4075
script:
4176
- ${MAVEN_INSTALL_CMD} -Penterprise-72-tests
4277

4378
- name: "7.2 Community"
4479
stage: test
80+
jdk: openjdk11
4581
script:
4682
- ${MAVEN_INSTALL_CMD} -Pcommunity-72-tests
4783

4884
- name: "7.1 Enterprise"
4985
stage: test
86+
jdk: openjdk11
5087
script:
5188
- ${MAVEN_INSTALL_CMD} -Penterprise-71-tests
5289

5390
- name: "7.1 Community"
5491
stage: test
92+
jdk: openjdk11
5593
script:
5694
- ${MAVEN_INSTALL_CMD} -Pcommunity-71-tests
5795

5896
- name: "7.0 Enterprise"
5997
stage: test
98+
jdk: openjdk11
6099
script:
61100
- ${MAVEN_INSTALL_CMD} -Penterprise-70-tests
62101

63102
- name: "7.0 Community"
64103
stage: test
104+
jdk: openjdk11
65105
script:
66106
- ${MAVEN_INSTALL_CMD} -Pcommunity-70-tests

‎README.md

+18-16
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ If you are an Enterprise customer check the [Support](#alfresco-enterprise-custo
1515

1616
## News
1717

18+
- 2022-10: Alfresco SDK 4.5.0 released
1819
- 2022-03: Alfresco SDK 4.4.0 released
1920
- 2021-10: Alfresco SDK 4.3.0 released
2021
- 2021-02: Alfresco SDK 4.2.0 released
@@ -75,9 +76,9 @@ the `alfresco.log` file has also been moved to a more appropriate location (Tomc
7576

7677
In Q4 2020, Alfresco Platform has undergone a major structural refactoring.
7778

78-
Depending on the Platform version desired, you might need to use SDK 4.1 or SDK 4.3 instead of SDK 4.4.
79+
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.
7980

80-
- For Enterprise and Community versions of 7.x, SDK 4.4 must be used
81+
- For Enterprise and Community versions of 7.x, SDK 4.4 or higher must be used
8182
- For Enterprise versions of 6.0.x, 6.1.x, 6.2.x newer than November 2020, SDK 4.3 must be used
8283
- 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
8384

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

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

9495
#### Documentation about Previous Versions
95-
| SDK Version | Alfresco Enterprise Version | Alfresco Community Version | Documentation |
96-
| ------------- |:-------------:| :-----:|:-----|
97-
| 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 |
98-
| 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 |
99-
| 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 |
100-
| 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 |
101-
| 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 |
102-
| SDK 3.1 | Alfresco 5.2.x | Alfresco 5.2.x | http://docs.alfresco.com/5.2/concepts/sdk-intro.html |
103-
| SDK 3.0 | Alfresco 5.2.x | Alfresco 5.2.x | http://docs.alfresco.com/5.2/concepts/sdk-intro.html |
104-
| SDK 2.2 | Alfresco 5.1.x | Alfresco 5.1.x | https://docs.alfresco.com/5.1/concepts/alfresco-sdk-intro.html |
105-
| SDK 2.1 | Alfresco 5.0.1 | Alfresco 5.0.d | https://docs.alfresco.com/sdk2.1/concepts/alfresco-sdk-intro.html |
106-
| SDK 2.0 | Alfresco 5.0.0 | Alfresco 5.0.c | https://docs.alfresco.com/sdk2.0/concepts/alfresco-sdk-intro.html |
107-
| 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 |
96+
| SDK Version | Alfresco Enterprise Version | Alfresco Community Version | Documentation |
97+
|-------------|:----------------------------------------------:|:--------------------------------------:|:-----|
98+
| 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 |
99+
| 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 |
100+
| 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 |
101+
| 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 |
102+
| 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 |
103+
| 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 |
104+
| SDK 3.1 | Alfresco 5.2.x | Alfresco 5.2.x | http://docs.alfresco.com/5.2/concepts/sdk-intro.html |
105+
| SDK 3.0 | Alfresco 5.2.x | Alfresco 5.2.x | http://docs.alfresco.com/5.2/concepts/sdk-intro.html |
106+
| SDK 2.2 | Alfresco 5.1.x | Alfresco 5.1.x | https://docs.alfresco.com/5.1/concepts/alfresco-sdk-intro.html |
107+
| SDK 2.1 | Alfresco 5.0.1 | Alfresco 5.0.d | https://docs.alfresco.com/sdk2.1/concepts/alfresco-sdk-intro.html |
108+
| SDK 2.0 | Alfresco 5.0.0 | Alfresco 5.0.c | https://docs.alfresco.com/sdk2.0/concepts/alfresco-sdk-intro.html |
109+
| 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 |
108110

109111
## Reporting Issues and Community Support
110112
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/).

‎archetypes/alfresco-allinone-archetype/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>org.alfresco.maven</groupId>
1313
<artifactId>alfresco-sdk-aggregator</artifactId>
14-
<version>4.5.0-SNAPSHOT</version>
14+
<version>4.5.0</version>
1515
<relativePath>../../pom.xml</relativePath>
1616
</parent>
1717

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Alfresco AIO Project - SDK 4.4
1+
# Alfresco AIO Project - SDK 4.5
22

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

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<artifactId>${artifactId}</artifactId>
66
<name>Integration Tests Module</name>
7-
<description>Integration Tests module for in-container integration testing - part of AIO - SDK 4.4</description>
7+
<description>Integration Tests module for in-container integration testing - part of AIO - SDK 4.5</description>
88
<packaging>jar</packaging> <!-- Note. this just runs Integration Tests, but it needs to be a JAR otherwise
99
nothing is compiled (i.e. you cannot set it to pom) -->
1010

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<artifactId>${artifactId}</artifactId>
55
<name>Alfresco Platform/Repository JAR Module</name>
6-
<description>Platform/Repo JAR Module (to be included in the alfresco.war) - part of AIO - SDK 4.4
6+
<description>Platform/Repo JAR Module (to be included in the alfresco.war) - part of AIO - SDK 4.5
77
</description>
88
<packaging>jar</packaging>
99

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<artifactId>${artifactId}</artifactId>
66
<name>Alfresco Share JAR Module</name>
77
<packaging>jar</packaging>
8-
<description>Sample Share JAR Module (to be included in the share.war) - part of AIO - SDK 4.4</description>
8+
<description>Sample Share JAR Module (to be included in the share.war) - part of AIO - SDK 4.5</description>
99

1010
<parent>
1111
<groupId>${groupId}</groupId>

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<groupId>${groupId}</groupId>
66
<artifactId>${artifactId}</artifactId>
77
<version>${version}</version>
8-
<name>AIO - SDK 4.4</name>
9-
<description>All-In-One (AIO) project for SDK 4.4</description>
8+
<name>AIO - SDK 4.5</name>
9+
<description>All-In-One (AIO) project for SDK 4.5</description>
1010
<packaging>pom</packaging>
1111

1212
<prerequisites>
@@ -59,8 +59,8 @@
5959
</dependency>
6060
<dependency>
6161
<groupId>org.mockito</groupId>
62-
<artifactId>mockito-all</artifactId>
63-
<version>1.9.5</version>
62+
<artifactId>mockito-core</artifactId>
63+
<version>4.2.0</version>
6464
<scope>test</scope>
6565
</dependency>
6666
<dependency>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.alfresco.maven</groupId>
1414
<artifactId>alfresco-sdk-aggregator</artifactId>
15-
<version>4.5.0-SNAPSHOT</version>
15+
<version>4.5.0</version>
1616
<relativePath>../../pom.xml</relativePath>
1717
</parent>
1818

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Alfresco ACS JAR Module - SDK 4.4
1+
# Alfresco ACS JAR Module - SDK 4.5
22

3-
This is an ACS project for Alfresco SDK 4.4.
3+
This is an ACS project for Alfresco SDK 4.5.
44

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
</dependency>
5656
<dependency>
5757
<groupId>org.mockito</groupId>
58-
<artifactId>mockito-all</artifactId>
59-
<version>1.9.5</version>
58+
<artifactId>mockito-core</artifactId>
59+
<version>4.2.0</version>
6060
<scope>test</scope>
6161
</dependency>
6262
<dependency>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>org.alfresco.maven</groupId>
1616
<artifactId>alfresco-sdk-aggregator</artifactId>
17-
<version>4.5.0-SNAPSHOT</version>
17+
<version>4.5.0</version>
1818
<relativePath>../../pom.xml</relativePath>
1919
</parent>
2020

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Alfresco Share JAR Module - SDK 4.4
1+
# Alfresco Share JAR Module - SDK 4.5
22

3-
This is a Share project for Alfresco SDK 4.4.
3+
This is a Share project for Alfresco SDK 4.5.
44

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

‎archetypes/archetypes-it/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<parent>
1818
<groupId>org.alfresco.maven</groupId>
1919
<artifactId>alfresco-sdk-aggregator</artifactId>
20-
<version>4.5.0-SNAPSHOT</version>
20+
<version>4.5.0</version>
2121
<relativePath>../../pom.xml</relativePath>
2222
</parent>
2323

‎docs/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
Title: Alfresco SDK 4.4
2+
Title: Alfresco SDK 4.5
33
Added: v3.0.0
4-
Last reviewed: 2022-03-22
4+
Last reviewed: 2022-09-22
55
---
66
# Alfresco SDK 4
77

@@ -18,7 +18,7 @@ Alfresco SDK 4.x is released under [Apache License version 2.0](http://www.apach
1818
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)
1919
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/).
2020

21-
Alfresco SDK 4.4 is a minor update to the SDK and provides support for Alfresco 7.2.x.
21+
Alfresco SDK 4.5 is a minor update to the SDK and provides support for Alfresco 7.3.x.
2222

2323
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
2424
previous releases of the SDK.

‎docs/getting-started.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ Choose archetype:
118118
* `org.alfresco.maven.archetype:alfresco-platform-jar-archetype`
119119
* `org.alfresco.maven.archetype:alfresco-share-jar-archetype`
120120

121-
3. Choose the latest version, such as 4.4.0.
121+
3. Choose the latest version, such as 4.5.0.
122122

123123
```
124124
Choose org.alfresco.maven.archetype:alfresco-allinone-archetype version:
@@ -139,6 +139,7 @@ Choose org.alfresco.maven.archetype:alfresco-allinone-archetype version:
139139
15: 4.2.0
140140
16: 4.3.0
141141
17: 4.4.0
142+
18: 4.5.0
142143
```
143144

144145
4. Next you will be prompted for additional values, like groupId, artifactId, and package, as shown below:
@@ -167,7 +168,7 @@ If everything has been configured correctly, you should see something similar to
167168

168169
```
169170
[INFO] ----------------------------------------------------------------------------
170-
[INFO] Using following parameters for creating project from Archetype: alfresco-allinone-archetype:4.4.0
171+
[INFO] Using following parameters for creating project from Archetype: alfresco-allinone-archetype:4.5.0
171172
[INFO] ----------------------------------------------------------------------------
172173
[INFO] Parameter: groupId, Value: com.acme
173174
[INFO] Parameter: artifactId, Value: my-all-in-one

‎docs/whats-new.md

+7
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,10 @@ Alfresco SDK 4.1 provides support for Alfresco 6.2.x.
6767
## Support for Alfresco 7.0.x, 7.1.x, and 7.2.x
6868

6969
Alfresco SDK 4.4 provides support for Alfresco 7.0.x, 7.1.x, and 7.2.x.
70+
71+
## Support for Java 17
72+
[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
73+
support for this version of the Java platform.
74+
75+
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
76+
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.

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ my-all-in-one-project mbergljung$ ./run.sh build_start
7878
[INFO] ------------------------------------------------------------------------
7979
[INFO] Reactor Build Order:
8080
[INFO]
81-
[INFO] AIO - SDK 4.4
81+
[INFO] AIO - SDK 4.5
8282
[INFO] Alfresco Platform/Repository JAR Module
8383
[INFO] Alfresco Share JAR Module
8484
[INFO] Integration Tests Module
@@ -88,7 +88,7 @@ my-all-in-one-project mbergljung$ ./run.sh build_start
8888
[INFO] ------------------------------------------------------------------------
8989
[INFO] Reactor Summary:
9090
[INFO]
91-
[INFO] AIO - SDK 4.4 ...................................... SUCCESS [ 0.680 s]
91+
[INFO] AIO - SDK 4.5 ...................................... SUCCESS [ 0.680 s]
9292
[INFO] Alfresco Platform/Repository JAR Module ............ SUCCESS [ 5.461 s]
9393
[INFO] Alfresco Share JAR Module .......................... SUCCESS [ 0.557 s]
9494
[INFO] Integration Tests Module ........................... SUCCESS [ 0.900 s]

‎modules/alfresco-rad/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>org.alfresco.maven</groupId>
1212
<artifactId>alfresco-sdk-aggregator</artifactId>
13-
<version>4.5.0-SNAPSHOT</version>
13+
<version>4.5.0</version>
1414
<relativePath>../../pom.xml</relativePath>
1515
</parent>
1616

‎plugins/alfresco-maven-plugin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>org.alfresco.maven</groupId>
1010
<artifactId>alfresco-sdk-aggregator</artifactId>
11-
<version>4.5.0-SNAPSHOT</version>
11+
<version>4.5.0</version>
1212
<relativePath>../../pom.xml</relativePath>
1313
</parent>
1414

0 commit comments

Comments
 (0)