Skip to content

Commit 3d4157a

Browse files
committed
Correct SCM URLs in published poms
Previously, Maven's default behaviour was relied up which resulted in the artifact ID being appended to each URL as it was inherited. This behaviour can only be disabled in Maven 3.6 and later, a version that we cannot use due to an incompatibility with the Flatten Plugin. This commit works around Maven's default behaviour by defining properties for the SCM URL, connection, and developer connection and then explicitly defining the settings in each pom using these properties. The explicit definition of the properties in each pom prevents them being inherited from the parent, thereby disabling the unwanted appending of the artifact ID to the URL. Fixes gh-18328
1 parent 40acbfc commit 3d4157a

File tree

75 files changed

+376
-3
lines changed

Some content is hidden

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

75 files changed

+376
-3
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
<properties>
1616
<main.basedir>${basedir}/../..</main.basedir>
1717
</properties>
18+
<scm>
19+
<url>${git.url}</url>
20+
<connection>${git.connection}</connection>
21+
<developerConnection>${git.developerConnection}</developerConnection>
22+
</scm>
1823
<dependencies>
1924
<!-- Compile -->
2025
<dependency>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
<properties>
1616
<main.basedir>${basedir}/../..</main.basedir>
1717
</properties>
18+
<scm>
19+
<url>${git.url}</url>
20+
<connection>${git.connection}</connection>
21+
<developerConnection>${git.developerConnection}</developerConnection>
22+
</scm>
1823
<dependencies>
1924
<!-- Compile -->
2025
<dependency>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
<properties>
1616
<main.basedir>${basedir}/../..</main.basedir>
1717
</properties>
18+
<scm>
19+
<url>${git.url}</url>
20+
<connection>${git.connection}</connection>
21+
<developerConnection>${git.developerConnection}</developerConnection>
22+
</scm>
1823
<dependencies>
1924
<!-- Compile -->
2025
<dependency>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@
1818
<spring.profiles.active>default</spring.profiles.active>
1919
<generated.pom.dir>${project.build.directory}/generated-resources/org/springframework/boot/cli/compiler/dependencies</generated.pom.dir>
2020
</properties>
21+
<scm>
22+
<url>${git.url}</url>
23+
<connection>${git.connection}</connection>
24+
<developerConnection>${git.developerConnection}</developerConnection>
25+
</scm>
2126
<dependencies>
2227
<!-- Compile -->
2328
<dependency>

spring-boot-project/spring-boot-devtools/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
<properties>
1414
<main.basedir>${basedir}/../..</main.basedir>
1515
</properties>
16+
<scm>
17+
<url>${git.url}</url>
18+
<connection>${git.connection}</connection>
19+
<developerConnection>${git.developerConnection}</developerConnection>
20+
</scm>
1621
<dependencies>
1722
<!-- Compile -->
1823
<dependency>

spring-boot-project/spring-boot-docs/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
<properties>
1515
<main.basedir>${basedir}/../..</main.basedir>
1616
</properties>
17+
<scm>
18+
<url>${git.url}</url>
19+
<connection>${git.connection}</connection>
20+
<developerConnection>${git.developerConnection}</developerConnection>
21+
</scm>
1722
<dependencies>
1823
<dependency>
1924
<groupId>org.springframework.boot</groupId>

spring-boot-project/spring-boot-parent/pom.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
<properties>
2121
<main.basedir>${basedir}/../..</main.basedir>
2222
<disable.checks>false</disable.checks>
23+
<git.url>https://github.com/spring-projects/spring-boot</git.url>
24+
<git.connection>scm:git:git://github.com/spring-projects/spring-boot.git</git.connection>
25+
<git.developerConnection>scm:git:ssh://[email protected]/spring-projects/spring-boot.git</git.developerConnection>
2326
<java.version>1.8</java.version>
2427
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2528
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -29,9 +32,9 @@
2932
<testcontainers.version>1.10.6</testcontainers.version>
3033
</properties>
3134
<scm>
32-
<url>https://github.com/spring-projects/spring-boot</url>
33-
<connection>scm:git:git://github.com/spring-projects/spring-boot.git</connection>
34-
<developerConnection>scm:git:ssh://[email protected]/spring-projects/spring-boot.git</developerConnection>
35+
<url>${git.url}</url>
36+
<connection>${git.connection}</connection>
37+
<developerConnection>${git.developerConnection}</developerConnection>
3538
</scm>
3639
<issueManagement>
3740
<system>Github</system>

spring-boot-project/spring-boot-properties-migrator/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
<properties>
1515
<main.basedir>${basedir}/../..</main.basedir>
1616
</properties>
17+
<scm>
18+
<url>${git.url}</url>
19+
<connection>${git.connection}</connection>
20+
<developerConnection>${git.developerConnection}</developerConnection>
21+
</scm>
1722
<dependencies>
1823
<!-- Compile -->
1924
<dependency>

spring-boot-project/spring-boot-starters/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616
<properties>
1717
<main.basedir>${basedir}/../..</main.basedir>
1818
</properties>
19+
<scm>
20+
<url>${git.url}</url>
21+
<connection>${git.connection}</connection>
22+
<developerConnection>${git.developerConnection}</developerConnection>
23+
</scm>
1924
<modules>
2025
<module>spring-boot-starter</module>
2126
<module>spring-boot-starter-activemq</module>

spring-boot-project/spring-boot-starters/spring-boot-starter-activemq/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
<properties>
1414
<main.basedir>${basedir}/../../..</main.basedir>
1515
</properties>
16+
<scm>
17+
<url>${git.url}</url>
18+
<connection>${git.connection}</connection>
19+
<developerConnection>${git.developerConnection}</developerConnection>
20+
</scm>
1621
<dependencies>
1722
<dependency>
1823
<groupId>org.springframework.boot</groupId>

0 commit comments

Comments
 (0)