Commit d3a6b282 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents fdec1402 4e817b19

README.md

+1 −1
Original line number Diff line number Diff line
@@ -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.



```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`.

beedk-acs-module-tile/tile.xml

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ 
				

				<!-- versions -->

				<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>

				<regex-plugin.version>1.0.7</regex-plugin.version>

				<conditional-plugin.version>1.0.2</conditional-plugin.version>

beedk-acs-platform-it-tile/README.md

+6 −0
Original line number Diff line number Diff line
@@ -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)



### Plugin Versions



| Maven Property                     |

| ---------------------------------- |

| `fs-plugin.version`                |



## 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.

beedk-acs-platform-it-tile/tile.xml

+23 −1
Original line number Diff line number Diff line
@@ -20,6 +20,27 @@ 
	

	<build>

		<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 -->

			<plugin>

				<groupId>io.fabric8</groupId>
@@ -364,7 +385,8 @@ 
				<!-- versions -->

				<acs-postgres.version>12</acs-postgres.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>

		</profile>

	</profiles>

beedk-acs-platform-rad-tile/README.md

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ Additional less important configurations are inherited from the following Maven 
| Maven Property                     |

| ---------------------------------- |

| `maven-dependency-plugin.version`  |

| `fs-plugin.version`                |



## Results