From bf4b347a963fff42efe198b759ef4efdf1d97d19 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@gopivotal.com>
Date: Fri, 2 May 2014 22:21:28 +0200
Subject: [PATCH] Fix build failure

Commit e26e06d5dd broke the full build as the generated zip file for
the size is not generated. Actually, the site plugin has a jar goal that
is exactly meant for what we need to do.

This commit removes the use of the assembly plugin and invokes the
jar goal of the site plugin when the full profile is enabled.

Relates to #749
---
 spring-boot-docs/pom.xml                      |  7 ++-
 .../spring-boot-maven-plugin/pom.xml          | 62 +++++++++----------
 .../src/assemble/site.xml                     | 15 -----
 3 files changed, 33 insertions(+), 51 deletions(-)
 delete mode 100644 spring-boot-tools/spring-boot-maven-plugin/src/assemble/site.xml

diff --git a/spring-boot-docs/pom.xml b/spring-boot-docs/pom.xml
index 9918f200d11..5ddb3559302 100644
--- a/spring-boot-docs/pom.xml
+++ b/spring-boot-docs/pom.xml
@@ -240,8 +240,11 @@
 											<artifactId>spring-boot-maven-plugin</artifactId>
 											<version>${project.version}</version>
 											<classifier>site</classifier>
-											<type>zip</type>
-											<outputDirectory>${project.build.directory}/contents</outputDirectory>
+											<type>jar</type>
+											<outputDirectory>
+												${project.build.directory}/contents/maven-plugin
+											</outputDirectory>
+											<excludes>META-INF/**</excludes>
 										</artifactItem>
 									</artifactItems>
 								</configuration>
diff --git a/spring-boot-tools/spring-boot-maven-plugin/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/pom.xml
index e1322174c40..9af7addf4cd 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/pom.xml
+++ b/spring-boot-tools/spring-boot-maven-plugin/pom.xml
@@ -56,24 +56,43 @@
 				<plugins>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-assembly-plugin</artifactId>
-						<configuration>
-							<descriptors>
-								<descriptor>src/assemble/site.xml</descriptor>
-							</descriptors>
-						</configuration>
+						<artifactId>maven-site-plugin</artifactId>
 						<executions>
 							<execution>
-								<id>create-site-zip</id>
-								<phase>site</phase>
+								<id>generate-site</id>
 								<goals>
-									<goal>single</goal>
+									<goal>jar</goal>
 								</goals>
 							</execution>
 						</executions>
 					</plugin>
 				</plugins>
 			</build>
+			<reporting>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-plugin-plugin</artifactId>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-project-info-reports-plugin</artifactId>
+						<version>2.7</version>
+						<reportSets>
+							<reportSet>
+								<reports>
+									<report>index</report>
+									<report>cim</report>
+									<report>issue-tracking</report>
+									<report>license</report>
+									<report>scm</report>
+								</reports>
+							</reportSet>
+						</reportSets>
+					</plugin>
+				</plugins>
+
+			</reporting>
 		</profile>
 	</profiles>
 	<dependencies>
@@ -168,29 +187,4 @@
 			</plugin>
 		</plugins>
 	</build>
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-plugin-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<version>2.7</version>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>index</report>
-							<report>cim</report>
-							<report>issue-tracking</report>
-							<report>license</report>
-							<report>scm</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-		</plugins>
-
-	</reporting>
 </project>
diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/assemble/site.xml b/spring-boot-tools/spring-boot-maven-plugin/src/assemble/site.xml
deleted file mode 100644
index cadc42520a6..00000000000
--- a/spring-boot-tools/spring-boot-maven-plugin/src/assemble/site.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-		  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-	<id>site</id>
-	<baseDirectory>maven-plugin</baseDirectory>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<fileSets>
-		<fileSet>
-			<directory>${project.build.directory}/site</directory>
-			<outputDirectory>/</outputDirectory>
-		</fileSet>
-	</fileSets>
-</assembly>
\ No newline at end of file