Merge branch 'develop' into stable

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

@@ -13,9 +13,10 @@
 					<!-- This execution downloads the Platform WAR -->
 					<execution>
 						<id>download-platform-webapp</id>
-						<phase>pre-integration-test</phase>
+						<phase>package</phase>
 						<goals><goal>copy</goal></goals>
 						<configuration>
+							<skip>${skipTests}</skip>
 							<artifactItems>
 								<artifactItem>
 									<groupId>${alfresco.platform.war.groupId}</groupId>
@@ -30,9 +31,10 @@
 					<!-- This execution downloads the postgreSQL JDBC JAR -->
 					<execution>
 						<id>download-platform-jdbc</id>
-						<phase>pre-integration-test</phase>
+						<phase>package</phase>
 						<goals><goal>copy</goal></goals>
 						<configuration>
+							<skip>${skipTests}</skip>
 							<artifactItems>
 								<artifactItem>
 								    <groupId>org.postgresql</groupId>

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

@@ -3,6 +3,14 @@
  		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  		xsi:schemaLocation="http://tiles.bluetrainsoftware.com/maven/tiles/1.1.0 https://bitbucket.org/inteligr8/maven-tiles/raw/xsd/src/main/resources/maven-tiles.xsd">
 
+	<profiles>
+		<profile>
+			<id>rad-acs-webapp</id>
+			<activation>
+				<property>
+					<name>rad</name>
+				</property>
+			</activation>
 			<build>
 				<plugins>
 					<!-- This plugin downloads the dependency AMPs -->
@@ -44,8 +52,7 @@
 					</plugin>
 				</plugins>
 			</build>
-
-	<profiles>
+		</profile>
 		<!-- This profile is always active; it defines default values for all optional properties -->
 		<profile>
 			<id>default-props</id>