Skip to content

Commit

Permalink
added run scripts (#80), removed old plugins (#68), removed Dockerfil…
Browse files Browse the repository at this point in the history 
…es from target (#79), updated Maven plugins (#76)
  • Loading branch information
@OpenPj
OpenPj committed Nov 21, 2023
1 parent e4ddfe9 commit cfc0018
Show file tree
Hide file tree
Showing 11 changed files with 826 additions and 73 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Alfresco Process Services SDK Project 2.3.1
# Alfresco Process Services SDK Project 2.4.0-SNAPSHOT

The project consists of the following Maven submodules:

Expand Down
74 changes: 55 additions & 19 deletions activiti-app-integration-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<parent>
<groupId>org.alfresco.activiti</groupId>
<artifactId>aps-project</artifactId>
<version>2.3.1</version>
<version>2.4.0-SNAPSHOT</version>
</parent>

<properties>
<httpclient5.version>5.2.1</httpclient5.version>
<httpclient5.version>${integration.test.httpclient5.version}</httpclient5.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -73,23 +73,6 @@
<target>${maven.compiler.target}</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skip>${skip.integration.test}</skip>
<argLine>
--illegal-access=permit
</argLine>
</configuration>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
Expand Down Expand Up @@ -167,6 +150,59 @@
</pluginManagement>
</build>
</profile>
<profile>
<id>failsafe-openjdk-17</id>
<activation>
<activeByDefault>false</activeByDefault>
<jdk>17</jdk>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skip>${skip.integration.test}</skip>
</configuration>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>failsafe-openjdk-11</id>
<activation>
<activeByDefault>false</activeByDefault>
<jdk>11</jdk>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skip>${skip.integration.test}</skip>
<argLine>
--illegal-access=permit
</argLine>
</configuration>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
2 changes: 1 addition & 1 deletion ...-app-integration-tests/src/test/java/com/activiti/sdk/integrationtests/FourEyesAppIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.1-App.zip";
protected static final String appZipFile = "aps-extensions-jar-2.4.0-SNAPSHOT-App.zip";

protected static final String ACTIVITI_APP_BASE_PATH = BASE_PATH_PROTOCOL + "://" + BASE_PATH_HOSTNAME + ":"
+ BASE_PATH_PORT;
Expand Down
117 changes: 80 additions & 37 deletions activiti-app-overlay-docker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco.activiti</groupId>
<artifactId>aps-project</artifactId>
<version>2.3.1</version>
<version>2.4.0-SNAPSHOT</version>
</parent>

<properties>
Expand Down Expand Up @@ -70,6 +70,12 @@

<aps.debug.port>5005</aps.debug.port>
<catalina.opts.debug>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:${aps.debug.port}</catalina.opts.debug>

<docker.compose.dockerfile.activiti.app>Dockerfile-${aps.version}</docker.compose.dockerfile.activiti.app>
<docker.compose.dockerfile.activiti.admin>Dockerfile-admin-${aps.version}</docker.compose.dockerfile.activiti.admin>

<custom2.parent.project.basedir>${project.parent.basedir}</custom2.parent.project.basedir>

</properties>

<build>
Expand Down Expand Up @@ -99,9 +105,57 @@
</lifecycleMappingMetadata>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>${maven-antrun-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>groovy-maven-plugin</artifactId>
<version>${gmaven-plugin.version}</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>groovy-maven-plugin</artifactId>
<executions>
<execution>
<id>set-project-parent-basedir-for-ant</id>
<phase>validate</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<source>
project.properties.setProperty('ant.project.parent.basedir', project.parent.basedir.toString())
</source>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>copy-and-rename-dockerfiles</id>
<inherited>false</inherited>
<phase>package</phase>
<configuration>
<target>
<copy file="${ant.project.parent.basedir}/target/${docker.compose.dockerfile.activiti.app}" tofile="${ant.project.parent.basedir}/target/Dockerfile" />
<copy file="${ant.project.parent.basedir}/target/admin/${docker.compose.dockerfile.activiti.admin}" tofile="${ant.project.parent.basedir}/target/admin/Dockerfile" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
Expand Down Expand Up @@ -185,7 +239,7 @@
<executions>
<execution>
<id>copy-and-filter-docker-resources</id>
<phase>package</phase>
<phase>prepare-package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
Expand All @@ -200,6 +254,19 @@
<exclude>**/*.so</exclude>
<exclude>**/*.gz</exclude>
</excludes>
<includes>
<include>**/Dockerfile-${aps.version}*</include>
<include>**/Dockerfile-admin-${aps.version}*</include>
<include>**/docker-compose/*.*</include>
<include>**/config/*.*</include>
<include>**/license/*.*</include>
<include>**/logging/*.*</include>
<include>**/properties/*.*</include>
<include>**/admin</include>
<include>**/admin/properties/*.*</include>
<include>**/admin/tomcat/*.*</include>
<include>**/admin/tomcat/conf/*.*</include>
</includes>
</resource>
</resources>
<nonFilteredFileExtensions>
Expand Down Expand Up @@ -271,10 +338,10 @@
<platforms>linux/amd64, linux/arm64</platforms>
</buildOptions>
<contextDir>${project.parent.basedir}/target</contextDir>
<dockerFile>Dockerfile-${aps.version}</dockerFile>
<dockerFile>${docker.compose.dockerfile.activiti.app}</dockerFile>
<tags>
<tag>latest</tag>
<tag>${project.version}</tag>
<tag>${modified.version}</tag>
</tags>
</build>
<run>
Expand Down Expand Up @@ -429,37 +496,11 @@
<properties>
<docker-maven-plugin.skip.save>true</docker-maven-plugin.skip.save>
<docker-maven-plugin.build.save>true</docker-maven-plugin.build.save>
<docker.compose.dockerfile.activiti.app>Dockerfile-${aps.version}-arm64</docker.compose.dockerfile.activiti.app>
<docker.compose.dockerfile.activiti.admin>Dockerfile-admin-${aps.version}-arm64</docker.compose.dockerfile.activiti.admin>
</properties>
<build>
<plugins>
<plugin>
<groupId>com.coderplus.maven.plugins</groupId>
<artifactId>copy-rename-maven-plugin</artifactId>
<executions>
<execution>
<id>copy-Dockerfile-activiti-app</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<sourceFile>${project.parent.basedir}/target/Dockerfile-${aps.version}-arm64</sourceFile>
<destinationFile>${project.parent.basedir}/target/Dockerfile</destinationFile>
</configuration>
</execution>
<execution>
<id>copy-Dockerfile-activiti-admin</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<sourceFile>${project.parent.basedir}/target/admin/Dockerfile-admin-${aps.version}-arm64</sourceFile>
<destinationFile>${project.parent.basedir}/target/admin/Dockerfile</destinationFile>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
Expand All @@ -476,6 +517,7 @@
<arguments>
<argument>buildx</argument>
<argument>build</argument>
<argument>--file=${docker.compose.dockerfile.activiti.app}</argument>
<argument>--platform=linux/arm64</argument>
<argument>-taps-sdk/alfresco-process-services:development</argument>
<argument>-tlatest</argument>
Expand All @@ -500,6 +542,7 @@
<arguments>
<argument>buildx</argument>
<argument>build</argument>
<argument>--file=${docker.compose.dockerfile.activiti.admin}</argument>
<argument>--platform=linux/arm64</argument>
<argument>-taps-sdk/alfresco-process-services-admin:development</argument>
<argument>-tlatest</argument>
Expand Down Expand Up @@ -543,10 +586,10 @@
<build>
<skip>${skip.admin}</skip>
<contextDir>${project.parent.basedir}/target/admin</contextDir>
<dockerFile>Dockerfile-admin-${aps.version}</dockerFile>
<dockerFile>${docker.compose.dockerfile.activiti.admin}</dockerFile>
<tags>
<tag>latest</tag>
<tag>${project.version}</tag>
<tag>${modified.version}</tag>
</tags>
</build>
<run>
Expand Down Expand Up @@ -576,10 +619,10 @@
<platforms>linux/amd64, linux/arm64</platforms>
</buildOptions>
<contextDir>${project.parent.basedir}/target</contextDir>
<dockerFile>Dockerfile-${aps.version}</dockerFile>
<dockerFile>${docker.compose.dockerfile.activiti.app}</dockerFile>
<tags>
<tag>latest</tag>
<tag>${project.version}</tag>
<tag>${modified.version}</tag>
</tags>
<runCmds>
<runCmd>mkdir -p /act_data </runCmd>
Expand Down Expand Up @@ -753,5 +796,5 @@
</build>
</profile>
</profiles>

</project>
Loading

0 comments on commit cfc0018

Please sign in to comment.