Skip to content

Commit b87f9c1

Browse files
philwebbphilwebb
committed
Fix POMs for the updated build/release process
Fix POMs following project relocations and apply CI friendly Maven conventions. See gh-9316
1 parent 89b0ba2 commit b87f9c1

File tree

85 files changed

+1214
-1741
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1214
-1741
lines changed

‎pom.xml

+78-335
Large diffs are not rendered by default.

‎spring-boot-project/pom.xml

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<parent>
6+
<groupId>org.springframework.boot</groupId>
7+
<artifactId>spring-boot-build</artifactId>
8+
<version>${revision}</version>
9+
</parent>
10+
<artifactId>spring-boot-project</artifactId>
11+
<packaging>pom</packaging>
12+
<name>Spring Boot Build</name>
13+
<description>Spring Boot Build</description>
14+
<properties>
15+
<main.basedir>${basedir}/../..</main.basedir>
16+
</properties>
17+
<modules>
18+
<module>spring-boot-dependencies</module>
19+
<module>spring-boot-parent</module>
20+
<module>spring-boot</module>
21+
<module>spring-boot-actuator</module>
22+
<module>spring-boot-actuator-autoconfigure</module>
23+
<module>spring-boot-autoconfigure</module>
24+
<module>spring-boot-cli</module>
25+
<module>spring-boot-devtools</module>
26+
<module>spring-boot-test</module>
27+
<module>spring-boot-test-autoconfigure</module>
28+
<module>spring-boot-tools</module>
29+
<module>spring-boot-starters</module>
30+
<module>spring-boot-docs</module>
31+
</modules>
32+
</project>

‎spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml

+2-7
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,14 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-parent</artifactId>
8-
<version>2.0.0.BUILD-SNAPSHOT</version>
8+
<version>${revision}</version>
99
<relativePath>../spring-boot-parent</relativePath>
1010
</parent>
1111
<artifactId>spring-boot-actuator-autoconfigure</artifactId>
1212
<name>Spring Boot Actuator AutoConfigure</name>
1313
<description>Spring Boot Actuator AutoConfigure</description>
14-
<url>http://projects.spring.io/spring-boot/</url>
15-
<organization>
16-
<name>Pivotal Software, Inc.</name>
17-
<url>http://www.spring.io</url>
18-
</organization>
1914
<properties>
20-
<main.basedir>${basedir}/..</main.basedir>
15+
<main.basedir>${basedir}/../..</main.basedir>
2116
</properties>
2217
<dependencies>
2318
<!-- Compile -->

‎spring-boot-project/spring-boot-actuator/pom.xml

+2-7
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,14 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-parent</artifactId>
8-
<version>2.0.0.BUILD-SNAPSHOT</version>
8+
<version>${revision}</version>
99
<relativePath>../spring-boot-parent</relativePath>
1010
</parent>
1111
<artifactId>spring-boot-actuator</artifactId>
1212
<name>Spring Boot Actuator</name>
1313
<description>Spring Boot Actuator</description>
14-
<url>http://projects.spring.io/spring-boot/</url>
15-
<organization>
16-
<name>Pivotal Software, Inc.</name>
17-
<url>http://www.spring.io</url>
18-
</organization>
1914
<properties>
20-
<main.basedir>${basedir}/..</main.basedir>
15+
<main.basedir>${basedir}/../..</main.basedir>
2116
</properties>
2217
<dependencies>
2318
<!-- Compile -->

‎spring-boot-project/spring-boot-autoconfigure/pom.xml

+2-7
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,14 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-parent</artifactId>
8-
<version>2.0.0.BUILD-SNAPSHOT</version>
8+
<version>${revision}</version>
99
<relativePath>../spring-boot-parent</relativePath>
1010
</parent>
1111
<artifactId>spring-boot-autoconfigure</artifactId>
1212
<name>Spring Boot AutoConfigure</name>
1313
<description>Spring Boot AutoConfigure</description>
14-
<url>http://projects.spring.io/spring-boot/</url>
15-
<organization>
16-
<name>Pivotal Software, Inc.</name>
17-
<url>http://www.spring.io</url>
18-
</organization>
1914
<properties>
20-
<main.basedir>${basedir}/..</main.basedir>
15+
<main.basedir>${basedir}/../..</main.basedir>
2116
</properties>
2217
<dependencies>
2318
<!-- Compile -->

‎spring-boot-project/spring-boot-cli/pom.xml

+39-28
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,22 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<groupId>org.springframework.boot</groupId>
67
<artifactId>spring-boot-parent</artifactId>
7-
<version>2.0.0.BUILD-SNAPSHOT</version>
8+
<version>${revision}</version>
89
<relativePath>../spring-boot-parent</relativePath>
910
</parent>
1011
<artifactId>spring-boot-cli</artifactId>
1112
<name>Spring Boot CLI</name>
1213
<description>Spring Boot CLI</description>
13-
<url>http://projects.spring.io/spring-boot/</url>
14-
<organization>
15-
<name>Pivotal Software, Inc.</name>
16-
<url>http://www.spring.io</url>
17-
</organization>
1814
<properties>
19-
<main.basedir>${basedir}/..</main.basedir>
15+
<main.basedir>${basedir}/../..</main.basedir>
2016
<start-class>org.springframework.boot.cli.SpringCli</start-class>
2117
<spring.profiles.active>default</spring.profiles.active>
2218
<generated.pom.dir>${project.build.directory}/generated-resources/org/springframework/boot/cli/compiler/dependencies</generated.pom.dir>
2319
</properties>
24-
<profiles>
25-
<profile>
26-
<id>integration</id>
27-
<activation>
28-
<activeByDefault>true</activeByDefault>
29-
</activation>
30-
<properties>
31-
<spring.profiles.active>integration</spring.profiles.active>
32-
</properties>
33-
</profile>
34-
</profiles>
3520
<dependencies>
3621
<!-- Compile -->
3722
<dependency>
@@ -117,6 +102,13 @@
117102
<artifactId>aether-util</artifactId>
118103
</dependency>
119104
<!-- Provided -->
105+
<dependency>
106+
<groupId>org.springframework.boot</groupId>
107+
<artifactId>spring-boot-dependencies</artifactId>
108+
<type>effective-pom</type>
109+
<scope>provided</scope>
110+
<version>${project.version}</version>
111+
</dependency>
120112
<dependency>
121113
<groupId>org.codehaus.groovy</groupId>
122114
<artifactId>groovy-templates</artifactId>
@@ -197,7 +189,6 @@
197189
<artifactItem>
198190
<groupId>org.springframework.boot</groupId>
199191
<artifactId>spring-boot-dependencies</artifactId>
200-
<version>${project.version}</version>
201192
<type>effective-pom</type>
202193
<overWrite>true</overWrite>
203194
<outputDirectory>${generated.pom.dir}</outputDirectory>
@@ -316,21 +307,30 @@
316307
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
317308
<taskdef name="stringutil" classname="ise.antelope.tasks.StringUtilTask" />
318309
<var name="version-type" value="${project.version}" />
319-
<propertyregex property="version-type" override="true" input="${version-type}" regexp=".*\.(.*)" replace="\1" />
320-
<propertyregex property="version-type" override="true" input="${version-type}" regexp="(M)\d+" replace="MILESTONE" />
321-
<propertyregex property="version-type" override="true" input="${version-type}" regexp="(RC)\d+" replace="MILESTONE" />
322-
<propertyregex property="version-type" override="true" input="${version-type}" regexp="BUILD-(.*)" replace="SNAPSHOT" />
310+
<propertyregex property="version-type" override="true"
311+
input="${version-type}" regexp=".*\.(.*)" replace="\1" />
312+
<propertyregex property="version-type" override="true"
313+
input="${version-type}" regexp="(M)\d+" replace="MILESTONE" />
314+
<propertyregex property="version-type" override="true"
315+
input="${version-type}" regexp="(RC)\d+" replace="MILESTONE" />
316+
<propertyregex property="version-type" override="true"
317+
input="${version-type}" regexp="BUILD-(.*)" replace="SNAPSHOT" />
323318
<stringutil string="${version-type}" property="repo">
324319
<lowercase />
325320
</stringutil>
326-
<checksum algorithm="sha-256" file="${project.build.directory}/spring-boot-cli-${project.version}-bin.tar.gz" property="checksum" />
327-
<echo message="Customizing homebrew for ${project.version} with checksum ${checksum} in ${repo} repo" />
328-
<copy file="${basedir}/src/main/homebrew/springboot.rb" tofile="${project.build.directory}/springboot.rb" overwrite="true">
321+
<checksum algorithm="sha-256"
322+
file="${project.build.directory}/spring-boot-cli-${project.version}-bin.tar.gz"
323+
property="checksum" />
324+
<echo
325+
message="Customizing homebrew for ${project.version} with checksum ${checksum} in ${repo} repo" />
326+
<copy file="${basedir}/src/main/homebrew/springboot.rb"
327+
tofile="${project.build.directory}/springboot.rb" overwrite="true">
329328
<filterchain>
330329
<expandproperties />
331330
</filterchain>
332331
</copy>
333-
<attachartifact file="${project.build.directory}/springboot.rb" classifier="homebrew" type="rb" />
332+
<attachartifact file="${project.build.directory}/springboot.rb"
333+
classifier="homebrew" type="rb" />
334334
</target>
335335
</configuration>
336336
</execution>
@@ -391,4 +391,15 @@
391391
</plugins>
392392
</pluginManagement>
393393
</build>
394+
<profiles>
395+
<profile>
396+
<id>integration</id>
397+
<activation>
398+
<activeByDefault>true</activeByDefault>
399+
</activation>
400+
<properties>
401+
<spring.profiles.active>integration</spring.profiles.active>
402+
</properties>
403+
</profile>
404+
</profiles>
394405
</project>

0 commit comments

Comments
 (0)