Skip to content

Commit

Permalink
Added support for APS 24.x (#83)
Browse files Browse the repository at this point in the history
  • Loading branch information
OpenPj committed Apr 23, 2024
1 parent c6f43df commit b99d155
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 17 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -203,15 +203,15 @@ Put your Java test classes in the following package:

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

* `aps24.2` (APS 24.2 - default)
* `aps24.1` (APS 24.1)
* `aps24.2.0` (APS 24.2.0 - default)
* `aps24.1.0` (APS 24.1.0)


Build and test with unit tests execution for APS 24.2 with:
`mvn clean test`

Build and test with unit tests execution for APS 2.3.1 with:
`mvn clean test -Paps24.1`
`mvn clean test -Paps24.1.0`

Build your Docker container with:
`mvn docker:build`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.8"
services:
aps-admin:
image: aps-sdk/alfresco-process-services-admin:development
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.8"
services:
aps-current-project:
image: aps-sdk/alfresco-process-services:development
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@
<profiles>

<profile>
<id>aps24.1</id>
<id>aps24.1.0</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>

<properties>
<!-- APS 24.1 -->
<!-- APS 24.1.0 -->
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<aps.version>24.1.0</aps.version>
Expand Down Expand Up @@ -86,13 +86,13 @@
</profile>

<profile>
<id>aps24.2</id>
<id>aps24.2.0</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>

<properties>
<!-- APS 24.2 -->
<!-- APS 24.2.0 -->
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<aps.version>24.2.0</aps.version>
Expand Down
8 changes: 4 additions & 4 deletions run.bat
Original file line number Diff line number Diff line change
Expand Up @@ -165,20 +165,20 @@ EXIT /B 0
)
EXIT /B 0
:build
call %MVN_EXEC% clean package -Paps%APS_VERSION%
call %MVN_EXEC% clean pre-integration-test -Paps%APS_VERSION%
EXIT /B 0
:build_admin
call %MVN_EXEC% clean package -Paps%APS_VERSION%,activiti-admin
call %MVN_EXEC% clean pre-integration-test -Paps%APS_VERSION%,activiti-admin
EXIT /B 0
:build_activiti_app
docker-compose -f "%COMPOSE_FILE_PATH%" kill aps-current-project
docker-compose -f "%COMPOSE_FILE_PATH%" rm -f aps-current-project
call %MVN_EXEC% clean package -pl aps-extensions-jar,activiti-app-overlay-war,activiti-app-overlay-docker -Paps%APS_VERSION%
call %MVN_EXEC% clean pre-integration-test -pl aps-extensions-jar,activiti-app-overlay-war,activiti-app-overlay-docker -Paps%APS_VERSION%
EXIT /B 0
:build_activiti_app_admin
docker-compose -f "%COMPOSE_ADMIN_FILE_PATH%" kill aps-current-project
docker-compose -f "%COMPOSE_ADMIN_FILE_PATH%" rm -f aps-current-project
call %MVN_EXEC% clean package -pl aps-extensions-jar,activiti-app-overlay-war,activiti-app-overlay-docker -Paps%APS_VERSION%,activiti-admin
call %MVN_EXEC% clean pre-integration-test -pl aps-extensions-jar,activiti-app-overlay-war,activiti-app-overlay-docker -Paps%APS_VERSION%,activiti-admin
EXIT /B 0
:tail
docker-compose -f "%COMPOSE_FILE_PATH%" logs -f
Expand Down
8 changes: 4 additions & 4 deletions run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,23 +63,23 @@ purge_admin() {
}

build() {
$MVN_EXEC clean install -Paps$APS_VERSION
$MVN_EXEC clean pre-integration-test -Paps$APS_VERSION
}

build_admin() {
$MVN_EXEC clean install -Paps$APS_VERSION,activiti-admin
$MVN_EXEC clean pre-integration-test -Paps$APS_VERSION,activiti-admin
}

build_activiti_app(){
docker-compose -f "$COMPOSE_FILE_PATH" kill aps-current-project
yes | docker-compose -f "$COMPOSE_FILE_PATH" rm -f aps-current-project
$MVN_EXEC clean install -pl aps-extensions-jar,activiti-app-overlay-war,activiti-app-overlay-docker -Paps$APS_VERSION
$MVN_EXEC clean pre-integration-test -pl aps-extensions-jar,activiti-app-overlay-war,activiti-app-overlay-docker -Paps$APS_VERSION
}

build_activiti_app_admin(){
docker-compose -f "$COMPOSE_ADMIN_FILE_PATH" kill aps-current-project
yes | docker-compose -f "$COMPOSE_ADMIN_FILE_PATH" rm -f aps-current-project
$MVN_EXEC clean install -pl aps-extensions-jar,activiti-app-overlay-war,activiti-app-overlay-docker -Paps$APS_VERSION,activiti-admin
$MVN_EXEC clean pre-integration-test -pl aps-extensions-jar,activiti-app-overlay-war,activiti-app-overlay-docker -Paps$APS_VERSION,activiti-admin
}

tail() {
Expand Down

0 comments on commit b99d155

Please sign in to comment.