From a889607c4871c9675d4c0292677a1cf7eedd404e Mon Sep 17 00:00:00 2001
From: Brian Long <brian@inteligr8.com>
Date: Wed, 19 May 2021 16:16:45 -0400
Subject: [PATCH] fixed amp/jar deploy selection

---
 beedk-acs-module-tile/tile.xml | 50 ++++++++++++----------------------
 beedk-amp-check-tile/tile.xml  | 33 ----------------------
 2 files changed, 17 insertions(+), 66 deletions(-)

diff --git a/beedk-acs-module-tile/tile.xml b/beedk-acs-module-tile/tile.xml
index 9ad2b5a..d75c11e 100644
--- a/beedk-acs-module-tile/tile.xml
+++ b/beedk-acs-module-tile/tile.xml
@@ -203,7 +203,7 @@
 			<plugin>
 				<groupId>com.inteligr8.alfresco</groupId>
 				<artifactId>amp-plugin</artifactId>
-				<version>1.0.3</version>
+				<version>1.0.4</version>
 				<executions>
 					<execution>
 						<id>build-amp-file</id>
@@ -217,42 +217,26 @@
 					</execution>
 				</executions>
 			</plugin>
-			<!-- This plugin amends the default install and includes the built AMP. -->
+			<!-- This plugin enables/disables the AMP file during the install/deploy phases -->
 			<plugin>
-				<artifactId>maven-install-plugin</artifactId>
-				<version>3.0.0-M1</version>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>3.2.0</version>
 				<executions>
-					<!-- install the AMP -->
 					<execution>
-						<id>install-amp</id>
-						<phase>${amp.install.phase}</phase>
-						<goals><goal>install-file</goal></goals>
+						<id>attach-amp</id>
+						<phase>package</phase>
+						<goals>
+							<goal>attach-artifact</goal>
+						</goals>
 						<configuration>
-							<groupId>${project.groupId}</groupId>
-							<artifactId>${project.artifactId}</artifactId>
-							<version>${project.version}</version>
-							<packaging>amp</packaging>
-							<file>${project.build.directory}/${project.artifactId}-${project.version}.amp</file>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<!-- This plugin amends the default deploy and includes the built AMP. -->
-			<plugin>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>3.0.0-M1</version>
-				<executions>
-					<!-- deploy the AMP -->
-					<execution>
-						<id>deploy-amp</id>
-						<phase>${amp.deploy.phase}</phase>
-						<goals><goal>deploy-file</goal></goals>
-						<configuration>
-							<groupId>${project.groupId}</groupId>
-							<artifactId>${project.artifactId}</artifactId>
-							<version>${project.version}</version>
-							<packaging>amp</packaging>
-							<file>${project.build.directory}/${project.artifactId}-${project.version}.amp</file>
+							<artifacts>
+								<artifact>
+									<type>amp</type>
+									<file>${project.build.directory}/${project.artifactId}-${project.version}.amp</file>
+								</artifact>
+							</artifacts>
+							<skipAttach>${beedk.jar.notest.empty}</skipAttach>
 						</configuration>
 					</execution>
 				</executions>
diff --git a/beedk-amp-check-tile/tile.xml b/beedk-amp-check-tile/tile.xml
index 71ee3a0..b08df06 100644
--- a/beedk-amp-check-tile/tile.xml
+++ b/beedk-amp-check-tile/tile.xml
@@ -112,39 +112,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>com.inteligr8</groupId>
-				<artifactId>conditional-maven-plugin</artifactId>
-				<version>1.0.0</version>
-				<executions>
-					<execution>
-						<id>amp-install-phase</id>
-						<phase>initialize</phase>
-						<goals>
-							<goal>boolean-property</goal>
-						</goals>
-						<configuration>
-							<booleanProperty>beedk.jar.notest.empty</booleanProperty>
-							<trueValue>none</trueValue>
-							<falseValue>install</falseValue>
-							<newProperty>amp.install.phase</newProperty>
-						</configuration>
-					</execution>
-					<execution>
-						<id>amp-deploy-phase</id>
-						<phase>initialize</phase>
-						<goals>
-							<goal>boolean-property</goal>
-						</goals>
-						<configuration>
-							<booleanProperty>beedk.jar.notest.empty</booleanProperty>
-							<trueValue>none</trueValue>
-							<falseValue>deploy</falseValue>
-							<newProperty>amp.deploy.phase</newProperty>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>