Merge branch 'develop' into stable
This commit is contained in:
@@ -83,7 +83,7 @@ The following tiles (side-loaded components) are useful to users of the BeeDK.
|
|||||||
If your project includes RAD tiles, you can start the application with the following command.
|
If your project includes RAD tiles, you can start the application with the following command.
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
mvn -Drad process-classes
|
mvn -Drad process-test-classes
|
||||||
```
|
```
|
||||||
|
|
||||||
To stop RAD and remove the Docker containers, you will need to do it through Docker commands. This will differ between operating systems. The Maven Archetypes provides scripts to assist with these operations called `rad.sh` or `rad.ps1`.
|
To stop RAD and remove the Docker containers, you will need to do it through Docker commands. This will differ between operating systems. The Maven Archetypes provides scripts to assist with these operations called `rad.sh` or `rad.ps1`.
|
||||||
|
|||||||
@@ -406,7 +406,7 @@
|
|||||||
|
|
||||||
<!-- versions -->
|
<!-- versions -->
|
||||||
<build-helper-plugin.version>3.6.1</build-helper-plugin.version>
|
<build-helper-plugin.version>3.6.1</build-helper-plugin.version>
|
||||||
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
|
<maven-jar-plugin.version>3.5.0</maven-jar-plugin.version>
|
||||||
<download-plugin.version>1.13.0</download-plugin.version>
|
<download-plugin.version>1.13.0</download-plugin.version>
|
||||||
<regex-plugin.version>1.0.7</regex-plugin.version>
|
<regex-plugin.version>1.0.7</regex-plugin.version>
|
||||||
<conditional-plugin.version>1.0.2</conditional-plugin.version>
|
<conditional-plugin.version>1.0.2</conditional-plugin.version>
|
||||||
|
|||||||
@@ -80,6 +80,12 @@ Additional less important configurations are inherited from the following Maven
|
|||||||
|
|
||||||
* [`beedk-run-tile`](/inteligr8/ootbee-beedk/src/branch/stable/beedk-run-tile)
|
* [`beedk-run-tile`](/inteligr8/ootbee-beedk/src/branch/stable/beedk-run-tile)
|
||||||
|
|
||||||
|
### Plugin Versions
|
||||||
|
|
||||||
|
| Maven Property |
|
||||||
|
| ---------------------------------- |
|
||||||
|
| `fs-plugin.version` |
|
||||||
|
|
||||||
## Results
|
## Results
|
||||||
|
|
||||||
The ACS Platform, database, and MQ components will be started and stopped during the `pre-integration-test` and `post-integration-test` Maven phases, respectively.
|
The ACS Platform, database, and MQ components will be started and stopped during the `pre-integration-test` and `post-integration-test` Maven phases, respectively.
|
||||||
|
|||||||
@@ -20,6 +20,27 @@
|
|||||||
|
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.inteligr8</groupId>
|
||||||
|
<artifactId>fs-maven-plugin</artifactId>
|
||||||
|
<version>${fs-plugin.version}</version>
|
||||||
|
<executions>
|
||||||
|
<!-- creates missing directories used in volumes, which is required for podman -->
|
||||||
|
<execution>
|
||||||
|
<id>mkdirs-docker-volumes</id>
|
||||||
|
<phase>pre-integration-test</phase>
|
||||||
|
<goals><goal>mkdir</goal></goals>
|
||||||
|
<configuration>
|
||||||
|
<paths>
|
||||||
|
<path>${beedk.deploy.platform.classesDirectory}</path>
|
||||||
|
<path>${beedk.deploy.platform.testClassesDirectory}</path>
|
||||||
|
<path>${beedk.deploy.platform.extDirectory}</path>
|
||||||
|
<path>${beedk.deploy.platform.dataDirectory}</path>
|
||||||
|
</paths>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
<!-- Using Docker to host the web application -->
|
<!-- Using Docker to host the web application -->
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>io.fabric8</groupId>
|
<groupId>io.fabric8</groupId>
|
||||||
@@ -364,7 +385,8 @@
|
|||||||
<!-- versions -->
|
<!-- versions -->
|
||||||
<acs-postgres.version>12</acs-postgres.version>
|
<acs-postgres.version>12</acs-postgres.version>
|
||||||
<acs-activemq.version>5.18.4</acs-activemq.version>
|
<acs-activemq.version>5.18.4</acs-activemq.version>
|
||||||
<tomcat-rad.version>9-2.1</tomcat-rad.version>
|
<tomcat-rad.version>2.3-tomcat9</tomcat-rad.version>
|
||||||
|
<fs-plugin.version>1.0.0</fs-plugin.version>
|
||||||
</properties>
|
</properties>
|
||||||
</profile>
|
</profile>
|
||||||
</profiles>
|
</profiles>
|
||||||
|
|||||||
@@ -98,6 +98,7 @@ Additional less important configurations are inherited from the following Maven
|
|||||||
| Maven Property |
|
| Maven Property |
|
||||||
| ---------------------------------- |
|
| ---------------------------------- |
|
||||||
| `maven-dependency-plugin.version` |
|
| `maven-dependency-plugin.version` |
|
||||||
|
| `fs-plugin.version` |
|
||||||
|
|
||||||
## Results
|
## Results
|
||||||
|
|
||||||
|
|||||||
@@ -69,6 +69,30 @@
|
|||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.inteligr8</groupId>
|
||||||
|
<artifactId>fs-maven-plugin</artifactId>
|
||||||
|
<version>${fs-plugin.version}</version>
|
||||||
|
<executions>
|
||||||
|
<!-- creates missing directories used in volumes, which is required for podman -->
|
||||||
|
<execution>
|
||||||
|
<id>mkdirs-docker-volumes</id>
|
||||||
|
<phase>process-test-classes</phase>
|
||||||
|
<goals><goal>mkdir</goal></goals>
|
||||||
|
<configuration>
|
||||||
|
<paths>
|
||||||
|
<path>${beedk.deploy.platform.classesDirectory}</path>
|
||||||
|
<path>${beedk.deploy.platform.modClassesDirectory}</path>
|
||||||
|
<path>${beedk.deploy.platform.extClassesDirectory}</path>
|
||||||
|
<path>${beedk.deploy.platform.testClassesDirectory}</path>
|
||||||
|
<path>${beedk.deploy.platform.extDirectory}</path>
|
||||||
|
<path>${beedk.deploy.platform.webDirectory}</path>
|
||||||
|
<path>${beedk.deploy.platform.dataDirectory}</path>
|
||||||
|
</paths>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
<!-- Using Docker to host the web application -->
|
<!-- Using Docker to host the web application -->
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>io.fabric8</groupId>
|
<groupId>io.fabric8</groupId>
|
||||||
@@ -308,8 +332,9 @@
|
|||||||
<acs-aos.war.version>1.3.2.1</acs-aos.war.version>
|
<acs-aos.war.version>1.3.2.1</acs-aos.war.version>
|
||||||
<acs-postgres.version>12</acs-postgres.version>
|
<acs-postgres.version>12</acs-postgres.version>
|
||||||
<acs-activemq.version>5.18.4</acs-activemq.version>
|
<acs-activemq.version>5.18.4</acs-activemq.version>
|
||||||
<tomcat-rad.version>9-2.1</tomcat-rad.version>
|
<tomcat-rad.version>2.3-tomcat9</tomcat-rad.version>
|
||||||
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
|
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
|
||||||
|
<fs-plugin.version>1.0.0</fs-plugin.version>
|
||||||
</properties>
|
</properties>
|
||||||
</profile>
|
</profile>
|
||||||
</profiles>
|
</profiles>
|
||||||
|
|||||||
@@ -82,6 +82,7 @@ Additional less important configurations are inherited from the following Maven
|
|||||||
| Maven Property |
|
| Maven Property |
|
||||||
| ---------------------------------- |
|
| ---------------------------------- |
|
||||||
| `download-plugin.version` |
|
| `download-plugin.version` |
|
||||||
|
| `fs-plugin.version` |
|
||||||
|
|
||||||
## Results
|
## Results
|
||||||
|
|
||||||
|
|||||||
@@ -73,6 +73,30 @@
|
|||||||
</replacements>
|
</replacements>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.inteligr8</groupId>
|
||||||
|
<artifactId>fs-maven-plugin</artifactId>
|
||||||
|
<version>${fs-plugin.version}</version>
|
||||||
|
<executions>
|
||||||
|
<!-- creates missing directories used in volumes, which is required for podman -->
|
||||||
|
<execution>
|
||||||
|
<id>mkdirs-docker-volumes</id>
|
||||||
|
<phase>process-test-classes</phase>
|
||||||
|
<goals><goal>mkdir</goal></goals>
|
||||||
|
<configuration>
|
||||||
|
<paths>
|
||||||
|
<path>${beedk.deploy.share.classesDirectory}</path>
|
||||||
|
<path>${beedk.deploy.share.modClassesDirectory}</path>
|
||||||
|
<path>${beedk.deploy.share.extClassesDirectory}</path>
|
||||||
|
<path>${beedk.deploy.share.testClassesDirectory}</path>
|
||||||
|
<path>${project.build.directory}/runtime-classes</path>
|
||||||
|
<path>${beedk.deploy.share.extDirectory}</path>
|
||||||
|
<path>${beedk.deploy.share.webDirectory}</path>
|
||||||
|
</paths>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
<!-- Using Docker to host the web application -->
|
<!-- Using Docker to host the web application -->
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>io.fabric8</groupId>
|
<groupId>io.fabric8</groupId>
|
||||||
@@ -173,8 +197,9 @@
|
|||||||
<acs-share.debugger.port>8100</acs-share.debugger.port>
|
<acs-share.debugger.port>8100</acs-share.debugger.port>
|
||||||
|
|
||||||
<!-- versions -->
|
<!-- versions -->
|
||||||
<tomcat-rad.version>9-2.1</tomcat-rad.version>
|
<tomcat-rad.version>2.3-tomcat9</tomcat-rad.version>
|
||||||
<download-plugin.version>1.13.0</download-plugin.version>
|
<download-plugin.version>1.13.0</download-plugin.version>
|
||||||
|
<fs-plugin.version>1.0.0</fs-plugin.version>
|
||||||
|
|
||||||
<!-- configuring beedk-acs-webapp-artifact-tile -->
|
<!-- configuring beedk-acs-webapp-artifact-tile -->
|
||||||
<alfresco.war.artifactId>share</alfresco.war.artifactId>
|
<alfresco.war.artifactId>share</alfresco.war.artifactId>
|
||||||
|
|||||||
@@ -168,7 +168,7 @@
|
|||||||
<acs-share.port>8180</acs-share.port>
|
<acs-share.port>8180</acs-share.port>
|
||||||
|
|
||||||
<!-- versions -->
|
<!-- versions -->
|
||||||
<tomcat-rad.version>9-2.1</tomcat-rad.version>
|
<tomcat-rad.version>2.3-tomcat9</tomcat-rad.version>
|
||||||
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
|
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
|
||||||
<download-plugin.version>1.13.0</download-plugin.version>
|
<download-plugin.version>1.13.0</download-plugin.version>
|
||||||
|
|
||||||
|
|||||||
@@ -84,6 +84,7 @@ Additional less important configurations are inherited from the following Maven
|
|||||||
| Maven Property |
|
| Maven Property |
|
||||||
| ---------------------------------- |
|
| ---------------------------------- |
|
||||||
| `maven-dependency-plugin.version` |
|
| `maven-dependency-plugin.version` |
|
||||||
|
| `fs-plugin.version` |
|
||||||
|
|
||||||
## Results
|
## Results
|
||||||
|
|
||||||
|
|||||||
@@ -74,6 +74,25 @@
|
|||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.inteligr8</groupId>
|
||||||
|
<artifactId>fs-maven-plugin</artifactId>
|
||||||
|
<version>${fs-plugin.version}</version>
|
||||||
|
<executions>
|
||||||
|
<!-- creates missing directories used in volumes, which is required for podman -->
|
||||||
|
<execution>
|
||||||
|
<id>mkdirs-docker-volumes</id>
|
||||||
|
<phase>pre-integration-test</phase>
|
||||||
|
<goals><goal>mkdir</goal></goals>
|
||||||
|
<configuration>
|
||||||
|
<paths>
|
||||||
|
<path>${project.build.directory}/rt-resources</path>
|
||||||
|
<path>${project.build.directory}/rt-test-resources</path>
|
||||||
|
</paths>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
<!-- Using Docker to host the web application -->
|
<!-- Using Docker to host the web application -->
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>io.fabric8</groupId>
|
<groupId>io.fabric8</groupId>
|
||||||
@@ -234,8 +253,9 @@
|
|||||||
<!-- versions -->
|
<!-- versions -->
|
||||||
<aps-postgres.version>15</aps-postgres.version>
|
<aps-postgres.version>15</aps-postgres.version>
|
||||||
<aps.version>25.1.1</aps.version>
|
<aps.version>25.1.1</aps.version>
|
||||||
<tomcat-rad.version>10-2.2</tomcat-rad.version>
|
<tomcat-rad.version>2.3-tomcat10</tomcat-rad.version>
|
||||||
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
|
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
|
||||||
|
<fs-plugin.version>1.0.0</fs-plugin.version>
|
||||||
|
|
||||||
<!-- results -->
|
<!-- results -->
|
||||||
<project.build.warFile>${project.build.warDirectory}/${aps.war.artifactId}-${aps.war.version}.war</project.build.warFile>
|
<project.build.warFile>${project.build.warDirectory}/${aps.war.artifactId}-${aps.war.version}.war</project.build.warFile>
|
||||||
|
|||||||
@@ -88,6 +88,7 @@ Additional less important configurations are inherited from the following Maven
|
|||||||
| Maven Property |
|
| Maven Property |
|
||||||
| ---------------------------------- |
|
| ---------------------------------- |
|
||||||
| `maven-dependency-plugin.version` |
|
| `maven-dependency-plugin.version` |
|
||||||
|
| `fs-plugin.version` |
|
||||||
|
|
||||||
## Results
|
## Results
|
||||||
|
|
||||||
|
|||||||
@@ -82,6 +82,25 @@
|
|||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.inteligr8</groupId>
|
||||||
|
<artifactId>fs-maven-plugin</artifactId>
|
||||||
|
<version>${fs-plugin.version}</version>
|
||||||
|
<executions>
|
||||||
|
<!-- creates missing directories used in volumes, which is required for podman -->
|
||||||
|
<execution>
|
||||||
|
<id>mkdirs-docker-volumes</id>
|
||||||
|
<phase>process-test-classes</phase>
|
||||||
|
<goals><goal>mkdir</goal></goals>
|
||||||
|
<configuration>
|
||||||
|
<paths>
|
||||||
|
<path>${project.build.directory}/rt-resources</path>
|
||||||
|
<path>${project.build.directory}/rt-test-resources</path>
|
||||||
|
</paths>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
<!-- Using Docker to host the web application -->
|
<!-- Using Docker to host the web application -->
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>io.fabric8</groupId>
|
<groupId>io.fabric8</groupId>
|
||||||
@@ -222,8 +241,9 @@
|
|||||||
<!-- versions -->
|
<!-- versions -->
|
||||||
<aps-postgres.version>15</aps-postgres.version>
|
<aps-postgres.version>15</aps-postgres.version>
|
||||||
<aps.version>25.1.1</aps.version>
|
<aps.version>25.1.1</aps.version>
|
||||||
<tomcat-rad.version>10-2.2</tomcat-rad.version>
|
<tomcat-rad.version>2.3-tomcat10</tomcat-rad.version>
|
||||||
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
|
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
|
||||||
|
<fs-plugin.version>1.0.0</fs-plugin.version>
|
||||||
|
|
||||||
<!-- results -->
|
<!-- results -->
|
||||||
<project.build.warFile>${project.build.warDirectory}/${aps.war.artifactId}-${aps.war.version}.war</project.build.warFile>
|
<project.build.warFile>${project.build.warDirectory}/${aps.war.artifactId}-${aps.war.version}.war</project.build.warFile>
|
||||||
|
|||||||
Reference in New Issue
Block a user