inteligr8/ootbee-beedk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into stable

Browse Source
This commit is contained in:
brian.long
2026-05-21 20:35:39 -04:00
parent c2556be18f 24ce538e5a
commit 651086fcbd
4 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
beedk-acs-platform-it-tile/tile.xml
+11
View File
@@ -19,6 +19,13 @@
xsi:schemaLocation="http://tiles.bluetrainsoftware.com/maven/tiles/1.1.0 https://git.inteligr8.com/inteligr8/maven-tiles/raw/xsd/src/main/resources/maven-tiles.xsd">
<build>
<testResources>
<testResource>
<directory>${java.cacerts.directory}</directory>
<filtering>false</filtering>
<targetPath>${project.build.directory}/cacerts</targetPath>
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>com.inteligr8</groupId>
@@ -36,6 +43,7 @@
<path>${beedk.deploy.platform.testClassesDirectory}</path>
<path>${beedk.deploy.platform.extDirectory}</path>
<path>${beedk.deploy.platform.dataDirectory}</path>
<path>${project.build.directory}/cacerts</path>
</paths>
</configuration>
</execution>
@@ -152,6 +160,7 @@
<volumes>
<bind>
<volume>${acs.license.directory}:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro</volume>
<volume>${project.build.directory}/cacerts:/usr/local/share/ca-certificates: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.testClassesDirectory}:/var/lib/tomcat/dev/classes-extra1:ro</volume>
@@ -227,6 +236,7 @@
<volumes>
<bind>
<volume>${acs.license.directory}:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro</volume>
<volume>${project.build.directory}/cacerts:/usr/local/share/ca-certificates: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>
@@ -375,6 +385,7 @@
<acs-platform.memory>1g</acs-platform.memory>
<alfresco.license.directory>${user.home}/alfresco/license</alfresco.license.directory>
<acs.license.directory>${alfresco.license.directory}/acs</acs.license.directory>
<java.cacerts.directory>src/test/cacerts</java.cacerts.directory>
<!-- ports -->
<acs-postgres.port>5432</acs-postgres.port>
beedk-acs-platform-rad-tile/tile.xml
+10
View File
@@ -27,6 +27,13 @@
</property>
</activation>
<build>
<testResources>
<testResource>
<directory>${java.cacerts.directory}</directory>
<filtering>false</filtering>
<targetPath>${project.build.directory}/cacerts</targetPath>
</testResource>
</testResources>
<plugins>
<!-- This plugin downloads ancillary WARs -->
<plugin>
@@ -88,6 +95,7 @@
<path>${beedk.deploy.platform.extDirectory}</path>
<path>${beedk.deploy.platform.webDirectory}</path>
<path>${beedk.deploy.platform.dataDirectory}</path>
<path>${project.build.directory}/cacerts</path>
</paths>
</configuration>
</execution>
@@ -202,6 +210,7 @@
<volumes>
<bind>
<volume>${acs.license.directory}:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro</volume>
<volume>${project.build.directory}/cacerts:/usr/local/share/ca-certificates:ro</volume>
<volume>${beedk.deploy.platform.warFile}:/var/lib/tomcat/webapps/alfresco.war:ro</volume>
<volume>${beedk.deploy.api-explorer.warFile}:/var/lib/tomcat/webapps/api-explorer.war:ro</volume>
<volume>${beedk.deploy.aos.warFile}:/var/lib/tomcat/webapps/_vti_bin.war:ro</volume>
@@ -320,6 +329,7 @@
<beedk.deploy.aos.warFile>${beedk.deploy.platform.warDirectory}/alfresco-vti-bin-${acs-aos.war.version}.war</beedk.deploy.aos.warFile>
<alfresco.license.directory>${user.home}/alfresco/license</alfresco.license.directory>
<acs.license.directory>${alfresco.license.directory}/acs</acs.license.directory>
<java.cacerts.directory>src/test/cacerts</java.cacerts.directory>
<!-- ports -->
<acs-postgres.port>5432</acs-postgres.port>
beedk-aps-ext-it-tile/tile.xml
+8
View File
@@ -59,6 +59,11 @@
</includes>
<targetPath>${project.build.directory}/rt-test-resources</targetPath>
</testResource>
<testResource>
<directory>${java.cacerts.directory}</directory>
<filtering>false</filtering>
<targetPath>${project.build.directory}/cacerts</targetPath>
</testResource>
</testResources>
<plugins>
<!-- This plugin downloads the parameterized WAR -->
@@ -110,6 +115,7 @@
<paths>
<path>${project.build.directory}/rt-resources</path>
<path>${project.build.directory}/rt-test-resources</path>
<path>${project.build.directory}/cacerts</path>
</paths>
</configuration>
</execution>
@@ -189,6 +195,7 @@
<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>${project.build.directory}/cacerts:/usr/local/share/ca-certificates:ro</volume>
<!-- include runtime-only resources -->
<volume>${project.build.directory}/rt-resources:/var/lib/tomcat/dev/classes:ro</volume>
<volume>${project.build.directory}/rt-test-resources:/var/lib/tomcat/dev/classes-extra1:ro</volume>
@@ -271,6 +278,7 @@
<aps.debugger.enabled>true</aps.debugger.enabled>
<alfresco.license.directory>${user.home}/alfresco/license</alfresco.license.directory>
<aps.license.directory>${alfresco.license.directory}/aps</aps.license.directory>
<java.cacerts.directory>src/test/cacerts</java.cacerts.directory>
<!-- ports -->
<aps-postgres.port>5433</aps-postgres.port>
beedk-aps-ext-rad-tile/tile.xml
+8
View File
@@ -67,6 +67,11 @@
</includes>
<targetPath>${project.build.directory}/rt-test-resources</targetPath>
</testResource>
<testResource>
<directory>${java.cacerts.directory}</directory>
<filtering>false</filtering>
<targetPath>${project.build.directory}/cacerts</targetPath>
</testResource>
</testResources>
<plugins>
<!-- This plugin downloads the parameterized WAR -->
@@ -118,6 +123,7 @@
<paths>
<path>${project.build.directory}/rt-resources</path>
<path>${project.build.directory}/rt-test-resources</path>
<path>${project.build.directory}/cacerts</path>
</paths>
</configuration>
</execution>
@@ -194,6 +200,7 @@
<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>${project.build.directory}/cacerts:/usr/local/share/ca-certificates:ro</volume>
<!-- include runtime-only resources -->
<volume>${project.build.directory}/rt-resources:/var/lib/tomcat/dev/classes:ro</volume>
<volume>${project.build.directory}/rt-test-resources:/var/lib/tomcat/dev/classes-extra1:ro</volume>
@@ -259,6 +266,7 @@
<aps.debugger.enabled>true</aps.debugger.enabled>
<alfresco.license.directory>${user.home}/alfresco/license</alfresco.license.directory>
<aps.license.directory>${alfresco.license.directory}/aps</aps.license.directory>
<java.cacerts.directory>src/test/cacerts</java.cacerts.directory>
<!-- ports -->
<aps-postgres.port>5433</aps-postgres.port>