Merge branch 'develop' into stable

beedk-acs-allinone-archetype/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

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

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

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

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

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

@@ -21,7 +21,7 @@
 						<executions>
 							<execution>
 								<id>run-alts</id>
-								<phase>process-classes</phase>
+								<phase>process-test-classes</phase>
 								<goals><goal>start</goal></goals>
 								<configuration>
 									<images>

beedk-acs-module-tile/README.md

@@ -50,6 +50,8 @@ The following properties are intended to be exposed by inheriting Public API Mav
 | ---------------------------------- |:--------:| ------------------ | ----------- |
 | `project.build.packageDirectory`   |          | `target/package`   | A variable specifying the folder name of consolidated resources for packaging. |
 | `alfresco.module.pathname`         |          | `${project.groupId}.${project.artifactId}` | A variable specifying the folder name of module resources.  Use this property to help reference module resources.  It should rarely ever be overridden. |
+| `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. |
 
 ## Results
 

beedk-acs-module-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-acs-module-tile/tile.xml

@@ -139,7 +139,7 @@
 					<!-- This plugin execution consolidates the compiled resources into one directory for packaging -->
 					<execution>
 						<id>consolidate-classes</id>
-						<phase>process-classes</phase>
+						<phase>process-test-classes</phase>
 						<goals><goal>copy-resources</goal></goals>
 						<configuration>
 							<outputDirectory>${project.build.packageDirectory}</outputDirectory>
@@ -202,8 +202,8 @@
 			<!-- This plugin builds an AMP file during the package phase -->
 			<plugin>
 				<groupId>com.inteligr8.alfresco</groupId>
-				<artifactId>amp-plugin</artifactId>
-				<version>1.0.7</version>
+				<artifactId>amp-maven-plugin</artifactId>
+				<version>1.1.0</version>
 				<executions>
 					<execution>
 						<id>build-amp-file</id>
@@ -213,7 +213,7 @@
 						</goals>
 						<configuration>
 							<classifier>${alfresco.module.classifier}</classifier>
-							<skip>${beedk.jar.notest.empty}</skip>
+							<skip>${alfresco.module.noAmp}</skip>
 						</configuration>
 					</execution>
 				</executions>
@@ -340,6 +340,7 @@
 				<project.build.packageDirectory>${project.build.directory}/package</project.build.packageDirectory>
 				<alfresco.module.pathname>${project.groupId}.${project.artifactId}</alfresco.module.pathname>
 				<alfresco.module.classifier></alfresco.module.classifier>
+				<alfresco.module.noAmp>${beedk.jar.notest.empty}</alfresco.module.noAmp>
 
 				<!-- output -->
 				<alfresco.module.path>alfresco/module/${alfresco.module.pathname}</alfresco.module.path>

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

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-acs-platform-artifact-rad-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

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

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-acs-platform-module-archetype/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-acs-platform-module-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-acs-platform-rad-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

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

@@ -62,7 +62,7 @@
 						<executions>
 							<execution>
 								<id>run-acs-platform</id>
-								<phase>process-classes</phase>
+								<phase>process-test-classes</phase>
 								<goals><goal>start</goal></goals>
 								<configuration>
 									<images>

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

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-acs-platform-self-rad-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

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

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-acs-platform-sibling-rad-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-acs-platform-webapp-docker-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-acs-platform-webapp-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-acs-search-it-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-acs-search-rad-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

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

@@ -21,7 +21,7 @@
 						<executions>
 							<execution>
 								<id>run-acs-search</id>
-								<phase>process-classes</phase>
+								<phase>process-test-classes</phase>
 								<goals><goal>start</goal></goals>
 								<configuration>
 									<images>

beedk-acs-share-artifact-rad-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-acs-share-module-archetype/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-acs-share-module-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-acs-share-rad-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

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

@@ -66,7 +66,7 @@
 						<executions>
 							<execution>
 								<id>run-acs-share</id>
-								<phase>process-classes</phase>
+								<phase>process-test-classes</phase>
 								<goals><goal>start</goal></goals>
 								<configuration>
 									<images>

beedk-acs-share-self-it-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-acs-share-self-rad-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-acs-share-webapp-docker-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-acs-share-webapp-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

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

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

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

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

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

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

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

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-acs-webapp-docker-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-activiti-ext-archetype/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-amp-check-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-aps-ext-rad-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-aps-ext-rad-tile/tile.xml

@@ -21,7 +21,7 @@
 							<!-- This execution downloads the parameterized WAR -->
 							<execution>
 								<id>download-webapp</id>
-								<phase>process-classes</phase>
+								<phase>process-test-classes</phase>
 								<goals><goal>copy</goal></goals>
 								<configuration>
 									<artifactItems>
@@ -45,7 +45,7 @@
 						<executions>
 							<execution>
 								<id>run-aps</id>
-								<phase>process-classes</phase>
+								<phase>process-test-classes</phase>
 								<goals><goal>start</goal></goals>
 								<configuration>
 									<images>

beedk-aps-rad-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-aps-rad-tile/tile.xml

@@ -21,7 +21,7 @@
 						<executions>
 							<execution>
 								<id>run-aps</id>
-								<phase>process-classes</phase>
+								<phase>process-test-classes</phase>
 								<goals><goal>start</goal></goals>
 								<configuration>
 									<images>

beedk-ate-archetype/pom.xml

@@ -6,13 +6,13 @@
  
 	<groupId>com.inteligr8.ootbee</groupId>
 	<artifactId>beedk-ate-archetype</artifactId>
-	<version>1.0.13</version>
+	<version>1.0.15</version>
 	<packaging>maven-archetype</packaging>
 
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 	</parent>
 
 	<name>Order of the Bee Development Kit: Project Scaffolding for an ACS Platform Module</name>

beedk-ate-docker-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-ate-it-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-ate-self-rad-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-ate-self-rad-tile/tile.xml

@@ -21,7 +21,7 @@
 							<!-- This execution downloads the dependency JARs -->
 							<execution>
 								<id>download-ate-jars</id>
-								<phase>process-classes</phase>
+								<phase>process-test-classes</phase>
 								<goals><goal>copy-dependencies</goal></goals>
 								<configuration>
 									<excludeScope>provided</excludeScope>
@@ -39,7 +39,7 @@
 						<executions>
 							<execution>
 								<id>run-ate</id>
-								<phase>process-classes</phase>
+								<phase>process-test-classes</phase>
 								<goals><goal>start</goal></goals>
 								<configuration>
 									<images>

beedk-ate-sibling-rad-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-ate-sibling-rad-tile/tile.xml

@@ -21,7 +21,7 @@
 						<executions>
 							<execution>
 								<id>run-ate</id>
-								<phase>process-classes</phase>
+								<phase>process-test-classes</phase>
 								<goals><goal>start</goal></goals>
 								<configuration>
 									<images>

beedk-ate-springboot-test/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-ate-springboot-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-ate-springboot/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-ats-it-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-ats-rad-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-ats-rad-tile/tile.xml

@@ -21,7 +21,7 @@
 						<executions>
 							<execution>
 								<id>run-ats</id>
-								<phase>process-classes</phase>
+								<phase>process-test-classes</phase>
 								<goals><goal>start</goal></goals>
 								<configuration>
 									<images>

beedk-run-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-springboot-api-archetype/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-springboot-docker-base-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

beedk-springboot-docker-tile/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>com.inteligr8.ootbee</groupId>
 		<artifactId>beedk-parent</artifactId>
-		<version>1.0.13</version>
+		<version>1.0.15</version>
 		<relativePath>..</relativePath>
 	</parent>
 

pom.xml

@@ -7,7 +7,7 @@
 
 	<groupId>com.inteligr8.ootbee</groupId>
 	<artifactId>beedk-parent</artifactId>
-	<version>1.0.13</version>
+	<version>1.0.15</version>
 	<packaging>pom</packaging>
 
 	<name>Order of the Bee Development Kit</name>