From 665d07ad744ef9b0c0b514ba58d4d6451fbd0e26 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Thu, 20 Jun 2013 14:14:52 -0700
Subject: [PATCH] Migrate to bootstrap maven plugin

Migrate certain samples to make use of the new bootstrap maven plugin

Issue: #52091115
---
 spring-bootstrap-samples/pom.xml              | 31 ++++++++++++++-----
 .../spring-bootstrap-batch-sample/pom.xml     | 15 +--------
 .../spring-bootstrap-data-sample/pom.xml      | 15 +--------
 .../spring-bootstrap-jetty-sample/pom.xml     | 15 +--------
 .../spring-bootstrap-profile-sample/pom.xml   | 15 +--------
 .../spring-bootstrap-simple-sample/pom.xml    | 15 +--------
 .../spring-bootstrap-tomcat-sample/pom.xml    | 15 +--------
 .../spring-bootstrap-xml-sample/pom.xml       |  2 +-
 spring-bootstrap-starters/pom.xml             | 13 ++++++++
 9 files changed, 43 insertions(+), 93 deletions(-)

diff --git a/spring-bootstrap-samples/pom.xml b/spring-bootstrap-samples/pom.xml
index a69ec9ce364..bdd0ce12334 100644
--- a/spring-bootstrap-samples/pom.xml
+++ b/spring-bootstrap-samples/pom.xml
@@ -28,6 +28,18 @@
 		<pluginManagement>
 			<plugins>
 				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>exec-maven-plugin</artifactId>
+					<configuration>
+						<includePluginDependencies>true</includePluginDependencies>
+						<mainClass>${start-class}</mainClass>
+					</configuration>
+				</plugin>
+
+				<!-- Launcher Style -->
+
+				<plugin>
+					<!-- Copy dependencies before assembly -->
 					<artifactId>maven-dependency-plugin</artifactId>
 					<executions>
 						<execution>
@@ -64,6 +76,7 @@
 					</executions>
 				</plugin>
 				<plugin>
+					<!-- Assemble a complete JAR -->
 					<artifactId>maven-assembly-plugin</artifactId>
 					<configuration>
 						<descriptors>
@@ -89,14 +102,8 @@
 						</execution>
 					</executions>
 				</plugin>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>exec-maven-plugin</artifactId>
-					<configuration>
-						<includePluginDependencies>true</includePluginDependencies>
-						<mainClass>${start-class}</mainClass>
-					</configuration>
-				</plugin>
+
+				<!-- Shade Style -->
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-shade-plugin</artifactId>
@@ -154,6 +161,14 @@
 			</plugins>
 		</pluginManagement>
 		<plugins>
+			<plugin>
+				<!-- Support executable archives -->
+				<groupId>${project.groupId}</groupId>
+				<artifactId>spring-bootstrap-maven-plugin</artifactId>
+				<version>${project.version}</version>
+				<extensions>true</extensions>
+				<inherited>true</inherited>
+			</plugin>
 			<plugin>
 				<!--skip deploy (these are just samples) -->
 				<artifactId>maven-deploy-plugin</artifactId>
diff --git a/spring-bootstrap-samples/spring-bootstrap-batch-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-batch-sample/pom.xml
index d254ee71ef6..5fe21aa70a9 100644
--- a/spring-bootstrap-samples/spring-bootstrap-batch-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-batch-sample/pom.xml
@@ -8,10 +8,7 @@
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-bootstrap-batch-sample</artifactId>
-	<packaging>jar</packaging>
-	<properties>
-		<start-class>org.springframework.bootstrap.sample.simple.SimpleBootstrapApplication</start-class>
-	</properties>
+	<packaging>executable-jar</packaging>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
@@ -36,14 +33,4 @@
 			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-dependency-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
 </project>
diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-data-sample/pom.xml
index 0e13dff5567..9e50bf22c46 100644
--- a/spring-bootstrap-samples/spring-bootstrap-data-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-data-sample/pom.xml
@@ -8,10 +8,7 @@
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-bootstrap-data-sample</artifactId>
-	<packaging>jar</packaging>
-	<properties>
-		<start-class>org.springframework.bootstrap.sample.data.DataBootstrapApplication</start-class>
-	</properties>
+	<packaging>executable-jar</packaging>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
@@ -69,14 +66,4 @@
 			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-dependency-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
 </project>
diff --git a/spring-bootstrap-samples/spring-bootstrap-jetty-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-jetty-sample/pom.xml
index 20d8c858c3c..07713f3bd05 100644
--- a/spring-bootstrap-samples/spring-bootstrap-jetty-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-jetty-sample/pom.xml
@@ -8,10 +8,7 @@
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-bootstrap-jetty-sample</artifactId>
-	<packaging>jar</packaging>
-	<properties>
-		<start-class>org.springframework.bootstrap.sample.jetty.JettyBootstrapApplication</start-class>
-	</properties>
+	<packaging>executable-jar</packaging>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
@@ -43,14 +40,4 @@
 			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-dependency-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
 </project>
diff --git a/spring-bootstrap-samples/spring-bootstrap-profile-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-profile-sample/pom.xml
index 227e2856680..9ef9724ed51 100644
--- a/spring-bootstrap-samples/spring-bootstrap-profile-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-profile-sample/pom.xml
@@ -8,10 +8,7 @@
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-bootstrap-profile-sample</artifactId>
-	<packaging>jar</packaging>
-	<properties>
-		<start-class>org.springframework.bootstrap.sample.simple.SimpleBootstrapApplication</start-class>
-	</properties>
+	<packaging>executable-jar</packaging>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
@@ -29,14 +26,4 @@
 			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-dependency-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
 </project>
diff --git a/spring-bootstrap-samples/spring-bootstrap-simple-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-simple-sample/pom.xml
index 809fd74309d..b9c5b9ece22 100644
--- a/spring-bootstrap-samples/spring-bootstrap-simple-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-simple-sample/pom.xml
@@ -8,10 +8,7 @@
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-bootstrap-simple-sample</artifactId>
-	<packaging>jar</packaging>
-	<properties>
-		<start-class>org.springframework.bootstrap.sample.simple.SimpleBootstrapApplication</start-class>
-	</properties>
+	<packaging>executable-jar</packaging>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
@@ -24,14 +21,4 @@
 			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-dependency-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
 </project>
diff --git a/spring-bootstrap-samples/spring-bootstrap-tomcat-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-tomcat-sample/pom.xml
index 0f5e0c50b71..cbe9ced5bef 100644
--- a/spring-bootstrap-samples/spring-bootstrap-tomcat-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-tomcat-sample/pom.xml
@@ -8,10 +8,7 @@
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-bootstrap-tomcat-sample</artifactId>
-	<packaging>jar</packaging>
-	<properties>
-		<start-class>org.springframework.bootstrap.sample.tomcat.TomcatBootstrapApplication</start-class>
-	</properties>
+	<packaging>executable-jar</packaging>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
@@ -36,14 +33,4 @@
 			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-dependency-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
 </project>
diff --git a/spring-bootstrap-samples/spring-bootstrap-xml-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-xml-sample/pom.xml
index 31943bf1e2f..8bf8a520f7b 100644
--- a/spring-bootstrap-samples/spring-bootstrap-xml-sample/pom.xml
+++ b/spring-bootstrap-samples/spring-bootstrap-xml-sample/pom.xml
@@ -8,7 +8,7 @@
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-bootstrap-xml-sample</artifactId>
-	<packaging>jar</packaging>
+	<packaging>executable-jar</packaging>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/spring-bootstrap-starters/pom.xml b/spring-bootstrap-starters/pom.xml
index 9ca8756f518..5867cea47fb 100644
--- a/spring-bootstrap-starters/pom.xml
+++ b/spring-bootstrap-starters/pom.xml
@@ -108,8 +108,19 @@
 		</dependency>
 	</dependencies>
 	<build>
+		<plugins>
+			<!-- Support bootstrap types -->
+			<plugin>
+				<groupId>org.springframework.bootstrap</groupId>
+				<artifactId>spring-bootstrap-maven-plugin</artifactId>
+				<version>${spring.bootstrap.version}</version>
+				<extensions>true</extensions>
+				<inherited>true</inherited>
+			</plugin>
+		</plugins>
 		<pluginManagement>
 			<plugins>
+				<!-- Allow exec plugin to launch the application -->
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>exec-maven-plugin</artifactId>
@@ -118,6 +129,8 @@
 						<mainClass>${start-class}</mainClass>
 					</configuration>
 				</plugin>
+
+				<!-- Support shade packaging -->
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-shade-plugin</artifactId>