From 2274ac5214ea0aa342ff43ac901ff54c27ca36e2 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Mon, 4 Jun 2018 17:25:19 -0700
Subject: [PATCH] Move spring-javaformat plugins to root POM

Relocate spring-javaformat plugins to the root of the project.

Closes gh-13306
---
 .../.eclipse => .eclipse}/eclipse.properties  |  0
 pom.xml                                       | 58 ++++++++++++++++++-
 .../spring-boot-parent/pom.xml                | 53 -----------------
 spring-boot-samples/pom.xml                   | 49 ----------------
 .../checkstyle/checkstyle-header.txt          |  0
 .../checkstyle/checkstyle-suppressions.xml    |  0
 .../src => src}/checkstyle/checkstyle.xml     |  0
 .../src => src}/checkstyle/import-control.xml |  0
 8 files changed, 57 insertions(+), 103 deletions(-)
 rename {spring-boot-project/spring-boot-dependencies/.eclipse => .eclipse}/eclipse.properties (100%)
 rename {spring-boot-project/spring-boot-parent/src => src}/checkstyle/checkstyle-header.txt (100%)
 rename {spring-boot-project/spring-boot-parent/src => src}/checkstyle/checkstyle-suppressions.xml (100%)
 rename {spring-boot-project/spring-boot-parent/src => src}/checkstyle/checkstyle.xml (100%)
 rename {spring-boot-project/spring-boot-parent/src => src}/checkstyle/import-control.xml (100%)

diff --git a/spring-boot-project/spring-boot-dependencies/.eclipse/eclipse.properties b/.eclipse/eclipse.properties
similarity index 100%
rename from spring-boot-project/spring-boot-dependencies/.eclipse/eclipse.properties
rename to .eclipse/eclipse.properties
diff --git a/pom.xml b/pom.xml
index 0cdb824474..811c04c45d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?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"
+<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>
 	<groupId>org.springframework.boot</groupId>
@@ -20,6 +21,61 @@
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
+			<properties>
+				<spring-javaformat.version>0.0.2</spring-javaformat.version>
+			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-checkstyle-plugin</artifactId>
+						<version>3.0.0</version>
+						<dependencies>
+							<dependency>
+								<groupId>com.puppycrawl.tools</groupId>
+								<artifactId>checkstyle</artifactId>
+								<version>8.8</version>
+							</dependency>
+							<dependency>
+								<groupId>io.spring.javaformat</groupId>
+								<artifactId>spring-javaformat-checkstyle</artifactId>
+								<version>${spring-javaformat.version}</version>
+							</dependency>
+						</dependencies>
+						<executions>
+							<execution>
+								<id>checkstyle-validation</id>
+								<phase>validate</phase>
+								<configuration>
+									<skip>${disable.checks}</skip>
+									<configLocation>src/checkstyle/checkstyle.xml</configLocation>
+									<suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
+									<includeTestSourceDirectory>true</includeTestSourceDirectory>
+								</configuration>
+								<goals>
+									<goal>check</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>io.spring.javaformat</groupId>
+						<artifactId>spring-javaformat-maven-plugin</artifactId>
+						<version>${spring-javaformat.version}</version>
+						<executions>
+							<execution>
+								<phase>validate</phase>
+								<configuration>
+									<skip>${disable.checks}</skip>
+								</configuration>
+								<goals>
+									<goal>validate</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
 			<modules>
 				<module>spring-boot-project</module>
 				<!-- Samples are built via the invoker plugin -->
diff --git a/spring-boot-project/spring-boot-parent/pom.xml b/spring-boot-project/spring-boot-parent/pom.xml
index 78946aedbb..318033ff1e 100644
--- a/spring-boot-project/spring-boot-parent/pom.xml
+++ b/spring-boot-project/spring-boot-parent/pom.xml
@@ -26,7 +26,6 @@
 		<aether.version>1.0.2.v20150114</aether.version>
 		<maven.version>3.1.1</maven.version>
 		<spock.version>1.0-groovy-2.4</spock.version>
-		<spring-javaformat.version>0.0.2</spring-javaformat.version>
 	</properties>
 	<scm>
 		<url>http://github.com/spring-projects/spring-boot</url>
@@ -304,23 +303,6 @@
 					<artifactId>asciidoctor-maven-plugin</artifactId>
 					<version>1.5.5</version>
 				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-checkstyle-plugin</artifactId>
-					<version>3.0.0</version>
-					<dependencies>
-						<dependency>
-							<groupId>com.puppycrawl.tools</groupId>
-							<artifactId>checkstyle</artifactId>
-							<version>8.8</version>
-						</dependency>
-						<dependency>
-							<groupId>io.spring.javaformat</groupId>
-							<artifactId>spring-javaformat-checkstyle</artifactId>
-							<version>${spring-javaformat.version}</version>
-						</dependency>
-					</dependencies>
-				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-failsafe-plugin</artifactId>
@@ -574,41 +556,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>io.spring.javaformat</groupId>
-				<artifactId>spring-javaformat-maven-plugin</artifactId>
-				<version>${spring-javaformat.version}</version>
-				<executions>
-					<execution>
-						<phase>validate</phase>
-						<configuration>
-							<skip>${disable.checks}</skip>
-						</configuration>
-						<goals>
-							<goal>validate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>checkstyle-validation</id>
-						<phase>validate</phase>
-						<configuration>
-							<skip>${disable.checks}</skip>
-							<configLocation>src/checkstyle/checkstyle.xml</configLocation>
-							<suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
-							<includeTestSourceDirectory>true</includeTestSourceDirectory>
-						</configuration>
-						<goals>
-							<goal>check</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
diff --git a/spring-boot-samples/pom.xml b/spring-boot-samples/pom.xml
index 054c146ddd..2c99390f32 100644
--- a/spring-boot-samples/pom.xml
+++ b/spring-boot-samples/pom.xml
@@ -15,7 +15,6 @@
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
 		<java.version>1.8</java.version>
-		<spring-javaformat.version>0.0.2</spring-javaformat.version>
 		<disable.checks>false</disable.checks>
 	</properties>
 	<modules>
@@ -176,54 +175,6 @@
 			</plugins>
 		</pluginManagement>
 		<plugins>
-			<plugin>
-				<groupId>io.spring.javaformat</groupId>
-				<artifactId>spring-javaformat-maven-plugin</artifactId>
-				<version>${spring-javaformat.version}</version>
-				<executions>
-					<execution>
-						<phase>validate</phase>
-						<configuration>
-							<skip>${disable.checks}</skip>
-						</configuration>
-						<goals>
-							<goal>validate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>3.0.0</version>
-				<dependencies>
-					<dependency>
-						<groupId>com.puppycrawl.tools</groupId>
-						<artifactId>checkstyle</artifactId>
-						<version>8.8</version>
-					</dependency>
-					<dependency>
-						<groupId>io.spring.javaformat</groupId>
-						<artifactId>spring-javaformat-checkstyle</artifactId>
-						<version>${spring-javaformat.version}</version>
-					</dependency>
-				</dependencies>
-				<executions>
-					<execution>
-						<id>checkstyle-validation</id>
-						<phase>validate</phase>
-						<configuration>
-							<skip>${disable.checks}</skip>
-							<configLocation>../spring-boot-parent/src/checkstyle/checkstyle.xml</configLocation>
-							<suppressionsLocation>../spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
-							<includeTestSourceDirectory>true</includeTestSourceDirectory>
-						</configuration>
-						<goals>
-							<goal>check</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
diff --git a/spring-boot-project/spring-boot-parent/src/checkstyle/checkstyle-header.txt b/src/checkstyle/checkstyle-header.txt
similarity index 100%
rename from spring-boot-project/spring-boot-parent/src/checkstyle/checkstyle-header.txt
rename to src/checkstyle/checkstyle-header.txt
diff --git a/spring-boot-project/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml
similarity index 100%
rename from spring-boot-project/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
rename to src/checkstyle/checkstyle-suppressions.xml
diff --git a/spring-boot-project/spring-boot-parent/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml
similarity index 100%
rename from spring-boot-project/spring-boot-parent/src/checkstyle/checkstyle.xml
rename to src/checkstyle/checkstyle.xml
diff --git a/spring-boot-project/spring-boot-parent/src/checkstyle/import-control.xml b/src/checkstyle/import-control.xml
similarity index 100%
rename from spring-boot-project/spring-boot-parent/src/checkstyle/import-control.xml
rename to src/checkstyle/import-control.xml