Commit 2ae7df75 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents 1ec2584d bd4ddd12

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

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
			<plugin>

				<groupId>io.fabric8</groupId>

				<artifactId>docker-maven-plugin</artifactId>

				<!-- version is inherited from parent tile -->

				<version>${fabric8-docker-maven-plugin.version}</version>

				<executions>

					<execution>

						<id>start-alts</id>

beedk-acs-lts-rad-tile/tile.xml

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ 
					<plugin>

						<groupId>io.fabric8</groupId>

						<artifactId>docker-maven-plugin</artifactId>

						<!-- version is inherited from parent tile -->

						<version>${fabric8-docker-maven-plugin.version}</version>

						<executions>

							<execution>

								<id>run-alts</id>

beedk-acs-module-tile/README.md

+11 −0
Original line number Diff line number Diff line
@@ -53,6 +53,17 @@ The following properties are intended to be exposed by inheriting Public API Mav 
| `alfresco.module.classifier`       |          | *None*             | A Maven classifier for the artifact. |

| `alfresco.module.noAmp`            |          | *Automatic*        | Set to `false` to force AMP generation; `true` to force JAR.  A value of `true` could produce a non-functional module. |



### Plugin Versions



| Maven Property                     |

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

| `maven-jar-plugin.version`         |

| `build-helper-plugin.version`      |

| `download-plugin.version`          |

| `regex-plugin.version`             |

| `conditional-plugin.version`       |

| `amp-plugin.version`               |



## Results



This Maven Tile will result in the definition of the following Maven properties during the respective Maven phase.

beedk-acs-module-tile/tile.xml

+14 −10
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
			<plugin>

				<groupId>org.codehaus.mojo</groupId>

				<artifactId>build-helper-maven-plugin</artifactId>

				<version>${build-helper.version}</version>

				<version>${build-helper-plugin.version}</version>

				<executions>

					<execution>

						<id>module-snapshot-timestamp</id>
@@ -50,7 +50,7 @@ 
			<plugin>

				<groupId>com.inteligr8</groupId>

				<artifactId>regex-maven-plugin</artifactId>

				<version>1.0.5</version>

				<version>${regex-plugin.version}</version>

				<executions>

					<execution>

						<id>acs-module-version</id>
@@ -78,7 +78,7 @@ 
			<plugin>

				<groupId>org.codehaus.mojo</groupId>

				<artifactId>build-helper-maven-plugin</artifactId>

				<version>${build-helper.version}</version>

				<version>${build-helper-plugin.version}</version>

				<executions>

					<execution>

						<id>add-acs-module-resources</id>
@@ -253,7 +253,7 @@ 
			<!-- This plugin changes the packaging directory to the consolidated directory -->

			<plugin>

				<artifactId>maven-jar-plugin</artifactId>

				<version>${maven-jar.version}</version>

				<version>${maven-jar-plugin.version}</version>

				<configuration>

					<classesDirectory>${project.build.packageDirectory}</classesDirectory>

				</configuration>
@@ -262,7 +262,7 @@ 
			<plugin>

				<groupId>com.inteligr8.alfresco</groupId>

				<artifactId>amp-maven-plugin</artifactId>

				<version>1.1.4</version>

				<version>${amp-plugin.version}</version>

				<executions>

					<execution>

						<id>build-amp-file</id>
@@ -281,7 +281,7 @@ 
			<plugin>

				<groupId>com.inteligr8</groupId>

				<artifactId>conditional-maven-plugin</artifactId>

				<version>1.0.1</version>

				<version>${conditional-plugin.version}</version>

				<executions>

					<execution>

						<id>check-amp-file</id>
@@ -315,7 +315,7 @@ 
			<plugin>

				<groupId>org.codehaus.mojo</groupId>

				<artifactId>build-helper-maven-plugin</artifactId>

				<version>${build-helper.version}</version>

				<version>${build-helper-plugin.version}</version>

				<executions>

					<execution>

						<id>attach-amp</id>
@@ -369,7 +369,7 @@ 
					<plugin>

						<groupId>com.googlecode.maven-download-plugin</groupId>

						<artifactId>download-maven-plugin</artifactId>

						<version>1.6.1</version>

						<version>${download-plugin.version}</version>

						<executions>

							<execution>

								<id>download-module-props</id>
@@ -405,8 +405,12 @@ 
				<alfresco.module.path>alfresco/module/${alfresco.module.pathname}</alfresco.module.path>

				

				<!-- versions -->

				<build-helper.version>3.6.1</build-helper.version>

				<maven-jar.version>3.4.2</maven-jar.version>

				<build-helper-plugin.version>3.6.1</build-helper-plugin.version>

				<maven-jar-plugin.version>3.4.2</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>

				<amp-plugin.version>1.1.5</amp-plugin.version>

			</properties>

		</profile>

	</profiles>

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

+6 −0
Original line number Diff line number Diff line
@@ -78,6 +78,12 @@ Additional less important configurations are inherited from the following Maven 


*   [`beedk-acs-platform-it-tile`](/inteligr8/ootbee-beedk/src/branch/stable/beedk-acs-platform-it-tile)



### Plugin Versions



| Maven Property                     |

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

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