Compare commits
38 Commits
Author | SHA1 | Date | |
---|---|---|---|
d56f4f82fb | |||
adc5caf1c2 | |||
cf03dc8808 | |||
f4f8fa8704 | |||
8a0e38f078 | |||
87a0cb879c | |||
6ed4974f3f | |||
3df287166d | |||
1412e66768 | |||
0c50627eae | |||
5b7a8f1463 | |||
8a77c5a01d | |||
45099b8e8b | |||
9ed1f8454a | |||
eaedecb5a7 | |||
1c9b4e98a2 | |||
88f8d8d3f8 | |||
3b26e76b06 | |||
4514c3cc33 | |||
481321020d | |||
84d8e949bc | |||
24f8257920 | |||
f2468fa6a2 | |||
974d46775f | |||
84a8f38c5a | |||
b3e28997ee | |||
f19e1ce7a7 | |||
00be2e069b | |||
9eab7ba2af | |||
8f3d1e4a04 | |||
0807afbcf9 | |||
a1a1da0cc0 | |||
db795e7e53 | |||
6c3d5ebf52 | |||
c17d8ec3df | |||
f4741d89df | |||
3f73c51c9d | |||
2acc4dc634 |
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -14,8 +14,8 @@
|
||||
<properties>
|
||||
<alfresco.sdk.version>4.8.0</alfresco.sdk.version>
|
||||
<edition>community</edition>
|
||||
<alfresco.platform.version>23.2.0</alfresco.platform.version>
|
||||
<alfresco.share.version>23.2.0.72</alfresco.share.version>
|
||||
<alfresco.platform.version>7.4.2</alfresco.platform.version>
|
||||
<alfresco.share.version>22.17</alfresco.share.version>
|
||||
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<maven.compiler.source>8</maven.compiler.source>
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -30,6 +30,51 @@
|
||||
</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>
|
||||
<version>1.0.5</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>acs-module-version</id>
|
||||
<phase>initialize</phase>
|
||||
<goals><goal>replace-text</goal></goals>
|
||||
<configuration>
|
||||
<text>${project.version}</text>
|
||||
<newProperty>module.version</newProperty>
|
||||
<regexes>
|
||||
<!-- turn -SNAPSHOT into ATIMESTAMP -->
|
||||
<regex>
|
||||
<pattern>^(.*)-SNAPSHOT$</pattern>
|
||||
<replacement>$1-A${module.timestamp}</replacement>
|
||||
</regex>
|
||||
<!-- all others are just a copy -->
|
||||
<regex>
|
||||
<pattern>^(.*)$</pattern>
|
||||
<replacement>$1</replacement>
|
||||
</regex>
|
||||
</regexes>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>build-helper-maven-plugin</artifactId>
|
||||
@@ -218,7 +263,7 @@
|
||||
<plugin>
|
||||
<groupId>com.inteligr8.alfresco</groupId>
|
||||
<artifactId>amp-maven-plugin</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.4</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>build-amp-file</id>
|
||||
@@ -275,7 +320,7 @@
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-amp</id>
|
||||
<phase>verify</phase>
|
||||
<phase>post-integration-test</phase>
|
||||
<goals>
|
||||
<goal>attach-artifact</goal>
|
||||
</goals>
|
||||
@@ -291,7 +336,7 @@
|
||||
</execution>
|
||||
<execution>
|
||||
<id>attach-amp-classifier</id>
|
||||
<phase>verify</phase>
|
||||
<phase>post-integration-test</phase>
|
||||
<goals>
|
||||
<goal>attach-artifact</goal>
|
||||
</goals>
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -48,6 +48,7 @@ The following properties are intended to be exposed by inheriting Public API Mav
|
||||
| Maven Property | Required | Default | Description |
|
||||
| -------------------------- |:--------:| --------------- | ----------- |
|
||||
| `acs-platform.port` | | 8080 | The port to expose on `localhost` for scripts to use during integration testing to verify the state of the application; not for a developer or user. |
|
||||
| `acs-platform-ha.port` | | 8081 | The port to expose on `localhost` for scripts to use during integration testing to verify the state of the application; not for a developer or user. |
|
||||
| `acs-postgres.port` | | 5432 | The port to expose on `localhost` for scripts to use during integration testing to verify the state of the application; not for a developer or user. |
|
||||
| `acs-activemq.port` | | 8161 | The port to expose on `localhost` for scripts to use during integration testing to verify the state of the application; not for a developer or user. |
|
||||
| `acs-platform.tomcat.opts` | | | Additional `CATALINA_OPTS` to add to the Apache Tomcat startup.<br/>*May be overridden by any POM parent or Maven Tile.* |
|
||||
@@ -67,6 +68,7 @@ The following properties are only intended to be defined by BeeDK components.
|
||||
| `beedk.deploy.platform.testClassesDirectory` | | | An additional test classpath directory to sideload into the web application. |
|
||||
| `beedk.deploy.platform.extDirectory` | | | An additional directory of JARs to sideload into the web application. |
|
||||
| `beedk.deploy.platform.dataDirectory` | | `${project.build.directory}/alf_data` | The temporary binary storage location for ACS. |
|
||||
| `beedk.deploy.acs-ha.enabled` | | false | Start an additional instance of the ACS platform for cluster-related testing. |
|
||||
| `beedk.deploy.acs-search.enabled` | | false | **Do not** set explicitly; just include the [`beedk-acs-search-it-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-search-it-tile) tile **AFTER** this tile. |
|
||||
| `beedk.deploy.alts.enabled` | | false | **Do not** set explicitly; just include the [`beedk-acs-lts-it-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-lts-it-tile) tile **AFTER** this tile. |
|
||||
| `beedk.deploy.ats.enabled` | | false | **Do not** set explicitly; just include the [`beedk-ats-it-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-ats-it-tile) tile **AFTER** this tile. |
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -31,6 +31,7 @@
|
||||
<phase>pre-integration-test</phase>
|
||||
<goals><goal>start</goal></goals>
|
||||
<configuration>
|
||||
<startParallel>true</startParallel>
|
||||
<images>
|
||||
<image>
|
||||
<name>postgres:${acs-postgres.version}</name>
|
||||
@@ -52,10 +53,17 @@
|
||||
</run>
|
||||
</image>
|
||||
<image>
|
||||
<name>alfresco/alfresco-activemq:${acs-activemq.version}</name>
|
||||
<name>apache/activemq-classic:${acs-activemq.version}</name>
|
||||
<alias>acs-mq</alias>
|
||||
<run>
|
||||
<skip>${skipTests}</skip>
|
||||
<env>
|
||||
<ACTIVEMQ_WEBCONSOLE_USE_DEFAULT_ADDRESS>false</ACTIVEMQ_WEBCONSOLE_USE_DEFAULT_ADDRESS>
|
||||
<ACTIVEMQ_USERNAME>alfresco</ACTIVEMQ_USERNAME>
|
||||
<ACTIVEMQ_PASSWORD>alfresco</ACTIVEMQ_PASSWORD>
|
||||
<ACTIVEMQ_WEBADMIN_USERNAME>admin</ACTIVEMQ_WEBADMIN_USERNAME>
|
||||
<ACTIVEMQ_WEBADMIN_PASSWORD>admin</ACTIVEMQ_WEBADMIN_PASSWORD>
|
||||
</env>
|
||||
<ports>
|
||||
<port>${acs-activemq.port}:8161</port>
|
||||
</ports>
|
||||
@@ -74,19 +82,44 @@
|
||||
<JAVA_MEMORY_MAX>${acs-platform.memory}</JAVA_MEMORY_MAX>
|
||||
<ENABLE_JDWP>false</ENABLE_JDWP>
|
||||
<ENABLE_HOTSWAP>false</ENABLE_HOTSWAP>
|
||||
<CATALINA_OPTS>-Ddir.root=/tmp/alf_data -Ddb.driver=org.postgresql.Driver -Ddb.url=jdbc:postgresql://${project.artifactId}-acs-db:5432/alfresco \
|
||||
<CATALINA_OPTS>--add-opens=java.base/java.net=ALL-UNNAMED \
|
||||
-Dencryption.keystore.location=/tmp/metadata.keystore \
|
||||
-Dmetadata-keystore.password=alfresco \
|
||||
-Dmetadata-keystore.aliases=metadata \
|
||||
-Dmetadata-keystore.metadata.password=alfresco \
|
||||
-Dmetadata-keystore.metadata.algorithm=AES \
|
||||
-Ddir.root=/tmp/alf_data \
|
||||
-Ddb.driver=org.postgresql.Driver \
|
||||
-Ddb.url=jdbc:postgresql://${project.artifactId}-acs-db:5432/alfresco \
|
||||
-Dmessaging.broker.url=failover:\(tcp://${project.artifactId}-acs-mq:61616\)?timeout\=3000\&jms.useCompression\=true \
|
||||
-Dtransform.service.enabled=${beedk.deploy.ats.enabled} -Dtransform.service.url=http://${project.artifactId}-ats-atr:8095 -Dsfs.url=http://${project.artifactId}-ats-sfs:8099 \
|
||||
-Dmessaging.broker.username=alfresco \
|
||||
-Dmessaging.broker.password=alfresco \
|
||||
-Dtransform.service.enabled=${beedk.deploy.ats.enabled} \
|
||||
-Dtransform.service.url=http://${project.artifactId}-ats-atr:8095 \
|
||||
-Dsfs.url=http://${project.artifactId}-ats-sfs:8099 \
|
||||
-Dlocal.transform.service.enabled=${beedk.deploy.alts.enabled} \
|
||||
-DlocalTransform.core-aio.url=http://${project.artifactId}-ate-aio:8090 -DlocalTransform.ate.url=http://${project.artifactId}-ate:8090 \
|
||||
-Djodconverter.enabled=false -Dsystem.workflow.engine.activiti.enabled=true \
|
||||
-Dalfresco-pdf-renderer.url=http://${project.artifactId}-ate-aio:8090 -Djodconverter.url=http://${project.artifactId}-ate-aio:8090 -Dimg.url=http://${project.artifactId}-ate-aio:8090 -Dtika.url=http://${project.artifactId}-ate-aio:8090 -Dtransform.misc.url=http://${project.artifactId}-ate-aio:8090 \
|
||||
-Dindex.subsystem.name=${beedk.deploy.platform.index} -Dsolr.host=${project.artifactId}-acs-search -Dsolr.secureComms=none \
|
||||
-DlocalTransform.core-aio.url=http://${project.artifactId}-ate-aio:8090 \
|
||||
-DlocalTransform.ate.url=http://${project.artifactId}-ate:8090 \
|
||||
-Djodconverter.enabled=false \
|
||||
-Dsystem.workflow.engine.activiti.enabled=false \
|
||||
-Dalfresco-pdf-renderer.url=http://${project.artifactId}-ate-aio:8090 \
|
||||
-Djodconverter.url=http://${project.artifactId}-ate-aio:8090 \
|
||||
-Dimg.url=http://${project.artifactId}-ate-aio:8090 \
|
||||
-Dtika.url=http://${project.artifactId}-ate-aio:8090 \
|
||||
-Dtransform.misc.url=http://${project.artifactId}-ate-aio:8090 \
|
||||
-Dindex.subsystem.name=${beedk.deploy.platform.index} \
|
||||
-Dsolr.host=${project.artifactId}-acs-search \
|
||||
-Dsolr.secureComms=secret \
|
||||
-Dsolr.sharedSecret=alfresco-secret \
|
||||
${acs-platform.tomcat.opts}</CATALINA_OPTS>
|
||||
</env>
|
||||
<ports>
|
||||
<port>${acs-platform.port}:8080</port>
|
||||
</ports>
|
||||
<links>
|
||||
<link>acs-db</link>
|
||||
<link>acs-mq</link>
|
||||
</links>
|
||||
<network>
|
||||
<mode>custom</mode>
|
||||
<name>${project.artifactId}</name>
|
||||
@@ -95,9 +128,11 @@
|
||||
<bind>
|
||||
<volume>${acs.license.directory}:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro</volume>
|
||||
<volume>${beedk.deploy.platform.warFile}:/var/lib/tomcat/webapps/alfresco.war:ro</volume>
|
||||
<volume>${beedk.deploy.platform.testClassesDirectory}:/var/lib/tomcat/dev/classes:ro</volume>
|
||||
<volume>${beedk.deploy.platform.classesDirectory}:/var/lib/tomcat/dev/classes:ro</volume>
|
||||
<volume>${beedk.deploy.platform.testClassesDirectory}:/var/lib/tomcat/dev/classes-extra1:ro</volume>
|
||||
<volume>${beedk.deploy.platform.extDirectory}:/var/lib/tomcat/dev/lib:ro</volume>
|
||||
<volume>${beedk.deploy.platform.dataDirectory}:/tmp/alf_data:rw</volume>
|
||||
<volume>${basedir}/metadata.keystore:/tmp/metadata.keystore:ro</volume>
|
||||
</bind>
|
||||
</volumes>
|
||||
<wait>
|
||||
@@ -110,6 +145,77 @@
|
||||
</wait>
|
||||
</run>
|
||||
</image>
|
||||
<image>
|
||||
<name>docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version}</name>
|
||||
<alias>acs-platform-ha</alias>
|
||||
<run>
|
||||
<skip>${beedk.deploy.acs-ha.skip}</skip>
|
||||
<env>
|
||||
<JAVA_MEMORY_MAX>${acs-platform.memory}</JAVA_MEMORY_MAX>
|
||||
<ENABLE_JDWP>false</ENABLE_JDWP>
|
||||
<ENABLE_HOTSWAP>false</ENABLE_HOTSWAP>
|
||||
<CATALINA_OPTS>--add-opens=java.base/java.net=ALL-UNNAMED \
|
||||
-Dencryption.keystore.location=/tmp/metadata.keystore \
|
||||
-Dmetadata-keystore.password=alfresco \
|
||||
-Dmetadata-keystore.aliases=metadata \
|
||||
-Dmetadata-keystore.metadata.password=alfresco \
|
||||
-Dmetadata-keystore.metadata.algorithm=AES \
|
||||
-Ddir.root=/tmp/alf_data \
|
||||
-Ddb.driver=org.postgresql.Driver \
|
||||
-Ddb.url=jdbc:postgresql://${project.artifactId}-acs-db:5432/alfresco \
|
||||
-Dmessaging.broker.url=failover:\(tcp://${project.artifactId}-acs-mq:61616\)?timeout\=3000\&jms.useCompression\=true \
|
||||
-Dmessaging.broker.username=alfresco \
|
||||
-Dmessaging.broker.password=alfresco \
|
||||
-Dtransform.service.enabled=${beedk.deploy.ats.enabled} \
|
||||
-Dtransform.service.url=http://${project.artifactId}-ats-atr:8095 \
|
||||
-Dsfs.url=http://${project.artifactId}-ats-sfs:8099 \
|
||||
-Dlocal.transform.service.enabled=${beedk.deploy.alts.enabled} \
|
||||
-DlocalTransform.core-aio.url=http://${project.artifactId}-ate-aio:8090 \
|
||||
-DlocalTransform.ate.url=http://${project.artifactId}-ate:8090 \
|
||||
-Djodconverter.enabled=false \
|
||||
-Dsystem.workflow.engine.activiti.enabled=false \
|
||||
-Dalfresco-pdf-renderer.url=http://${project.artifactId}-ate-aio:8090 \
|
||||
-Djodconverter.url=http://${project.artifactId}-ate-aio:8090 \
|
||||
-Dimg.url=http://${project.artifactId}-ate-aio:8090 \
|
||||
-Dtika.url=http://${project.artifactId}-ate-aio:8090 \
|
||||
-Dtransform.misc.url=http://${project.artifactId}-ate-aio:8090 \
|
||||
-Dindex.subsystem.name=${beedk.deploy.platform.index} \
|
||||
-Dsolr.host=${project.artifactId}-acs-search \
|
||||
-Dsolr.secureComms=secret \
|
||||
-Dsolr.sharedSecret=alfresco-secret \
|
||||
${acs-platform-ha.tomcat.opts}</CATALINA_OPTS>
|
||||
</env>
|
||||
<ports>
|
||||
<port>${acs-platform-ha.port}:8080</port>
|
||||
</ports>
|
||||
<links>
|
||||
<link>acs-db</link>
|
||||
<link>acs-mq</link>
|
||||
</links>
|
||||
<network>
|
||||
<mode>custom</mode>
|
||||
<name>${project.artifactId}</name>
|
||||
</network>
|
||||
<volumes>
|
||||
<bind>
|
||||
<volume>${acs.license.directory}:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro</volume>
|
||||
<volume>${beedk.deploy.platform.warFile}:/var/lib/tomcat/webapps/alfresco.war:ro</volume>
|
||||
<volume>${beedk.deploy.platform.classesDirectory}:/var/lib/tomcat/dev/classes:ro</volume>
|
||||
<volume>${beedk.deploy.platform.extDirectory}:/var/lib/tomcat/dev/lib:ro</volume>
|
||||
<volume>${beedk.deploy.platform.dataDirectory}:/tmp/alf_data:rw</volume>
|
||||
<volume>${basedir}/metadata.keystore:/tmp/metadata.keystore:ro</volume>
|
||||
</bind>
|
||||
</volumes>
|
||||
<wait>
|
||||
<http>
|
||||
<url>http://localhost:${acs-platform-ha.port}/alfresco/service/api/server</url>
|
||||
<method>GET</method>
|
||||
<status>200..399</status>
|
||||
</http>
|
||||
<time>${acs-platform.timeout}</time>
|
||||
</wait>
|
||||
</run>
|
||||
</image>
|
||||
</images>
|
||||
</configuration>
|
||||
</execution>
|
||||
@@ -124,13 +230,17 @@
|
||||
<alias>acs-db</alias>
|
||||
</image>
|
||||
<image>
|
||||
<name>alfresco/alfresco-activemq:${acs-activemq.version}</name>
|
||||
<name>apache/activemq-classic:${acs-activemq.version}</name>
|
||||
<alias>acs-mq</alias>
|
||||
</image>
|
||||
<image>
|
||||
<name>docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version}</name>
|
||||
<alias>acs-platform</alias>
|
||||
</image>
|
||||
<image>
|
||||
<name>docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version}</name>
|
||||
<alias>acs-platform-ha</alias>
|
||||
</image>
|
||||
</images>
|
||||
</configuration>
|
||||
</execution>
|
||||
@@ -140,6 +250,28 @@
|
||||
</build>
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>acs-ha-disabled</id>
|
||||
<activation>
|
||||
<property>
|
||||
<name>!beedk.deploy.acs-ha.enabled</name>
|
||||
</property>
|
||||
</activation>
|
||||
<properties>
|
||||
<beedk.deploy.acs-ha.skip>true</beedk.deploy.acs-ha.skip>
|
||||
</properties>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>acs-ha-enabled</id>
|
||||
<activation>
|
||||
<property>
|
||||
<name>beedk.deploy.acs-ha.enabled</name>
|
||||
</property>
|
||||
</activation>
|
||||
<properties>
|
||||
<beedk.deploy.acs-ha.skip>${skipTests}</beedk.deploy.acs-ha.skip>
|
||||
</properties>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>acs-search-disabled</id>
|
||||
<activation>
|
||||
@@ -207,6 +339,7 @@
|
||||
</activation>
|
||||
<properties>
|
||||
<!-- configurable -->
|
||||
<beedk.deploy.platform.classesDirectory>${project.build.directory}/doesnotexist</beedk.deploy.platform.classesDirectory>
|
||||
<beedk.deploy.platform.testClassesDirectory>${project.build.directory}/doesnotexist</beedk.deploy.platform.testClassesDirectory>
|
||||
<beedk.deploy.platform.extDirectory>${project.build.directory}/doesnotexist</beedk.deploy.platform.extDirectory>
|
||||
<beedk.deploy.platform.dataDirectory>${project.build.directory}/alf_data</beedk.deploy.platform.dataDirectory>
|
||||
@@ -219,6 +352,7 @@
|
||||
<acs-postgres.port>5432</acs-postgres.port>
|
||||
<acs-activemq.port>8161</acs-activemq.port>
|
||||
<acs-platform.port>8080</acs-platform.port>
|
||||
<acs-platform-ha.port>8081</acs-platform-ha.port>
|
||||
|
||||
<!-- versions -->
|
||||
<acs-postgres.version>12</acs-postgres.version>
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
Binary file not shown.
@@ -16,7 +16,7 @@
|
||||
<maven.compiler.target>8</maven.compiler.target>
|
||||
|
||||
<alfresco.sdk.version>4.8.0</alfresco.sdk.version>
|
||||
<alfresco.platform.version>23.2.0</alfresco.platform.version>
|
||||
<alfresco.platform.version>7.4.2</alfresco.platform.version>
|
||||
</properties>
|
||||
|
||||
<dependencyManagement>
|
||||
|
@@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
|
||||
discoverArtifactId() {
|
||||
local ARTIFACT_ID=`mvn -q -Dexpression=project.artifactId -DforceStdout help:evaluate`
|
||||
local ARTIFACT_ID=`mvn -q -Dexpression=project.artifactId -DforceStdout help:evaluate | sed 's/\x1B\[[0-9;]\{1,\}[A-Za-z]//g'`
|
||||
}
|
||||
|
||||
rebuild() {
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -85,7 +85,7 @@ The following properties are only intended to be defined by BeeDK components.
|
||||
| `beedk.rad.acs-search.enabled` | | false | **Do not** set explicitly; just include the [`beedk-acs-search-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-search-rad-tile) tile **AFTER** this tile. |
|
||||
| `beedk.rad.alts.enabled` | | false | **Do not** set explicitly; just include the [`beedk-acs-lts-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-acs-lts-rad-tile) tile **AFTER** this tile. |
|
||||
| `beedk.rad.ats.enabled` | | false | **Do not** set explicitly; just include the [`beedk-ats-rad-tile`](/inteligr8/ootbee-beedk/src/stable/beedk-ats-rad-tile) tile **AFTER** this tile. |
|
||||
| `acs-api-explorer.version` | | `23.2.0` | The API Explorer version. You could use `${alfresco.platform.version}` in ACS Enterprise. This will eventually parse the ACS Platform version for the right value. |
|
||||
| `acs-api-explorer.version` | | `7.4.2` | The API Explorer version. You could use `${alfresco.platform.version}` in ACS Enterprise. This will eventually parse the ACS Platform version for the right value. |
|
||||
|
||||
### Other APIs
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -99,9 +99,16 @@
|
||||
</run>
|
||||
</image>
|
||||
<image>
|
||||
<name>alfresco/alfresco-activemq:${acs-activemq.version}</name>
|
||||
<name>apache/activemq-classic:${acs-activemq.version}</name>
|
||||
<alias>acs-mq</alias>
|
||||
<run>
|
||||
<env>
|
||||
<ACTIVEMQ_WEBCONSOLE_USE_DEFAULT_ADDRESS>false</ACTIVEMQ_WEBCONSOLE_USE_DEFAULT_ADDRESS>
|
||||
<ACTIVEMQ_USERNAME>alfresco</ACTIVEMQ_USERNAME>
|
||||
<ACTIVEMQ_PASSWORD>alfresco</ACTIVEMQ_PASSWORD>
|
||||
<ACTIVEMQ_WEBADMIN_USERNAME>admin</ACTIVEMQ_WEBADMIN_USERNAME>
|
||||
<ACTIVEMQ_WEBADMIN_PASSWORD>admin</ACTIVEMQ_WEBADMIN_PASSWORD>
|
||||
</env>
|
||||
<ports>
|
||||
<port>${acs-activemq.port}:8161</port>
|
||||
</ports>
|
||||
@@ -120,14 +127,36 @@
|
||||
<ENABLE_JDWP>${acs-platform.debugger.enabled}</ENABLE_JDWP>
|
||||
<ENABLE_HOTSWAP>${acs-platform.hotswap.enabled}</ENABLE_HOTSWAP>
|
||||
<DISABLE_HOTSWAP_PLUGINS>${acs-platform.hotswap.disablePlugins}</DISABLE_HOTSWAP_PLUGINS>
|
||||
<CATALINA_OPTS>-Ddir.root=/tmp/alf_data -Ddb.driver=org.postgresql.Driver -Ddb.url=jdbc:postgresql://${project.artifactId}-acs-db:5432/alfresco \
|
||||
<CATALINA_OPTS>--add-opens=java.base/java.net=ALL-UNNAMED \
|
||||
-Dencryption.keystore.location=/tmp/metadata.keystore \
|
||||
-Dmetadata-keystore.password=alfresco \
|
||||
-Dmetadata-keystore.aliases=metadata \
|
||||
-Dmetadata-keystore.metadata.password=alfresco \
|
||||
-Dmetadata-keystore.metadata.algorithm=AES \
|
||||
-Ddir.root=/tmp/alf_data \
|
||||
-Ddb.driver=org.postgresql.Driver \
|
||||
-Ddb.url=jdbc:postgresql://${project.artifactId}-acs-db:5432/alfresco \
|
||||
-Dmessaging.broker.url=failover:\(tcp://${project.artifactId}-acs-mq:61616\)?timeout\=3000\&jms.useCompression\=true \
|
||||
-Dtransform.service.enabled=${beedk.rad.ats.enabled} -Dtransform.service.url=http://${project.artifactId}-ats-atr:8095 -Dsfs.url=http://${project.artifactId}-ats-sfs:8099 \
|
||||
-Dmessaging.broker.username=alfresco \
|
||||
-Dmessaging.broker.password=alfresco \
|
||||
-Dtransform.service.enabled=${beedk.rad.ats.enabled} \
|
||||
-Dtransform.service.url=http://${project.artifactId}-ats-atr:8095 \
|
||||
-Dsfs.url=http://${project.artifactId}-ats-sfs:8099 \
|
||||
-Dlocal.transform.service.enabled=${beedk.rad.alts.enabled} \
|
||||
-DlocalTransform.core-aio.url=http://${project.artifactId}-ate-aio:8090 -DlocalTransform.ate.url=http://${project.artifactId}-ate:8090 \
|
||||
-Djodconverter.enabled=false -Dsystem.workflow.engine.activiti.enabled=true \
|
||||
-Dalfresco-pdf-renderer.url=http://${project.artifactId}-ate-aio:8090 -Djodconverter.url=http://${project.artifactId}-ate-aio:8090 -Dimg.url=http://${project.artifactId}-ate-aio:8090 -Dtika.url=http://${project.artifactId}-ate-aio:8090 -Dtransform.misc.url=http://${project.artifactId}-ate-aio:8090 \
|
||||
-Dindex.subsystem.name=${beedk.rad.platform.index} -Dsolr.host=${project.artifactId}-acs-search -Dsolr.secureComms=none \
|
||||
-DlocalTransform.core-aio.url=http://${project.artifactId}-ate-aio:8090 \
|
||||
-DlocalTransform.ate.url=http://${project.artifactId}-ate:8090 \
|
||||
-Djodconverter.enabled=false \
|
||||
-Dsystem.workflow.engine.activiti.enabled=false \
|
||||
-Dalfresco-pdf-renderer.url=http://${project.artifactId}-ate-aio:8090 \
|
||||
-Djodconverter.url=http://${project.artifactId}-ate-aio:8090 \
|
||||
-Dimg.url=http://${project.artifactId}-ate-aio:8090 \
|
||||
-Dtika.url=http://${project.artifactId}-ate-aio:8090 \
|
||||
-Dtransform.misc.url=http://${project.artifactId}-ate-aio:8090 \
|
||||
-Dindex.subsystem.name=${beedk.rad.platform.index} \
|
||||
-Dsolr.host=${project.artifactId}-acs-search \
|
||||
-Dsolr.secureComms=secret \
|
||||
-Dsolr.sharedSecret=alfresco-secret \
|
||||
-Dcsrf.filter.enabled=false \
|
||||
${acs-platform.tomcat.opts}</CATALINA_OPTS>
|
||||
</env>
|
||||
<ports>
|
||||
@@ -151,6 +180,7 @@
|
||||
<volume>${beedk.deploy.platform.extDirectory}:/var/lib/tomcat/dev/lib:ro</volume>
|
||||
<volume>${beedk.deploy.platform.webDirectory}:/var/lib/tomcat/dev/web:ro</volume>
|
||||
<volume>${beedk.deploy.platform.dataDirectory}:/tmp/alf_data:rw</volume>
|
||||
<volume>${basedir}/metadata.keystore:/tmp/metadata.keystore:ro</volume>
|
||||
</bind>
|
||||
</volumes>
|
||||
<wait>
|
||||
@@ -266,7 +296,7 @@
|
||||
<acs-platform.debugger.port>8000</acs-platform.debugger.port>
|
||||
|
||||
<!-- versions -->
|
||||
<acs-api-explorer.version>23.2.0</acs-api-explorer.version> <!-- TODO use and parse alfresco.platform.version -->
|
||||
<acs-api-explorer.version>7.4.0</acs-api-explorer.version> <!-- TODO use and parse alfresco.platform.version -->
|
||||
<acs-aos.war.version>1.3.2.1</acs-aos.war.version>
|
||||
<acs-postgres.version>12</acs-postgres.version>
|
||||
<acs-activemq.version>5.18.4</acs-activemq.version>
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -99,14 +99,16 @@
|
||||
|
||||
<!-- versions -->
|
||||
<postgres.jdbc.version>42.2.18</postgres.jdbc.version>
|
||||
<alfresco.platform.war.version>${alfresco.platform.version}</alfresco.platform.war.version>
|
||||
|
||||
<!-- configuring beedk-acs-platform-it-tile -->
|
||||
<beedk.deploy.platform.warFile>${project.build.warFile}</beedk.deploy.platform.warFile>
|
||||
<beedk.deploy.platform.classesDirectory>${project.build.outputDirectory}</beedk.deploy.platform.classesDirectory>
|
||||
<beedk.deploy.platform.testClassesDirectory>${project.build.testOutputDirectory}</beedk.deploy.platform.testClassesDirectory>
|
||||
<beedk.deploy.platform.extDirectory>${project.build.extDirectory}</beedk.deploy.platform.extDirectory>
|
||||
|
||||
<!-- configuring beedk-acs-webapp-artifact-tile -->
|
||||
<alfresco.war.version>${alfresco.platform.version}</alfresco.war.version>
|
||||
<alfresco.war.version>${alfresco.platform.war.version}</alfresco.war.version>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -103,6 +103,7 @@
|
||||
<properties>
|
||||
<!-- versions -->
|
||||
<postgres.jdbc.version>42.2.18</postgres.jdbc.version>
|
||||
<alfresco.platform.war.version>${alfresco.platform.version}</alfresco.platform.war.version>
|
||||
|
||||
<!-- configuring beedk-acs-platform-rad-tile -->
|
||||
<beedk.deploy.platform.warFile>${project.build.warFile}</beedk.deploy.platform.warFile>
|
||||
@@ -115,7 +116,7 @@
|
||||
<beedk.deploy.platform.webDirectory>${project.build.directory}/web-resources</beedk.deploy.platform.webDirectory>
|
||||
|
||||
<!-- configuring beedk-acs-webapp-artifact-tile -->
|
||||
<alfresco.war.version>${alfresco.platform.version}</alfresco.war.version>
|
||||
<alfresco.war.version>${alfresco.platform.war.version}</alfresco.war.version>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -95,7 +95,8 @@
|
||||
</activation>
|
||||
<properties>
|
||||
<!-- configuring beedk-acs-webapp-artifact-tile -->
|
||||
<alfresco.war.version>${alfresco.platform.version}</alfresco.war.version>
|
||||
<alfresco.platform.war.version>${alfresco.platform.version}</alfresco.platform.war.version>
|
||||
<alfresco.war.version>${alfresco.platform.war.version}</alfresco.war.version>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -42,7 +42,8 @@
|
||||
<SOLR_SOLR_HOST>${project.artifactId}-acs-search</SOLR_SOLR_HOST>
|
||||
<SOLR_SOLR_PORT>8983</SOLR_SOLR_PORT>
|
||||
<SOLR_CREATE_ALFRESCO_DEFAULTS>alfresco</SOLR_CREATE_ALFRESCO_DEFAULTS>
|
||||
<ALFRESCO_SECURE_COMMS>none</ALFRESCO_SECURE_COMMS>
|
||||
<ALFRESCO_SECURE_COMMS>secret</ALFRESCO_SECURE_COMMS>
|
||||
<JAVA_TOOL_OPTIONS>-Dalfresco.secureComms.secret=alfresco-secret</JAVA_TOOL_OPTIONS>
|
||||
</env>
|
||||
<network>
|
||||
<mode>custom</mode>
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -49,7 +49,8 @@
|
||||
<SOLR_SOLR_HOST>${project.artifactId}-acs-search</SOLR_SOLR_HOST>
|
||||
<SOLR_SOLR_PORT>8983</SOLR_SOLR_PORT>
|
||||
<SOLR_CREATE_ALFRESCO_DEFAULTS>alfresco</SOLR_CREATE_ALFRESCO_DEFAULTS>
|
||||
<ALFRESCO_SECURE_COMMS>none</ALFRESCO_SECURE_COMMS>
|
||||
<ALFRESCO_SECURE_COMMS>secret</ALFRESCO_SECURE_COMMS>
|
||||
<JAVA_TOOL_OPTIONS>-Dalfresco.secureComms.secret=alfresco-secret</JAVA_TOOL_OPTIONS>
|
||||
</env>
|
||||
<ports>
|
||||
<port>${acs-search.port}:8983</port>
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -28,7 +28,7 @@
|
||||
</activation>
|
||||
<properties>
|
||||
<!-- versions -->
|
||||
<acs-search.version>2.0.8.1</acs-search.version>
|
||||
<acs-search.version>2.0.11</acs-search.version>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -16,8 +16,8 @@
|
||||
<maven.compiler.target>8</maven.compiler.target>
|
||||
|
||||
<alfresco.sdk.version>4.8.0</alfresco.sdk.version>
|
||||
<alfresco.platform.version>23.2.0</alfresco.platform.version>
|
||||
<alfresco.share.version>23.2.0.72</alfresco.share.version>
|
||||
<alfresco.platform.version>7.4.2</alfresco.platform.version>
|
||||
<alfresco.share.version>22.17</alfresco.share.version>
|
||||
</properties>
|
||||
|
||||
<dependencyManagement>
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -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>
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -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>
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -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>
|
||||
|
@@ -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
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -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>
|
||||
|
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -43,7 +43,7 @@
|
||||
</activation>
|
||||
<properties>
|
||||
<!-- versions -->
|
||||
<beedk.plugins.fabric8.docker.version>0.34.1</beedk.plugins.fabric8.docker.version>
|
||||
<beedk.plugins.fabric8.docker.version>0.45.0</beedk.plugins.fabric8.docker.version>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -17,7 +17,7 @@
|
||||
|
||||
<!-- for RAD environment -->
|
||||
<edition>community</edition>
|
||||
<alfresco.platform.version>23.2.0</alfresco.platform.version>
|
||||
<alfresco.platform.version>7.4.2</alfresco.platform.version>
|
||||
|
||||
<!-- for Docker deployment -->
|
||||
<docker.image.registry>${dockerRegistryHost}</docker.image.registry>
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
@@ -10,7 +10,7 @@
|
||||
<parent>
|
||||
<groupId>com.inteligr8.ootbee</groupId>
|
||||
<artifactId>beedk-parent</artifactId>
|
||||
<version>1.1.1</version>
|
||||
<version>1.1.12</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
|
Reference in New Issue
Block a user