Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.3.x' into 3.4.x

Browse Source 
Closes gh-44055
This commit is contained in:
Phillip Webb
2025-02-03 19:44:33 -08:00
parent 00f350611c 80e8ab8779
commit 0ec15c8f9b
5 changed files with 53 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-tools/spring-boot-antlib/src/it/sample/ivysettings.xml
View File

@@ -11,5 +11,6 @@
<!-- {spring.mavenRepositories} -->
</chain>
</resolvers>
<credentials host="${env.COMMERCIAL_RELEASE_REPO_URL}" username="${env.COMMERCIAL_REPO_USERNAME}" passwd="${env.COMMERCIAL_REPO_PASSWORD}"/>
<credentials host="${env.COMMERCIAL_SNAPSHOT_REPO_URL}" username="${env.COMMERCIAL_REPO_USERNAME}" passwd="${env.COMMERCIAL_REPO_PASSWORD}"/>
</ivysettings>

12
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/settings.xml
View File

@@ -1,6 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings>
<localRepository>@localRepositoryPath@</localRepository>
<servers>
<server>
<id>spring-commercial-release</id>
<username>${env.COMMERCIAL_REPO_USERNAME}</username>
<password>${env.COMMERCIAL_REPO_PASSWORD}</password>
</server>
<server>
<id>spring-commercial-snapshot</id>
<username>${env.COMMERCIAL_REPO_USERNAME}</username>
<password>${env.COMMERCIAL_REPO_PASSWORD}</password>
</server>
</servers>
<profiles>
<profile>
<id>it-repo</id>