Fix POMs for the updated build/release process

Fix POMs following project relocations and apply CI friendly Maven conventions. See spring-projectsgh-9316
kekemu · Oct 4, 2017 · b87f9c1 · b87f9c1
1 parent 89b0ba2
commit b87f9c1
Show file tree

Hide file tree

Showing 85 changed files with 1,214 additions and 1,741 deletions.
diff --git a/pom.xml b/pom.xml
diff --git a/spring-boot-project/pom.xml b/spring-boot-project/pom.xml
@@ -0,0 +1,32 @@
+<?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-build</artifactId>
+		<version>${revision}</version>
+	</parent>
+	<artifactId>spring-boot-project</artifactId>
+	<packaging>pom</packaging>
+	<name>Spring Boot Build</name>
+	<description>Spring Boot Build</description>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
+	<modules>
+		<module>spring-boot-dependencies</module>
+		<module>spring-boot-parent</module>
+		<module>spring-boot</module>
+		<module>spring-boot-actuator</module>
+		<module>spring-boot-actuator-autoconfigure</module>
+		<module>spring-boot-autoconfigure</module>
+		<module>spring-boot-cli</module>
+		<module>spring-boot-devtools</module>
+		<module>spring-boot-test</module>
+		<module>spring-boot-test-autoconfigure</module>
+		<module>spring-boot-tools</module>
+		<module>spring-boot-starters</module>
+		<module>spring-boot-docs</module>
+	</modules>
+</project>
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml b/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml
@@ -5,19 +5,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>${revision}</version>
 		<relativePath>../spring-boot-parent</relativePath>
 	</parent>
 	<artifactId>spring-boot-actuator-autoconfigure</artifactId>
 	<name>Spring Boot Actuator AutoConfigure</name>
 	<description>Spring Boot Actuator AutoConfigure</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>
+		<main.basedir>${basedir}/../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->

diff --git a/spring-boot-project/spring-boot-actuator/pom.xml b/spring-boot-project/spring-boot-actuator/pom.xml
@@ -5,19 +5,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>${revision}</version>
 		<relativePath>../spring-boot-parent</relativePath>
 	</parent>
 	<artifactId>spring-boot-actuator</artifactId>
 	<name>Spring Boot Actuator</name>
 	<description>Spring Boot Actuator</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>
+		<main.basedir>${basedir}/../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->

diff --git a/spring-boot-project/spring-boot-autoconfigure/pom.xml b/spring-boot-project/spring-boot-autoconfigure/pom.xml
@@ -5,19 +5,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>${revision}</version>
 		<relativePath>../spring-boot-parent</relativePath>
 	</parent>
 	<artifactId>spring-boot-autoconfigure</artifactId>
 	<name>Spring Boot AutoConfigure</name>
 	<description>Spring Boot AutoConfigure</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>
+		<main.basedir>${basedir}/../..</main.basedir>
 	</properties>
 	<dependencies>
 		<!-- Compile -->

diff --git a/spring-boot-project/spring-boot-cli/pom.xml b/spring-boot-project/spring-boot-cli/pom.xml
@@ -1,37 +1,22 @@
 <?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-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>${revision}</version>
 		<relativePath>../spring-boot-parent</relativePath>
 	</parent>
 	<artifactId>spring-boot-cli</artifactId>
 	<name>Spring Boot CLI</name>
 	<description>Spring Boot CLI</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>
+		<main.basedir>${basedir}/../..</main.basedir>
 		<start-class>org.springframework.boot.cli.SpringCli</start-class>
 		<spring.profiles.active>default</spring.profiles.active>
 		<generated.pom.dir>${project.build.directory}/generated-resources/org/springframework/boot/cli/compiler/dependencies</generated.pom.dir>
 	</properties>
-	<profiles>
-		<profile>
-			<id>integration</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-			<properties>
-				<spring.profiles.active>integration</spring.profiles.active>
-			</properties>
-		</profile>
-	</profiles>
 	<dependencies>
 		<!-- Compile -->
 		<dependency>
@@ -117,6 +102,13 @@
 			<artifactId>aether-util</artifactId>
 		</dependency>
 		<!-- Provided -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-dependencies</artifactId>
+			<type>effective-pom</type>
+			<scope>provided</scope>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy-templates</artifactId>
@@ -197,7 +189,6 @@
 								<artifactItem>
 									<groupId>org.springframework.boot</groupId>
 									<artifactId>spring-boot-dependencies</artifactId>
-									<version>${project.version}</version>
 									<type>effective-pom</type>
 									<overWrite>true</overWrite>
 									<outputDirectory>${generated.pom.dir}</outputDirectory>
@@ -316,21 +307,30 @@
 								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
 								<taskdef name="stringutil" classname="ise.antelope.tasks.StringUtilTask" />
 								<var name="version-type" value="${project.version}" />
-								<propertyregex property="version-type" override="true" input="${version-type}" regexp=".*\.(.*)" replace="\1" />
-								<propertyregex property="version-type" override="true" input="${version-type}" regexp="(M)\d+" replace="MILESTONE" />
-								<propertyregex property="version-type" override="true" input="${version-type}" regexp="(RC)\d+" replace="MILESTONE" />
-								<propertyregex property="version-type" override="true" input="${version-type}" regexp="BUILD-(.*)" replace="SNAPSHOT" />
+								<propertyregex property="version-type" override="true"
+									input="${version-type}" regexp=".*\.(.*)" replace="\1" />
+								<propertyregex property="version-type" override="true"
+									input="${version-type}" regexp="(M)\d+" replace="MILESTONE" />
+								<propertyregex property="version-type" override="true"
+									input="${version-type}" regexp="(RC)\d+" replace="MILESTONE" />
+								<propertyregex property="version-type" override="true"
+									input="${version-type}" regexp="BUILD-(.*)" replace="SNAPSHOT" />
 								<stringutil string="${version-type}" property="repo">
 									<lowercase />
 								</stringutil>
-								<checksum algorithm="sha-256" file="${project.build.directory}/spring-boot-cli-${project.version}-bin.tar.gz" property="checksum" />
-								<echo message="Customizing homebrew for ${project.version} with checksum ${checksum} in ${repo} repo" />
-								<copy file="${basedir}/src/main/homebrew/springboot.rb" tofile="${project.build.directory}/springboot.rb" overwrite="true">
+								<checksum algorithm="sha-256"
+									file="${project.build.directory}/spring-boot-cli-${project.version}-bin.tar.gz"
+									property="checksum" />
+								<echo
+									message="Customizing homebrew for ${project.version} with checksum ${checksum} in ${repo} repo" />
+								<copy file="${basedir}/src/main/homebrew/springboot.rb"
+									tofile="${project.build.directory}/springboot.rb" overwrite="true">
 									<filterchain>
 										<expandproperties />
 									</filterchain>
 								</copy>
-								<attachartifact file="${project.build.directory}/springboot.rb" classifier="homebrew" type="rb" />
+								<attachartifact file="${project.build.directory}/springboot.rb"
+									classifier="homebrew" type="rb" />
 							</target>
 						</configuration>
 					</execution>
@@ -391,4 +391,15 @@
 			</plugins>
 		</pluginManagement>
 	</build>
+	<profiles>
+		<profile>
+			<id>integration</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<properties>
+				<spring.profiles.active>integration</spring.profiles.active>
+			</properties>
+		</profile>
+	</profiles>
 </project>