Merge branch '4.3.x'

This commit is contained in:
Ryan Baxter
2025-06-20 20:16:58 -04:00
3 changed files with 28 additions and 18 deletions
+14 -6
View File
@@ -143,6 +143,7 @@
<antora-maven-plugin.phase>prepare-package</antora-maven-plugin.phase>
<generate-readme.phase>prepare-package</generate-readme.phase>
<generate-cloud-resources.phase>generate-resources</generate-cloud-resources.phase>
<central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -699,7 +700,12 @@
<includePomProjects>${duplicate-finder-maven-plugin.includePomProjects}</includePomProjects>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>${central-publishing-maven-plugin.version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
</pluginManagement>
</build>
@@ -748,11 +754,6 @@
scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version}
</url>
</site>
<repository>
<id>sonatype-nexus-staging</id>
<name>Nexus Release Repository</name>
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
<snapshotRepository>
<id>repo.spring.io</id>
<name>Spring Snapshot Repository</name>
@@ -855,6 +856,13 @@
</gpgArguments>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<configuration>
<publishingServerId>central</publishingServerId>
</configuration>
</plugin>
</plugins>
</build>
</profile>
+7 -6
View File
@@ -22,6 +22,7 @@
<spring-boot.version>4.0.0-SNAPSHOT</spring-boot.version>
<okhttp.version>4.12.0</okhttp.version>
<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
<central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -109,12 +110,6 @@
<name>Sonatype Nexus Snapshots</name>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>sonatype-nexus-staging</id>
<name>Nexus Release Repository</name>
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
</url>
</repository>
</distributionManagement>
<build>
<plugins>
@@ -138,6 +133,12 @@
</gpgArguments>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>${central-publishing-maven-plugin.version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
</build>
</profile>
+7 -6
View File
@@ -70,6 +70,7 @@
</developers>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
</properties>
<distributionManagement>
<downloadUrl>https://github.com/spring-cloud</downloadUrl>
@@ -109,12 +110,6 @@
<name>Sonatype Nexus Snapshots</name>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>sonatype-nexus-staging</id>
<name>Nexus Release Repository</name>
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
</url>
</repository>
</distributionManagement>
<build>
<plugins>
@@ -171,6 +166,12 @@
</gpgArguments>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>${central-publishing-maven-plugin.version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
</build>
</profile>