Fix POMs for the updated build/release process

Fix POMs following project relocations and apply CI friendly Maven conventions. See gh-9316
2017-05-31 14:27:23 -07:00
parent 89b0ba2c14
commit b87f9c11f1
85 changed files with 1219 additions and 1746 deletions
--- a/spring-boot-project/spring-boot-docs/pom.xml
+++ b/spring-boot-project/spring-boot-docs/pom.xml
@@ -1,22 +1,18 @@
 <?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-docs</artifactId>
 	<name>Spring Boot Docs</name>
 	<description>Spring Boot Docs</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>
 		<dependency>
@@ -35,6 +31,17 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-autoconfigure</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-cli</artifactId>
+			<version>${revision}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starters</artifactId>
+			<version>${revision}</version>
+			<type>pom</type>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>
@@ -848,9 +855,9 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
 				<configuration>
-				<excludes>
-					<exclude>**</exclude>
-				</excludes>
+					<excludes>
+						<exclude>**</exclude>
+					</excludes>
 				</configuration>
 			</plugin>
 		</plugins>
@@ -858,6 +865,11 @@
 	<profiles>
 		<profile>
 			<id>full</id>
+			<activation>
+				<property>
+					<name>full</name>
+				</property>
+			</activation>
 			<build>
 				<plugins>
 					<plugin>
@@ -906,7 +918,7 @@
 										<artifactItem>
 											<groupId>org.springframework.boot</groupId>
 											<artifactId>spring-boot-starters</artifactId>
-											<version>${project.version}</version>
+											<version>${revision}</version>
 											<type>pom</type>
 											<overWrite>true</overWrite>
 											<outputDirectory>${project.build.directory}/external-resources</outputDirectory>
@@ -926,7 +938,7 @@
 										<artifactItem>
 											<groupId>org.springframework.boot</groupId>
 											<artifactId>spring-boot-maven-plugin</artifactId>
-											<version>${project.version}</version>
+											<version>${revision}</version>
 											<classifier>site</classifier>
 											<type>jar</type>
 											<outputDirectory>
@@ -937,7 +949,7 @@
 										<artifactItem>
 											<groupId>org.springframework.boot</groupId>
 											<artifactId>spring-boot-gradle-plugin</artifactId>
-											<version>${project.version}</version>
+											<version>${revision}</version>
 											<classifier>docs</classifier>
 											<type>zip</type>
 											<outputDirectory>${project.build.directory}/contents/gradle-plugin</outputDirectory>
@@ -957,7 +969,7 @@
 										<artifactItem>
 											<groupId>org.springframework.boot</groupId>
 											<artifactId>spring-boot-dependencies</artifactId>
-											<version>${project.version}</version>
+											<version>${revision}</version>
 											<type>effective-pom</type>
 											<overWrite>true</overWrite>
 											<outputDirectory>${project.build.directory}/external-resources</outputDirectory>
@@ -977,7 +989,7 @@
 										<artifactItem>
 											<groupId>org.springframework.boot</groupId>
 											<artifactId>spring-boot-autoconfigure</artifactId>
-											<version>${project.version}</version>
+											<version>${revision}</version>
 											<outputDirectory>
 												${project.build.directory}/auto-config/spring-boot-autoconfigure
 											</outputDirectory>
@@ -986,7 +998,7 @@
 										<artifactItem>
 											<groupId>org.springframework.boot</groupId>
 											<artifactId>spring-boot-actuator-autoconfigure</artifactId>
-											<version>${project.version}</version>
+											<version>${revision}</version>
 											<outputDirectory>
 												${project.build.directory}/auto-config/spring-boot-actuator-autoconfigure
 											</outputDirectory>
@@ -1006,7 +1018,7 @@
 										<artifactItem>
 											<groupId>org.springframework.boot</groupId>
 											<artifactId>spring-boot-starters</artifactId>
-											<version>${project.version}</version>
+											<version>${revision}</version>
 											<type>zip</type>
 											<classifier>starter-poms</classifier>
 											<outputDirectory>${project.build.directory}/external-resources/starter-poms</outputDirectory>
@@ -1025,7 +1037,7 @@
 										<artifactItem>
 											<groupId>org.springframework.boot</groupId>
 											<artifactId>spring-boot-test-autoconfigure</artifactId>
-											<version>${project.version}</version>
+											<version>${revision}</version>
 											<outputDirectory>
 												${project.build.directory}/test-auto-config
 											</outputDirectory>
@@ -1055,7 +1067,8 @@
 									</includes>
 									<stylesheet>src/main/xslt/dependencyVersions.xsl</stylesheet>
 									<fileMappers>
-										<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
+										<fileMapper
+											implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
 											<targetExtension>.adoc</targetExtension>
 										</fileMapper>
 									</fileMappers>
@@ -1098,7 +1111,6 @@
 					<plugin>
 						<groupId>org.asciidoctor</groupId>
 						<artifactId>asciidoctor-maven-plugin</artifactId>
-						<version>1.5.0</version>
 						<executions>
 							<execution>
 								<id>generate-docbook</id>
@@ -1113,8 +1125,8 @@
 									<attributes>
 										<docinfo>true</docinfo>
 										<spring-version>${spring.version}</spring-version>
-										<spring-boot-version>${project.version}</spring-boot-version>
-										<spring-boot-docs-version>${project.version}</spring-boot-docs-version>
+										<spring-boot-version>${revision}</spring-boot-version>
+										<spring-boot-docs-version>${revision}</spring-boot-docs-version>
 										<spring-boot-repo>${spring-boot-repo}</spring-boot-repo>
 										<spring-docs-version>${spring.version}</spring-docs-version>
 										<spring-security-docs-version>${spring-security.version}</spring-security-docs-version>
@@ -1223,7 +1235,8 @@
 												<include name="**/*.pdf" />
 											</fileset>
 										</copy>
-										<move file="${basedir}/target/contents/reference/pdf/index.pdf" tofile="${basedir}/target/contents/reference/pdf/spring-boot-reference.pdf" />
+										<move file="${basedir}/target/contents/reference/pdf/index.pdf"
+											tofile="${basedir}/target/contents/reference/pdf/spring-boot-reference.pdf" />
 									</postProcess>
 								</configuration>
 							</execution>
@@ -1242,7 +1255,8 @@
 												<include name="**/*.epub" />
 											</fileset>
 										</copy>
-										<move file="${basedir}/target/contents/reference/epub/index.epub" tofile="${basedir}/target/contents/reference/epub/spring-boot-reference.epub" />
+										<move file="${basedir}/target/contents/reference/epub/index.epub"
+											tofile="${basedir}/target/contents/reference/epub/spring-boot-reference.epub" />
 									</postProcess>
 								</configuration>
 							</execution>
@@ -1283,8 +1297,11 @@
 								</goals>
 								<configuration>
 									<target>
-										<zip destfile="${project.build.directory}/${project.artifactId}-${project.version}.zip">
-											<zipfileset src="${project.build.directory}/${project.artifactId}-${project.version}-javadoc.jar" prefix="api" />
+										<zip
+											destfile="${project.build.directory}/${project.artifactId}-${revision}.zip">
+											<zipfileset
+												src="${project.build.directory}/${project.artifactId}-${revision}-javadoc.jar"
+												prefix="api" />
 											<fileset dir="${project.build.directory}/contents" />
 										</zip>
 									</target>
@@ -1301,16 +1318,21 @@
 									<target>
 										<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" />
+										<var name="version-type" value="${revision}" />
+										<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="spring-boot-repo">
 											<lowercase />
 										</stringutil>
-										<var name="github-tag" value="v${project.version}" />
-										<propertyregex property="github-tag" override="true" input="${github-tag}" regexp=".*SNAPSHOT" replace="master" />
+										<var name="github-tag" value="v${revision}" />
+										<propertyregex property="github-tag" override="true"
+											input="${github-tag}" regexp=".*SNAPSHOT" replace="master" />
 									</target>
 								</configuration>
 							</execution>
@@ -1329,7 +1351,7 @@
 									<artifacts>
 										<artifact>
 											<file>${project.build.directory}/${project.artifactId}-${project.version}.zip</file>
-											<type>zip;zip.type=docs;zip.deployed=false</type>
+											<type>zip</type>
 										</artifact>
 									</artifacts>
 								</configuration>