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

Merge branch 'develop' into stable

parents 0745cc91 a49c5a7d

beedk-acs-webapp-artifact-it-tile/tile.xml

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
				<project.build.ampDirectory>${project.build.directory}/amps</project.build.ampDirectory>



				<!-- configuring beedk-acs-webapp-artifact-tile -->

				<beedk.download.war.skip>false</beedk.download.war.skip>

				<beedk.download.war.phase>pre-integration-test</beedk.download.war.phase>

			</properties>

		</profile>

beedk-acs-webapp-artifact-rad-tile/tile.xml

+5 −3
Original line number Diff line number Diff line
@@ -11,6 +11,11 @@ 
					<name>rad</name>

				</property>

			</activation>

			<properties>

				<!-- configuring beedk-acs-webapp-artifact-tile -->

				<beedk.download.war.skip>false</beedk.download.war.skip>

				<beedk.download.war.phase>generate-resources</beedk.download.war.phase>

			</properties>

			<build>

				<plugins>

					<!-- This plugin downloads the dependency AMPs -->
@@ -64,9 +69,6 @@ 
			<properties>

				<!-- configurable -->

				<project.build.ampDirectory>${project.build.directory}/amps</project.build.ampDirectory>



				<!-- configuring beedk-acs-webapp-artifact-tile -->

				<beedk.download.war.phase>generate-resources</beedk.download.war.phase>

			</properties>

		</profile>

	</profiles>

beedk-acs-webapp-artifact-tile/tile.xml

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
								</artifactItem>

							</artifactItems>

							<outputDirectory>${project.build.warDirectory}</outputDirectory>

							<skip>${beedk.download.war.skip}</skip>

						</configuration>

					</execution>

				</executions>
@@ -44,6 +45,7 @@ 
			<properties>

				<!-- configurable -->

				<alfresco.war.groupId>org.alfresco</alfresco.war.groupId>

				<beedk.download.war.skip>true</beedk.download.war.skip>

				<beedk.download.war.phase>prepare-package</beedk.download.war.phase>

				<project.build.warDirectory>${project.build.directory}/war</project.build.warDirectory>