Skip to content

Commit cfc88cb

Browse files
OpenPjOpenPj
committed
release 3.0.7: added support for recent version of APS 24.x and 25.x
1 parent 1346639 commit cfc88cb

38 files changed

+951
-15
lines changed

‎README.md‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Alfresco Process Services SDK Project 3.0.6
1+
# Alfresco Process Services SDK Project 3.0.7
22

33
The project consists of the following Maven submodules:
44

@@ -14,7 +14,7 @@ The project consists of the following Maven submodules:
1414

1515
# Prerequisites
1616
* OpenJDK 17
17-
* Apache Maven 3.9.9
17+
* Apache Maven 3.9.11
1818
* Docker (optional)
1919
* Put valid _activiti.lic_ and _transform.lic_ (or _Aspose.Total.Java.lic_ ) in the `/license` folder for running unit / integration tests and for building containers
2020
* Access to the Alfresco Nexus Repositories (credentials provided by Alfresco)
@@ -203,7 +203,13 @@ Put your Java test classes in the following package:
203203

204204
In order to build the project, you can declare a Maven profile related to a specific APS version:
205205

206-
* `aps24.3.0` (APS 24.4.2 - default)
206+
* `aps25.2.0` (APS 25.2.0 - default version)
207+
* `aps25.1.1` (APS 25.1.1)
208+
* `aps25.1.0` (APS 25.1.0)
209+
* `aps24.5.0` (APS 24.5.0)
210+
* `aps24.4.4` (APS 24.4.4)
211+
* `aps24.4.3` (APS 24.4.3)
212+
* `aps24.4.2` (APS 24.4.2)
207213
* `aps24.4.1` (APS 24.4.1)
208214
* `aps24.4.0` (APS 24.4.0)
209215
* `aps24.3.0` (APS 24.4.0)
@@ -214,7 +220,7 @@ In order to build the project, you can declare a Maven profile related to a spec
214220
* `aps24.1.0` (APS 24.1.0)
215221

216222

217-
Build and test with unit tests execution for APS 24.4.2 with:
223+
Build and test with unit tests execution for APS 25.2.0 with:
218224
`mvn clean test`
219225

220226
Build and test with unit tests execution for APS 24.1.0 with:

‎activiti-app-integration-tests/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.alfresco.activiti</groupId>
99
<artifactId>aps-project</artifactId>
10-
<version>3.0.6</version>
10+
<version>3.0.7</version>
1111
</parent>
1212

1313
<properties>

‎activiti-app-integration-tests/src/test/java/com/activiti/sdk/integrationtests/FourEyesAppIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class FourEyesAppIT {
5555
protected static final String BASE_PATH_HOSTNAME = "localhost";
5656
protected static final int BASE_PATH_PORT = 8080;
5757

58-
protected static final String appZipFile = "aps-extensions-jar-3.0.6-App.zip";
58+
protected static final String appZipFile = "aps-extensions-jar-3.0.7-App.zip";
5959

6060
protected static final String ACTIVITI_APP_BASE_PATH = BASE_PATH_PROTOCOL + "://" + BASE_PATH_HOSTNAME + ":"
6161
+ BASE_PATH_PORT;

‎activiti-app-overlay-docker/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.alfresco.activiti</groupId>
99
<artifactId>aps-project</artifactId>
10-
<version>3.0.6</version>
10+
<version>3.0.7</version>
1111
</parent>
1212

1313
<properties>

‎activiti-app-overlay-docker/src/main/docker/Dockerfile-24.4.3‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
FROM alfresco/process-services:${aps.docker.version}
2+
3+
ENV ACTIVITI_DATASOURCE_USERNAME ${docker.aps.database.username}
4+
ENV ACTIVITI_DATASOURCE_PASSWORD ${docker.aps.database.password}
5+
ENV ACTIVITI_DATASOURCE_DRIVER ${docker.aps.database.driver}
6+
ENV ACTIVITI_HIBERNATE_DIALECT ${docker.aps.database.dialect}
7+
ENV ACTIVITI_DATASOURCE_URL ${docker.aps.database.url}
8+
ENV ACTIVITI_CSRF_DISABLED ${docker.aps.database.csrf.disabled}
9+
ENV ACTIVITI_CORS_ENABLED ${docker.aps.database.cors.enabled}
10+
ENV ACTIVITI_ES_SERVER_TYPE ${docker.aps.es.server.type}
11+
ENV ACTIVITI_ES_DISCOVERY_HOSTS ${docker.aps.es.discovery.host}
12+
ENV ACTIVITI_ES_CLUSTER_NAME ${docker.aps.es.cluster.name}
13+
14+
ENV LC_ALL C
15+
16+
ARG TOMCAT_DIR=/usr/local/tomcat
17+
ARG USERNAME=alfresco
18+
ARG CONTENT_STORAGE_DIR=/act_data
19+
20+
USER root
21+
22+
RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
23+
24+
#COPY --chown=${USERNAME} extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
25+
26+
COPY --chown=${USERNAME} properties/activiti-app.properties $TOMCAT_DIR/lib
27+
28+
COPY --chown=${USERNAME} extensions/activiti-app.war $TOMCAT_DIR/webapps
29+
30+
COPY --chown=${USERNAME} license/*.* $TOMCAT_DIR/lib/
31+
32+
RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat
33+
34+
RUN mkdir -p ${CONTENT_STORAGE_DIR}
35+
RUN chown ${USERNAME}:${USERNAME} ${CONTENT_STORAGE_DIR}
36+
37+
USER ${USERNAME}

‎activiti-app-overlay-docker/src/main/docker/Dockerfile-24.4.3-arm64‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
FROM tomcat:10-jdk17-openjdk
2+
3+
ENV ACTIVITI_DATASOURCE_USERNAME: ${docker.aps.database.username}
4+
ENV ACTIVITI_DATASOURCE_PASSWORD: ${docker.aps.database.password}
5+
ENV ACTIVITI_DATASOURCE_DRIVER: ${docker.aps.database.driver}
6+
ENV ACTIVITI_HIBERNATE_DIALECT: ${docker.aps.database.dialect}
7+
ENV ACTIVITI_DATASOURCE_URL: ${docker.aps.database.url}
8+
ENV ACTIVITI_CSRF_DISABLED: ${docker.aps.database.csrf.disabled}
9+
ENV ACTIVITI_CORS_ENABLED: ${docker.aps.database.cors.enabled}
10+
ENV ACTIVITI_ES_SERVER_TYPE: ${docker.aps.es.server.type}
11+
ENV ACTIVITI_ES_DISCOVERY_HOSTS: ${docker.aps.es.discovery.host}
12+
ENV ACTIVITI_ES_CLUSTER_NAME: ${docker.aps.es.cluster.name}
13+
14+
ENV LC_ALL=C
15+
16+
ARG TOMCAT_DIR=/usr/local/tomcat
17+
ARG USERNAME=alfresco
18+
ARG USERID=33007
19+
ARG CONTENT_STORAGE_DIR=/act_data
20+
21+
USER root
22+
23+
RUN useradd -c "Alfresco APS" -M -s "/bin/bash" -u "${USERID}" -o "${USERNAME}"
24+
25+
RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
26+
27+
#COPY --chown=${USERNAME} extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
28+
29+
COPY --chown=${USERNAME} properties/activiti-app.properties $TOMCAT_DIR/lib
30+
31+
COPY --chown=${USERNAME} extensions/activiti-app.war $TOMCAT_DIR/webapps
32+
33+
COPY --chown=${USERNAME} license/activiti.lic $TOMCAT_DIR/lib
34+
35+
COPY --chown=${USERNAME} license/transform.lic $TOMCAT_DIR/lib
36+
37+
RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat
38+
39+
RUN mkdir -p ${CONTENT_STORAGE_DIR}
40+
RUN chown ${USERNAME}:${USERNAME} ${CONTENT_STORAGE_DIR}
41+
42+
USER ${USERNAME}

‎activiti-app-overlay-docker/src/main/docker/Dockerfile-24.4.4‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
FROM alfresco/process-services:${aps.docker.version}
2+
3+
ENV ACTIVITI_DATASOURCE_USERNAME ${docker.aps.database.username}
4+
ENV ACTIVITI_DATASOURCE_PASSWORD ${docker.aps.database.password}
5+
ENV ACTIVITI_DATASOURCE_DRIVER ${docker.aps.database.driver}
6+
ENV ACTIVITI_HIBERNATE_DIALECT ${docker.aps.database.dialect}
7+
ENV ACTIVITI_DATASOURCE_URL ${docker.aps.database.url}
8+
ENV ACTIVITI_CSRF_DISABLED ${docker.aps.database.csrf.disabled}
9+
ENV ACTIVITI_CORS_ENABLED ${docker.aps.database.cors.enabled}
10+
ENV ACTIVITI_ES_SERVER_TYPE ${docker.aps.es.server.type}
11+
ENV ACTIVITI_ES_DISCOVERY_HOSTS ${docker.aps.es.discovery.host}
12+
ENV ACTIVITI_ES_CLUSTER_NAME ${docker.aps.es.cluster.name}
13+
14+
ENV LC_ALL C
15+
16+
ARG TOMCAT_DIR=/usr/local/tomcat
17+
ARG USERNAME=alfresco
18+
ARG CONTENT_STORAGE_DIR=/act_data
19+
20+
USER root
21+
22+
RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
23+
24+
#COPY --chown=${USERNAME} extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
25+
26+
COPY --chown=${USERNAME} properties/activiti-app.properties $TOMCAT_DIR/lib
27+
28+
COPY --chown=${USERNAME} extensions/activiti-app.war $TOMCAT_DIR/webapps
29+
30+
COPY --chown=${USERNAME} license/*.* $TOMCAT_DIR/lib/
31+
32+
RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat
33+
34+
RUN mkdir -p ${CONTENT_STORAGE_DIR}
35+
RUN chown ${USERNAME}:${USERNAME} ${CONTENT_STORAGE_DIR}
36+
37+
USER ${USERNAME}

‎activiti-app-overlay-docker/src/main/docker/Dockerfile-24.4.4-arm64‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
FROM tomcat:10-jdk17-openjdk
2+
3+
ENV ACTIVITI_DATASOURCE_USERNAME: ${docker.aps.database.username}
4+
ENV ACTIVITI_DATASOURCE_PASSWORD: ${docker.aps.database.password}
5+
ENV ACTIVITI_DATASOURCE_DRIVER: ${docker.aps.database.driver}
6+
ENV ACTIVITI_HIBERNATE_DIALECT: ${docker.aps.database.dialect}
7+
ENV ACTIVITI_DATASOURCE_URL: ${docker.aps.database.url}
8+
ENV ACTIVITI_CSRF_DISABLED: ${docker.aps.database.csrf.disabled}
9+
ENV ACTIVITI_CORS_ENABLED: ${docker.aps.database.cors.enabled}
10+
ENV ACTIVITI_ES_SERVER_TYPE: ${docker.aps.es.server.type}
11+
ENV ACTIVITI_ES_DISCOVERY_HOSTS: ${docker.aps.es.discovery.host}
12+
ENV ACTIVITI_ES_CLUSTER_NAME: ${docker.aps.es.cluster.name}
13+
14+
ENV LC_ALL=C
15+
16+
ARG TOMCAT_DIR=/usr/local/tomcat
17+
ARG USERNAME=alfresco
18+
ARG USERID=33007
19+
ARG CONTENT_STORAGE_DIR=/act_data
20+
21+
USER root
22+
23+
RUN useradd -c "Alfresco APS" -M -s "/bin/bash" -u "${USERID}" -o "${USERNAME}"
24+
25+
RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
26+
27+
#COPY --chown=${USERNAME} extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
28+
29+
COPY --chown=${USERNAME} properties/activiti-app.properties $TOMCAT_DIR/lib
30+
31+
COPY --chown=${USERNAME} extensions/activiti-app.war $TOMCAT_DIR/webapps
32+
33+
COPY --chown=${USERNAME} license/activiti.lic $TOMCAT_DIR/lib
34+
35+
COPY --chown=${USERNAME} license/transform.lic $TOMCAT_DIR/lib
36+
37+
RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat
38+
39+
RUN mkdir -p ${CONTENT_STORAGE_DIR}
40+
RUN chown ${USERNAME}:${USERNAME} ${CONTENT_STORAGE_DIR}
41+
42+
USER ${USERNAME}

‎activiti-app-overlay-docker/src/main/docker/Dockerfile-24.5.0‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
FROM alfresco/process-services:${aps.docker.version}
2+
3+
ENV ACTIVITI_DATASOURCE_USERNAME ${docker.aps.database.username}
4+
ENV ACTIVITI_DATASOURCE_PASSWORD ${docker.aps.database.password}
5+
ENV ACTIVITI_DATASOURCE_DRIVER ${docker.aps.database.driver}
6+
ENV ACTIVITI_HIBERNATE_DIALECT ${docker.aps.database.dialect}
7+
ENV ACTIVITI_DATASOURCE_URL ${docker.aps.database.url}
8+
ENV ACTIVITI_CSRF_DISABLED ${docker.aps.database.csrf.disabled}
9+
ENV ACTIVITI_CORS_ENABLED ${docker.aps.database.cors.enabled}
10+
ENV ACTIVITI_ES_SERVER_TYPE ${docker.aps.es.server.type}
11+
ENV ACTIVITI_ES_DISCOVERY_HOSTS ${docker.aps.es.discovery.host}
12+
ENV ACTIVITI_ES_CLUSTER_NAME ${docker.aps.es.cluster.name}
13+
14+
ENV LC_ALL C
15+
16+
ARG TOMCAT_DIR=/usr/local/tomcat
17+
ARG USERNAME=alfresco
18+
ARG CONTENT_STORAGE_DIR=/act_data
19+
20+
USER root
21+
22+
RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
23+
24+
#COPY --chown=${USERNAME} extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
25+
26+
COPY --chown=${USERNAME} properties/activiti-app.properties $TOMCAT_DIR/lib
27+
28+
COPY --chown=${USERNAME} extensions/activiti-app.war $TOMCAT_DIR/webapps
29+
30+
COPY --chown=${USERNAME} license/*.* $TOMCAT_DIR/lib/
31+
32+
RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat
33+
34+
RUN mkdir -p ${CONTENT_STORAGE_DIR}
35+
RUN chown ${USERNAME}:${USERNAME} ${CONTENT_STORAGE_DIR}
36+
37+
USER ${USERNAME}

‎activiti-app-overlay-docker/src/main/docker/Dockerfile-24.5.0-arm64‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
FROM tomcat:10-jdk17-openjdk
2+
3+
ENV ACTIVITI_DATASOURCE_USERNAME: ${docker.aps.database.username}
4+
ENV ACTIVITI_DATASOURCE_PASSWORD: ${docker.aps.database.password}
5+
ENV ACTIVITI_DATASOURCE_DRIVER: ${docker.aps.database.driver}
6+
ENV ACTIVITI_HIBERNATE_DIALECT: ${docker.aps.database.dialect}
7+
ENV ACTIVITI_DATASOURCE_URL: ${docker.aps.database.url}
8+
ENV ACTIVITI_CSRF_DISABLED: ${docker.aps.database.csrf.disabled}
9+
ENV ACTIVITI_CORS_ENABLED: ${docker.aps.database.cors.enabled}
10+
ENV ACTIVITI_ES_SERVER_TYPE: ${docker.aps.es.server.type}
11+
ENV ACTIVITI_ES_DISCOVERY_HOSTS: ${docker.aps.es.discovery.host}
12+
ENV ACTIVITI_ES_CLUSTER_NAME: ${docker.aps.es.cluster.name}
13+
14+
ENV LC_ALL=C
15+
16+
ARG TOMCAT_DIR=/usr/local/tomcat
17+
ARG USERNAME=alfresco
18+
ARG USERID=33007
19+
ARG CONTENT_STORAGE_DIR=/act_data
20+
21+
USER root
22+
23+
RUN useradd -c "Alfresco APS" -M -s "/bin/bash" -u "${USERID}" -o "${USERNAME}"
24+
25+
RUN rm -rf $TOMCAT_DIR/webapps/activiti-app
26+
27+
#COPY --chown=${USERNAME} extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib
28+
29+
COPY --chown=${USERNAME} properties/activiti-app.properties $TOMCAT_DIR/lib
30+
31+
COPY --chown=${USERNAME} extensions/activiti-app.war $TOMCAT_DIR/webapps
32+
33+
COPY --chown=${USERNAME} license/activiti.lic $TOMCAT_DIR/lib
34+
35+
COPY --chown=${USERNAME} license/transform.lic $TOMCAT_DIR/lib
36+
37+
RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat
38+
39+
RUN mkdir -p ${CONTENT_STORAGE_DIR}
40+
RUN chown ${USERNAME}:${USERNAME} ${CONTENT_STORAGE_DIR}
41+
42+
USER ${USERNAME}

0 commit comments

Comments
 (0)