From 4fd4744724343a2fb96cd9a61f4368136d524306 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@gopivotal.com>
Date: Tue, 20 May 2014 23:52:34 +0100
Subject: [PATCH] Add spring-boot-versions project

Add a new maven project containing a versions.properties file and
an effective POM. Rework existing projects to use the versions
artifacts.

Partially reverts 307fbba9e4b88ea9938817a64d840d82d6a8cd72

Fixes gh-913
---
 pom.xml                                       |   1 +
 spring-boot-docs/pom.xml                      |  19 ++-
 .../spring-boot-dependency-tools/pom.xml      | 109 +++---------------
 .../tools/PomManagedDependencies.java         |   1 -
 spring-boot-versions/pom.xml                  |  99 ++++++++++++++++
 .../dependency-management-to-versions.xsl     |  21 ++++
 6 files changed, 151 insertions(+), 99 deletions(-)
 create mode 100644 spring-boot-versions/pom.xml
 create mode 100644 spring-boot-versions/src/main/xslt/dependency-management-to-versions.xsl

diff --git a/pom.xml b/pom.xml
index ee8bd62231..60a2b82712 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,7 @@
 			</activation>
 			<modules>
 				<module>spring-boot-dependencies</module>
+				<module>spring-boot-versions</module>
 				<module>spring-boot-parent</module>
 				<module>spring-boot-tools</module>
 				<module>spring-boot</module>
diff --git a/spring-boot-docs/pom.xml b/spring-boot-docs/pom.xml
index 3f8ae1dce4..b863563ccb 100644
--- a/spring-boot-docs/pom.xml
+++ b/spring-boot-docs/pom.xml
@@ -96,23 +96,30 @@
 									</artifactItems>
 								</configuration>
 							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-dependency-plugin</artifactId>
+						<executions>
 							<execution>
-								<id>unpack-dependency-tools-effective-pom</id>
+								<id>copy-versions-effective-pom</id>
 								<phase>generate-resources</phase>
 								<goals>
-									<goal>unpack</goal>
+									<goal>copy</goal>
 								</goals>
 								<configuration>
 									<artifactItems>
 										<artifactItem>
 											<groupId>org.springframework.boot</groupId>
-											<artifactId>spring-boot-dependency-tools</artifactId>
+											<artifactId>spring-boot-versions</artifactId>
 											<version>${project.version}</version>
-											<type>jar</type>
+											<type>effective-pom</type>
+											<overWrite>true</overWrite>
+											<outputDirectory>${project.build.directory}/external-resource</outputDirectory>
+											<destFileName>effective-pom.xml</destFileName>
 										</artifactItem>
 									</artifactItems>
-									<includes>**/effective-pom.xml</includes>
-									<outputDirectory>${project.build.directory}/external-resources</outputDirectory>
 								</configuration>
 							</execution>
 						</executions>
diff --git a/spring-boot-tools/spring-boot-dependency-tools/pom.xml b/spring-boot-tools/spring-boot-dependency-tools/pom.xml
index 75abdbee79..8fdc4bb5ad 100644
--- a/spring-boot-tools/spring-boot-dependency-tools/pom.xml
+++ b/spring-boot-tools/spring-boot-dependency-tools/pom.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-dependencies</artifactId>
+		<artifactId>spring-boot-tools</artifactId>
 		<version>1.1.0.BUILD-SNAPSHOT</version>
-		<relativePath>../../spring-boot-dependencies</relativePath>
 	</parent>
 	<artifactId>spring-boot-dependency-tools</artifactId>
 	<name>Spring Boot Dependency Tools</name>
@@ -19,18 +19,6 @@
 		<main.basedir>${basedir}/../..</main.basedir>
 		<generated.pom.dir>${project.build.directory}/generated-resources/org/springframework/boot/dependency/tools</generated.pom.dir>
 	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-library</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
 	<build>
 		<resources>
 			<resource>
@@ -40,93 +28,30 @@
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
+				<artifactId>maven-dependency-plugin</artifactId>
 				<executions>
 					<execution>
-						<id>copy-dependencies-pom</id>
+						<id>copy-effective-pom</id>
 						<phase>generate-resources</phase>
 						<goals>
-							<goal>run</goal>
+							<goal>copy</goal>
 						</goals>
 						<configuration>
-							<target>
-								<copy file="${main.basedir}/spring-boot-dependencies/pom.xml" tofile="${generated.pom.dir}/dependencies-pom.xml" />
-							</target>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-help-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>generate-effective-dependencies-pom</id>
-						<phase>generate-resources</phase>
-						<goals>
-							<goal>effective-pom</goal>
-						</goals>
-						<configuration>
-							<output>${generated.pom.dir}/effective-pom.xml</output>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.springframework.boot</groupId>
+									<artifactId>spring-boot-versions</artifactId>
+									<version>${project.version}</version>
+									<type>effective-pom</type>
+									<overWrite>true</overWrite>
+									<outputDirectory>${generated.pom.dir}</outputDirectory>
+									<destFileName>effective-pom.xml</destFileName>
+								</artifactItem>
+							</artifactItems>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
 		</plugins>
-		<pluginManagement>
-			<plugins>
-				<!--This plugin's configuration is used to store Eclipse m2e settings
-					only. It has no influence on the Maven build itself. -->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>
-											org.apache.maven.plugins
-										</groupId>
-										<artifactId>
-											maven-help-plugin
-										</artifactId>
-										<versionRange>
-											[2.2,)
-										</versionRange>
-										<goals>
-											<goal>effective-pom</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>
-											org.apache.maven.plugins
-										</groupId>
-										<artifactId>
-											maven-antrun-plugin
-										</artifactId>
-										<versionRange>
-											[1.7,)
-										</versionRange>
-										<goals>
-											<goal>run</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 	</build>
 </project>
diff --git a/spring-boot-tools/spring-boot-dependency-tools/src/main/java/org/springframework/boot/dependency/tools/PomManagedDependencies.java b/spring-boot-tools/spring-boot-dependency-tools/src/main/java/org/springframework/boot/dependency/tools/PomManagedDependencies.java
index 5a42613085..7b19a54c10 100644
--- a/spring-boot-tools/spring-boot-dependency-tools/src/main/java/org/springframework/boot/dependency/tools/PomManagedDependencies.java
+++ b/spring-boot-tools/spring-boot-dependency-tools/src/main/java/org/springframework/boot/dependency/tools/PomManagedDependencies.java
@@ -45,7 +45,6 @@ public class PomManagedDependencies extends AbstractManagedDependencies {
 	public PomManagedDependencies(InputStream effectivePomInputStream) {
 		try {
 			Document effectivePom = readDocument(effectivePomInputStream);
-
 			for (Dependency dependency : readDependencies(effectivePom)) {
 				add(new ArtifactAndGroupId(dependency), dependency);
 			}
diff --git a/spring-boot-versions/pom.xml b/spring-boot-versions/pom.xml
new file mode 100644
index 0000000000..a008e20c8f
--- /dev/null
+++ b/spring-boot-versions/pom.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-dependencies</artifactId>
+		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<relativePath>../../spring-boot-dependencies</relativePath>
+	</parent>
+	<artifactId>spring-boot-versions</artifactId>
+	<packaging>pom</packaging>
+	<name>Spring Boot Versions</name>
+	<description>Spring Boot Versions Property File</description>
+	<url>http://projects.spring.io/spring-boot/</url>
+	<organization>
+		<name>Pivotal Software, Inc.</name>
+		<url>http://www.spring.io</url>
+	</organization>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
+	<build>
+		<resources>
+			<resource>
+				<directory>${project.build.directory}/generated-resources</directory>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<artifactId>maven-help-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>generate-effective-dependencies-pom</id>
+						<phase>generate-resources</phase>
+						<goals>
+							<goal>effective-pom</goal>
+						</goals>
+						<configuration>
+							<output>${project.build.directory}/effective-pom/spring-boot-versions.xml</output>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>xml-maven-plugin</artifactId>
+				<version>1.0</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>transform</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<transformationSets>
+						<transformationSet>
+							<dir>${project.build.directory}/effective-pom</dir>
+							<stylesheet>src/main/xslt/dependency-management-to-versions.xsl</stylesheet>
+							<fileMappers>
+								<fileMapper
+									implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
+									<targetExtension>.properties</targetExtension>
+								</fileMapper>
+							</fileMappers>
+							<outputDir>${project.build.directory}/generated-resources</outputDir>
+						</transformationSet>
+					</transformationSets>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-artifacts</id>
+						<phase>package</phase>
+						<goals>
+							<goal>attach-artifact</goal>
+						</goals>
+						<configuration>
+							<artifacts>
+								<artifact>
+									<file>${project.build.directory}/generated-resources/spring-boot-versions.properties</file>
+									<type>properties</type>
+								</artifact>
+								<artifact>
+									<file>${project.build.directory}/effective-pom/spring-boot-versions.xml</file>
+									<type>effective-pom</type>
+								</artifact>
+							</artifacts>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/spring-boot-versions/src/main/xslt/dependency-management-to-versions.xsl b/spring-boot-versions/src/main/xslt/dependency-management-to-versions.xsl
new file mode 100644
index 0000000000..905c15a57f
--- /dev/null
+++ b/spring-boot-versions/src/main/xslt/dependency-management-to-versions.xsl
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+				xmlns:mvn="http://maven.apache.org/POM/4.0.0"
+				version="1.0">
+
+	<xsl:output method="text" encoding="UTF-8" indent="no"/>
+
+	<xsl:template match="/">
+		<xsl:for-each select="//mvn:dependency">
+			<xsl:sort select="mvn:groupId"/>
+			<xsl:sort select="mvn:artifactId"/>
+			<xsl:copy-of select="mvn:groupId"/>
+			<xsl:text>\:</xsl:text>
+			<xsl:copy-of select="mvn:artifactId"/>
+			<xsl:text>=</xsl:text>
+			<xsl:copy-of select="mvn:version"/>
+			<xsl:text>&#xa;</xsl:text>
+		</xsl:for-each>
+	</xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file