diff --git a/README.md b/README.md index cad2e5b..29ecbd8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Alfresco Process Services SDK Project 2.5.0 +# Alfresco Process Services SDK Project 2.5.1 The project consists of the following Maven submodules: @@ -206,6 +206,7 @@ In order to build the project, you can declare a Maven profile related to a spec * `aps2.4.4` (APS 2.4.4 - default) * `aps2.4.3` (APS 2.4.3) + * `aps2.4.2.10` (APS 2.4.2.10) * `aps2.4.2.9` (APS 2.4.2.9) * `aps2.4.2.8` (APS 2.4.2.8) * `aps2.4.2.7` (APS 2.4.2.7) @@ -221,6 +222,7 @@ In order to build the project, you can declare a Maven profile related to a spec * `aps2.4.1` (APS 2.4.1) * `aps2.4.0` (APS 2.4.0) * `aps2.3.9` (APS 2.3.9) + * `aps2.3.8.7` (APS 2.3.8.7) * `aps2.3.8.6` (APS 2.3.8.6) * `aps2.3.8.5` (APS 2.3.8.5) * `aps2.3.8.4` (APS 2.3.8.4) diff --git a/activiti-app-integration-tests/pom.xml b/activiti-app-integration-tests/pom.xml index d194c97..81b6069 100644 --- a/activiti-app-integration-tests/pom.xml +++ b/activiti-app-integration-tests/pom.xml @@ -7,7 +7,7 @@ org.alfresco.activiti aps-project - 2.5.0 + 2.5.1 diff --git a/activiti-app-integration-tests/src/test/java/com/activiti/sdk/integrationtests/FourEyesAppIT.java b/activiti-app-integration-tests/src/test/java/com/activiti/sdk/integrationtests/FourEyesAppIT.java index fcf880a..93b1820 100644 --- a/activiti-app-integration-tests/src/test/java/com/activiti/sdk/integrationtests/FourEyesAppIT.java +++ b/activiti-app-integration-tests/src/test/java/com/activiti/sdk/integrationtests/FourEyesAppIT.java @@ -55,7 +55,7 @@ public class FourEyesAppIT { protected static final String BASE_PATH_HOSTNAME = "localhost"; protected static final int BASE_PATH_PORT = 8080; - protected static final String appZipFile = "aps-extensions-jar-2.5.0-App.zip"; + protected static final String appZipFile = "aps-extensions-jar-2.5.1-App.zip"; protected static final String ACTIVITI_APP_BASE_PATH = BASE_PATH_PROTOCOL + "://" + BASE_PATH_HOSTNAME + ":" + BASE_PATH_PORT; diff --git a/activiti-app-overlay-docker/pom.xml b/activiti-app-overlay-docker/pom.xml index 7f8883d..2e38bd8 100644 --- a/activiti-app-overlay-docker/pom.xml +++ b/activiti-app-overlay-docker/pom.xml @@ -7,7 +7,7 @@ org.alfresco.activiti aps-project - 2.5.0 + 2.5.1 diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile-2.3.8.7 b/activiti-app-overlay-docker/src/main/docker/Dockerfile-2.3.8.7 new file mode 100644 index 0000000..5817cbf --- /dev/null +++ b/activiti-app-overlay-docker/src/main/docker/Dockerfile-2.3.8.7 @@ -0,0 +1,39 @@ +FROM alfresco/process-services:${aps.docker.version} + +ENV ACTIVITI_DATASOURCE_USERNAME: ${docker.aps.database.username} +ENV ACTIVITI_DATASOURCE_PASSWORD: ${docker.aps.database.password} +ENV ACTIVITI_DATASOURCE_DRIVER: ${docker.aps.database.driver} +ENV ACTIVITI_HIBERNATE_DIALECT: ${docker.aps.database.dialect} +ENV ACTIVITI_DATASOURCE_URL: ${docker.aps.database.url} +ENV ACTIVITI_CSRF_DISABLED: ${docker.aps.database.csrf.disabled} +ENV ACTIVITI_CORS_ENABLED: ${docker.aps.database.cors.enabled} +ENV ACTIVITI_ES_SERVER_TYPE: ${docker.aps.es.server.type} +ENV ACTIVITI_ES_DISCOVERY_HOSTS: ${docker.aps.es.discovery.host} +ENV ACTIVITI_ES_CLUSTER_NAME: ${docker.aps.es.cluster.name} + +ENV LC_ALL=C + +ARG TOMCAT_DIR=/usr/local/tomcat +ARG USERNAME=alfresco +ARG CONTENT_STORAGE_DIR=/act_data + +USER root + +RUN rm -rf $TOMCAT_DIR/webapps/activiti-app + +#COPY --chown=${USERNAME} extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib + +COPY --chown=${USERNAME} logging/logback.xml $TOMCAT_DIR/lib + +COPY --chown=${USERNAME} properties/activiti-app.properties $TOMCAT_DIR/lib + +COPY --chown=${USERNAME} extensions/activiti-app.war $TOMCAT_DIR/webapps + +COPY --chown=${USERNAME} license/*.* $TOMCAT_DIR/lib/ + +RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat + +RUN mkdir -p ${CONTENT_STORAGE_DIR} +RUN chown ${USERNAME}:${USERNAME} ${CONTENT_STORAGE_DIR} + +USER ${USERNAME} \ No newline at end of file diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile-2.3.8.7-arm64 b/activiti-app-overlay-docker/src/main/docker/Dockerfile-2.3.8.7-arm64 new file mode 100644 index 0000000..af98a45 --- /dev/null +++ b/activiti-app-overlay-docker/src/main/docker/Dockerfile-2.3.8.7-arm64 @@ -0,0 +1,42 @@ +FROM tomcat:9-jdk11-openjdk + +ENV ACTIVITI_DATASOURCE_USERNAME: ${docker.aps.database.username} +ENV ACTIVITI_DATASOURCE_PASSWORD: ${docker.aps.database.password} +ENV ACTIVITI_DATASOURCE_DRIVER: ${docker.aps.database.driver} +ENV ACTIVITI_HIBERNATE_DIALECT: ${docker.aps.database.dialect} +ENV ACTIVITI_DATASOURCE_URL: ${docker.aps.database.url} +ENV ACTIVITI_CSRF_DISABLED: ${docker.aps.database.csrf.disabled} +ENV ACTIVITI_CORS_ENABLED: ${docker.aps.database.cors.enabled} +ENV ACTIVITI_ES_SERVER_TYPE: ${docker.aps.es.server.type} +ENV ACTIVITI_ES_DISCOVERY_HOSTS: ${docker.aps.es.discovery.host} +ENV ACTIVITI_ES_CLUSTER_NAME: ${docker.aps.es.cluster.name} + +ENV LC_ALL=C + +ARG TOMCAT_DIR=/usr/local/tomcat +ARG USERNAME=alfresco +ARG USERID=33007 +ARG CONTENT_STORAGE_DIR=/act_data + +USER root + +RUN useradd -c "Alfresco APS" -M -s "/bin/bash" -u "${USERID}" -o "${USERNAME}" + +RUN rm -rf $TOMCAT_DIR/webapps/activiti-app + +#COPY --chown=${USERNAME} extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib + +COPY --chown=${USERNAME} logging/logback.xml $TOMCAT_DIR/lib + +COPY --chown=${USERNAME} properties/activiti-app.properties $TOMCAT_DIR/lib + +COPY --chown=${USERNAME} extensions/activiti-app.war $TOMCAT_DIR/webapps + +COPY --chown=${USERNAME} license/*.* $TOMCAT_DIR/lib/ + +RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat + +RUN mkdir -p ${CONTENT_STORAGE_DIR} +RUN chown ${USERNAME}:${USERNAME} ${CONTENT_STORAGE_DIR} + +USER ${USERNAME} \ No newline at end of file diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile-2.4.2.10 b/activiti-app-overlay-docker/src/main/docker/Dockerfile-2.4.2.10 new file mode 100644 index 0000000..5817cbf --- /dev/null +++ b/activiti-app-overlay-docker/src/main/docker/Dockerfile-2.4.2.10 @@ -0,0 +1,39 @@ +FROM alfresco/process-services:${aps.docker.version} + +ENV ACTIVITI_DATASOURCE_USERNAME: ${docker.aps.database.username} +ENV ACTIVITI_DATASOURCE_PASSWORD: ${docker.aps.database.password} +ENV ACTIVITI_DATASOURCE_DRIVER: ${docker.aps.database.driver} +ENV ACTIVITI_HIBERNATE_DIALECT: ${docker.aps.database.dialect} +ENV ACTIVITI_DATASOURCE_URL: ${docker.aps.database.url} +ENV ACTIVITI_CSRF_DISABLED: ${docker.aps.database.csrf.disabled} +ENV ACTIVITI_CORS_ENABLED: ${docker.aps.database.cors.enabled} +ENV ACTIVITI_ES_SERVER_TYPE: ${docker.aps.es.server.type} +ENV ACTIVITI_ES_DISCOVERY_HOSTS: ${docker.aps.es.discovery.host} +ENV ACTIVITI_ES_CLUSTER_NAME: ${docker.aps.es.cluster.name} + +ENV LC_ALL=C + +ARG TOMCAT_DIR=/usr/local/tomcat +ARG USERNAME=alfresco +ARG CONTENT_STORAGE_DIR=/act_data + +USER root + +RUN rm -rf $TOMCAT_DIR/webapps/activiti-app + +#COPY --chown=${USERNAME} extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib + +COPY --chown=${USERNAME} logging/logback.xml $TOMCAT_DIR/lib + +COPY --chown=${USERNAME} properties/activiti-app.properties $TOMCAT_DIR/lib + +COPY --chown=${USERNAME} extensions/activiti-app.war $TOMCAT_DIR/webapps + +COPY --chown=${USERNAME} license/*.* $TOMCAT_DIR/lib/ + +RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat + +RUN mkdir -p ${CONTENT_STORAGE_DIR} +RUN chown ${USERNAME}:${USERNAME} ${CONTENT_STORAGE_DIR} + +USER ${USERNAME} \ No newline at end of file diff --git a/activiti-app-overlay-docker/src/main/docker/Dockerfile-2.4.2.10-arm64 b/activiti-app-overlay-docker/src/main/docker/Dockerfile-2.4.2.10-arm64 new file mode 100644 index 0000000..e02574e --- /dev/null +++ b/activiti-app-overlay-docker/src/main/docker/Dockerfile-2.4.2.10-arm64 @@ -0,0 +1,42 @@ +FROM tomcat:9-jdk17-openjdk + +ENV ACTIVITI_DATASOURCE_USERNAME: ${docker.aps.database.username} +ENV ACTIVITI_DATASOURCE_PASSWORD: ${docker.aps.database.password} +ENV ACTIVITI_DATASOURCE_DRIVER: ${docker.aps.database.driver} +ENV ACTIVITI_HIBERNATE_DIALECT: ${docker.aps.database.dialect} +ENV ACTIVITI_DATASOURCE_URL: ${docker.aps.database.url} +ENV ACTIVITI_CSRF_DISABLED: ${docker.aps.database.csrf.disabled} +ENV ACTIVITI_CORS_ENABLED: ${docker.aps.database.cors.enabled} +ENV ACTIVITI_ES_SERVER_TYPE: ${docker.aps.es.server.type} +ENV ACTIVITI_ES_DISCOVERY_HOSTS: ${docker.aps.es.discovery.host} +ENV ACTIVITI_ES_CLUSTER_NAME: ${docker.aps.es.cluster.name} + +ENV LC_ALL=C + +ARG TOMCAT_DIR=/usr/local/tomcat +ARG USERNAME=alfresco +ARG USERID=33007 +ARG CONTENT_STORAGE_DIR=/act_data + +USER root + +RUN useradd -c "Alfresco APS" -M -s "/bin/bash" -u "${USERID}" -o "${USERNAME}" + +RUN rm -rf $TOMCAT_DIR/webapps/activiti-app + +#COPY --chown=${USERNAME} extensions/aps-extensions-jar-${project.version}.jar $TOMCAT_DIR/lib + +COPY --chown=${USERNAME} logging/logback.xml $TOMCAT_DIR/lib + +COPY --chown=${USERNAME} properties/activiti-app.properties $TOMCAT_DIR/lib + +COPY --chown=${USERNAME} extensions/activiti-app.war $TOMCAT_DIR/webapps + +COPY --chown=${USERNAME} license/*.* $TOMCAT_DIR/lib/ + +RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat + +RUN mkdir -p ${CONTENT_STORAGE_DIR} +RUN chown ${USERNAME}:${USERNAME} ${CONTENT_STORAGE_DIR} + +USER ${USERNAME} \ No newline at end of file diff --git a/activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.3.8.7 b/activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.3.8.7 new file mode 100644 index 0000000..5cc9cde --- /dev/null +++ b/activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.3.8.7 @@ -0,0 +1,14 @@ +FROM alfresco/process-services-admin:${aps.docker.version} + +ARG TOMCAT_DIR=/usr/local/tomcat +ARG USERNAME=alfresco + +USER root + +ADD --chown=${USERNAME} jdbc $TOMCAT_DIR/lib +COPY --chown=${USERNAME} properties/activiti-admin.properties $TOMCAT_DIR/lib +COPY --chown=${USERNAME} tomcat/conf/server.xml $TOMCAT_DIR/conf + +RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat + +USER ${USERNAME} diff --git a/activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.3.8.7-arm64 b/activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.3.8.7-arm64 new file mode 100644 index 0000000..4e7ed65 --- /dev/null +++ b/activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.3.8.7-arm64 @@ -0,0 +1,18 @@ +FROM tomcat:9-jdk11-openjdk-slim + +ARG TOMCAT_DIR=/usr/local/tomcat +ARG USERNAME=alfresco +ARG USERID=33007 + +USER root + +RUN useradd -c "Alfresco APS" -M -s "/bin/bash" -u "${USERID}" -o "${USERNAME}" + +ADD --chown=${USERNAME} jdbc $TOMCAT_DIR/lib +COPY --chown=${USERNAME} extensions/activiti-admin.war $TOMCAT_DIR/webapps +COPY --chown=${USERNAME} properties/activiti-admin.properties $TOMCAT_DIR/lib +COPY --chown=${USERNAME} tomcat/conf/server.xml $TOMCAT_DIR/conf + +RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat + +USER ${USERNAME} \ No newline at end of file diff --git a/activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.4.2.10 b/activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.4.2.10 new file mode 100644 index 0000000..5cc9cde --- /dev/null +++ b/activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.4.2.10 @@ -0,0 +1,14 @@ +FROM alfresco/process-services-admin:${aps.docker.version} + +ARG TOMCAT_DIR=/usr/local/tomcat +ARG USERNAME=alfresco + +USER root + +ADD --chown=${USERNAME} jdbc $TOMCAT_DIR/lib +COPY --chown=${USERNAME} properties/activiti-admin.properties $TOMCAT_DIR/lib +COPY --chown=${USERNAME} tomcat/conf/server.xml $TOMCAT_DIR/conf + +RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat + +USER ${USERNAME} diff --git a/activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.4.2.10-arm64 b/activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.4.2.10-arm64 new file mode 100644 index 0000000..c62eb7f --- /dev/null +++ b/activiti-app-overlay-docker/src/main/docker/admin/Dockerfile-admin-2.4.2.10-arm64 @@ -0,0 +1,18 @@ +FROM tomcat:9-jdk17-openjdk-slim + +ARG TOMCAT_DIR=/usr/local/tomcat +ARG USERNAME=alfresco +ARG USERID=33007 + +USER root + +RUN useradd -c "Alfresco APS" -M -s "/bin/bash" -u "${USERID}" -o "${USERNAME}" + +ADD --chown=${USERNAME} jdbc $TOMCAT_DIR/lib +COPY --chown=${USERNAME} extensions/activiti-admin.war $TOMCAT_DIR/webapps +COPY --chown=${USERNAME} properties/activiti-admin.properties $TOMCAT_DIR/lib +COPY --chown=${USERNAME} tomcat/conf/server.xml $TOMCAT_DIR/conf + +RUN chown ${USERNAME}:${USERNAME} -R /usr/local/tomcat + +USER ${USERNAME} \ No newline at end of file diff --git a/activiti-app-overlay-war/pom.xml b/activiti-app-overlay-war/pom.xml index 4badc79..9a8a8af 100644 --- a/activiti-app-overlay-war/pom.xml +++ b/activiti-app-overlay-war/pom.xml @@ -7,7 +7,7 @@ org.alfresco.activiti aps-project - 2.5.0 + 2.5.1 diff --git a/aps-extensions-jar/pom.xml b/aps-extensions-jar/pom.xml index 1e50b6d..ad47038 100644 --- a/aps-extensions-jar/pom.xml +++ b/aps-extensions-jar/pom.xml @@ -7,7 +7,7 @@ org.alfresco.activiti aps-project - 2.5.0 + 2.5.1 @@ -384,34 +384,6 @@ - - surefire-openjdk-11 - - false - 11 - - - - - maven-surefire-plugin - - ${skip.integration.test} - - --illegal-access=permit - - - - - - integration-test - verify - - - - - - - \ No newline at end of file diff --git a/aps-extensions-jar/src/test/resources/activiti/2.3.8.7/version.properties b/aps-extensions-jar/src/test/resources/activiti/2.3.8.7/version.properties new file mode 100644 index 0000000..eaa8c85 --- /dev/null +++ b/aps-extensions-jar/src/test/resources/activiti/2.3.8.7/version.properties @@ -0,0 +1,5 @@ +type=bpmSuite +version.major=2 +version.minor=3 +version.revision=8.7 +version.edition=Alfresco Process Services (powered by Activiti) diff --git a/aps-extensions-jar/src/test/resources/activiti/2.4.2.10/version.properties b/aps-extensions-jar/src/test/resources/activiti/2.4.2.10/version.properties new file mode 100644 index 0000000..f8f9b36 --- /dev/null +++ b/aps-extensions-jar/src/test/resources/activiti/2.4.2.10/version.properties @@ -0,0 +1,5 @@ +type=bpmSuite +version.major=2 +version.minor=4 +version.revision=2.10 +version.edition=Alfresco Process Services (powered by Activiti) diff --git a/aps-extensions-jar/src/test/resources/activiti/version.properties b/aps-extensions-jar/src/test/resources/activiti/version.properties index 383dfab..eaa8c85 100644 --- a/aps-extensions-jar/src/test/resources/activiti/version.properties +++ b/aps-extensions-jar/src/test/resources/activiti/version.properties @@ -1,5 +1,5 @@ type=bpmSuite version.major=2 -version.minor=4 -version.revision=4 +version.minor=3 +version.revision=8.7 version.edition=Alfresco Process Services (powered by Activiti) diff --git a/pom.xml b/pom.xml index 9098367..a6779ef 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 org.alfresco.activiti aps-project - 2.5.0 + 2.5.1 pom APS - SDK Project @@ -994,6 +994,44 @@ + + aps2.3.8.7 + + true + + + + + 11 + 11 + 2.3.8.7 + 2.3.8.7 + 2 + 3 + 8.7 + v2.3.7 + 5.7.1 + 2.14.1 + 1.70 + 7.10.0 + 5.3.27.RELEASE + 2.5.12 + 5.7.8 + 7.17.6 + 7.17.6 + 5.4.32.Final + 2.1.214 + 13.1 + 3.5.11 + 2.2.7 + false + false + false + false + false + + + aps2.3.9 @@ -1564,6 +1602,44 @@ + + aps2.4.2.10 + + false + + + + + 17 + 17 + 2.4.2.10 + 2.4.2.10 + 2 + 4 + 2.10 + v2.3.7 + 5.8 + 2.14.1 + 1.70 + 7.11.1-alpha.10 + 5.3.29.RELEASE + 2.7.14 + 5.8.5 + 7.17.14 + 7.17.14 + 5.4.32.Final + 2.2.220 + 13.1 + 3.5.13 + 2.2.7 + false + false + false + false + false + + + aps2.4.3 @@ -1605,7 +1681,7 @@ aps2.4.4 - true + false @@ -1791,7 +1867,9 @@ aps-extensions-jar activiti-app-overlay-war activiti-app-overlay-docker +