24 Commits

Author SHA1 Message Date
d56f4f82fb v1.1.12 poms 2025-02-05 17:32:18 -05:00
adc5caf1c2 Merge branch 'develop' into stable 2025-02-05 17:31:50 -05:00
cf03dc8808 disable whitelisting (this is a test env) 2025-02-05 17:31:32 -05:00
f4f8fa8704 fixing aps-ext-rad classloader 2025-02-05 14:58:31 -05:00
8a0e38f078 Merge branch 'develop' into stable 2025-01-31 17:12:08 -05:00
87a0cb879c aps to aps-app 2025-01-31 17:11:54 -05:00
6ed4974f3f v1.1.11 poms 2025-01-31 15:48:11 -05:00
3df287166d Merge branch 'develop' into stable 2025-01-31 15:47:49 -05:00
1412e66768 configurable APS docker tag; APS default v2.4.6 2025-01-31 15:47:38 -05:00
0c50627eae v1.1.10 poms 2024-09-23 09:19:36 -04:00
5b7a8f1463 Merge branch 'develop' into stable 2024-09-23 09:15:56 -04:00
8a77c5a01d move attach-artifact to post-integration-test 2024-09-23 09:13:45 -04:00
45099b8e8b v1.1.9 poms 2024-09-12 10:36:56 -04:00
9ed1f8454a Merge branch 'develop' into stable 2024-09-12 10:36:39 -04:00
eaedecb5a7 using acs-ha enablement 2024-09-12 10:28:13 -04:00
1c9b4e98a2 v1.1.8 poms 2024-08-26 15:23:43 -04:00
88f8d8d3f8 Merge branch 'develop' into stable 2024-08-26 15:23:16 -04:00
3b26e76b06 upgrade amp-maven-plugin to v1.1.4 2024-08-26 15:23:04 -04:00
4514c3cc33 v1.1.7 poms 2024-08-26 15:22:46 -04:00
481321020d Merge branch 'develop' into stable 2024-08-24 18:23:36 -04:00
84d8e949bc upgrade amp-maven-plugin 2024-08-24 18:23:17 -04:00
24f8257920 v1.1.6 poms 2024-08-20 14:43:11 -04:00
f2468fa6a2 Merge branch 'develop' into stable 2024-08-20 14:42:51 -04:00
974d46775f fix module.version 2024-08-20 14:42:41 -04:00
61 changed files with 98 additions and 80 deletions

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -30,6 +30,23 @@
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<id>module-snapshot-timestamp</id>
<phase>initialize</phase>
<goals><goal>timestamp-property</goal></goals>
<configuration>
<name>module.timestamp</name>
<timeSource>build</timeSource>
<pattern>yyyyMMddHHmmss</pattern>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.inteligr8</groupId>
<artifactId>regex-maven-plugin</artifactId>
@@ -41,12 +58,12 @@
<goals><goal>replace-text</goal></goals>
<configuration>
<text>${project.version}</text>
<newProperty>project.moduleVersion</newProperty>
<newProperty>module.version</newProperty>
<regexes>
<!-- turn -SNAPSHOT into A0 -->
<!-- turn -SNAPSHOT into ATIMESTAMP -->
<regex>
<pattern>^(.*)-SNAPSHOT$</pattern>
<replacement>$1-A0</replacement>
<replacement>$1-A${module.timestamp}</replacement>
</regex>
<!-- all others are just a copy -->
<regex>
@@ -246,7 +263,7 @@
<plugin>
<groupId>com.inteligr8.alfresco</groupId>
<artifactId>amp-maven-plugin</artifactId>
<version>1.1.2</version>
<version>1.1.4</version>
<executions>
<execution>
<id>build-amp-file</id>
@@ -303,7 +320,7 @@
<executions>
<execution>
<id>attach-amp</id>
<phase>verify</phase>
<phase>post-integration-test</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
@@ -319,7 +336,7 @@
</execution>
<execution>
<id>attach-amp-classifier</id>
<phase>verify</phase>
<phase>post-integration-test</phase>
<goals>
<goal>attach-artifact</goal>
</goals>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -149,7 +149,7 @@
<name>docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version}</name>
<alias>acs-platform-ha</alias>
<run>
<skip>false</skip>
<skip>${beedk.deploy.acs-ha.skip}</skip>
<env>
<JAVA_MEMORY_MAX>${acs-platform.memory}</JAVA_MEMORY_MAX>
<ENABLE_JDWP>false</ENABLE_JDWP>
@@ -228,18 +228,10 @@
<image>
<name>postgres:${acs-postgres.version}</name>
<alias>acs-db</alias>
<links>
<link>acs-platform</link>
<link>acs-platform-ha</link>
</links>
</image>
<image>
<name>apache/activemq-classic:${acs-activemq.version}</name>
<alias>acs-mq</alias>
<links>
<link>acs-platform</link>
<link>acs-platform-ha</link>
</links>
</image>
<image>
<name>docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version}</name>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -60,7 +60,7 @@
</property>
</activation>
<properties>
<aps.version>2.4.1</aps.version>
<aps.version>2.4.6</aps.version>
<!-- add properties here -->
<aps.tomcat.opts>-Dproperty-to-set=value</aps.tomcat.opts>
</properties>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -16,7 +16,7 @@
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.release>11</maven.compiler.release>
<aps.version>2.4.1</aps.version>
<aps.version>2.4.6</aps.version>
</properties>
<dependencies>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -94,13 +94,20 @@
</image>
<image>
<name>docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version}</name>
<alias>aps</alias>
<alias>aps-app</alias>
<run>
<env>
<JAVA_MEMORY_MAX>${aps.memory}</JAVA_MEMORY_MAX>
<ENABLE_HOTSWAP>${aps.hotswap.enabled}</ENABLE_HOTSWAP>
<ENABLE_JDWP>${aps.debugger.enabled}</ENABLE_JDWP>
<CATALINA_OPTS>-Ddatasource.driver=org.postgresql.Driver -Ddatasource.url=jdbc:postgresql://${project.artifactId}-aps-db:5432/activiti \
<CATALINA_OPTS>--add-opens java.base/java.net=ALL-UNNAMED \
-Djava.awt.headless=true \
-Ddatasource.driver=org.postgresql.Driver -Ddatasource.url=jdbc:postgresql://${project.artifactId}-aps-db:5432/activiti \
-Djavascript.secure-scripting.enabled=false -Djavascript.secure-scripting.enable-class-whitelisting=false \
-Dbeans.whitelisting.enabled=false \
-Del.whitelisting.enabled=false \
-Dshell.whitelisting.enabled=false \
-Dservice.task.class.whitelisting.enabled=false \
${aps.tomcat.opts}</CATALINA_OPTS>
</env>
<ports>
@@ -118,8 +125,8 @@
<bind>
<volume>${aps.license.directory}:/root/.activiti/enterprise-license:ro</volume>
<volume>${project.build.warFile}:/var/lib/tomcat/webapps/activiti-app.war:ro</volume>
<volume>${beedk.deploy.aps.classesDirectory}:/var/lib/tomcat/dev/classes:ro</volume>
<volume>${beedk.deploy.aps.testClassesDirectory}:/var/lib/tomcat/dev/post-rsrc:ro</volume>
<volume>${beedk.deploy.aps.classesDirectory}:/var/lib/tomcat/dev/post-rsrc:ro</volume>
<volume>${beedk.deploy.aps.testClassesDirectory}:/var/lib/tomcat/dev/post-rsrc-extra1:ro</volume>
<volume>${beedk.deploy.aps.extDirectory}:/var/lib/tomcat/dev/lib:ro</volume>
</bind>
</volumes>
@@ -184,8 +191,8 @@
<!-- versions -->
<aps-postgres.version>12</aps-postgres.version>
<aps.version>2.4.4</aps.version>
<tomcat-rad.version>9-2.1</tomcat-rad.version>
<aps.version>2.4.6</aps.version>
<tomcat-rad.version>9-2.2</tomcat-rad.version>
<!-- results -->
<project.build.warFile>${project.build.warDirectory}/${aps.war.artifactId}-${aps.war.version}.war</project.build.warFile>

View File

@@ -53,7 +53,8 @@ The following properties are intended to be exposed by inheriting Public API Mav
| `aps.timeout` | | 60000 | The time to wait for the startup to complete, in milliseconds. |
| `alfresco.license.directory` | | `${user.home}/alfresco/license` | The base path to search for Alfresco licenses. |
| `aps.license.directory` | | `${alfresco.license.directory}/aps` | The base path to search for an APS license. |
| `aps.version` | | 1.11.1.1 | The version of the [Process Services Docker container](https://hub.docker.com/r/alfresco/process-services). |
| `aps.docker-tag` | | `alfresco/process-services` | The Docker image tag for APS. |
| `aps.version` | | 2.4.6 | The version of the [Process Services Docker container](https://hub.docker.com/r/alfresco/process-services). |
| `aps-postgres.version` | | *not important* | The version of PostgreSQL to use in the integration testing infrastructure. |
### Other APIs

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -58,7 +58,7 @@
</run>
</image>
<image>
<name>alfresco/process-services:${aps.version}</name>
<name>${aps.docker-tag}:${aps.version}</name>
<alias>aps-app</alias>
<run>
<env>
@@ -111,7 +111,8 @@
<!-- versions -->
<aps-postgres.version>9.6</aps-postgres.version>
<aps.version>1.11.1.1</aps.version>
<aps.docker-tag>alfresco/process-services</aps.docker-tag>
<aps.version>2.4.6</aps.version>
</properties>
</profile>
</profiles>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -10,7 +10,7 @@
<parent>
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -6,7 +6,7 @@
<groupId>com.inteligr8.ootbee</groupId>
<artifactId>beedk-parent</artifactId>
<version>1.1.5</version>
<version>1.1.12</version>
<packaging>pom</packaging>
<name>Order of the Bee Development Kit</name>