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

Merge branch '3.3.x'

Browse Source 
Closes gh-43096
This commit is contained in:
Stéphane Nicoll
2024-11-11 08:05:32 +09:00
parent 76aa77c20b cf158d5299
commit 92f3da4951
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/java/org/springframework/boot/build/bom/Library.java
View File

@@ -524,7 +524,7 @@ public class Library {
}
public static record Link(Function<LibraryVersion, String> factory, List<String> packages) {
public record Link(Function<LibraryVersion, String> factory, List<String> packages) {
private static final Pattern PACKAGE_EXPAND = Pattern.compile("^(.*)\\[(.*)\\]$");

2
buildSrc/src/main/java/org/springframework/boot/build/bom/bomr/UpgradeBom.java
View File

@@ -94,7 +94,7 @@ public abstract class UpgradeBom extends UpgradeDependencies {
private String getReleaseNotesLink(Upgrade upgrade, LibraryVersion upgradeVersion) {
Link releaseNotesLink = upgrade.getLibrary().getLink("releaseNotes");
return releaseNotesLink.url(upgradeVersion);
return (releaseNotesLink != null) ? releaseNotesLink.url(upgradeVersion) : null;
}
}

1
buildSrc/src/test/java/org/springframework/boot/build/antora/AntoraAsciidocAttributesTests.java
View File

@@ -251,6 +251,7 @@ class AntoraAsciidocAttributesTests {
addMockSpringDataVersion(versions, "spring-data-mongodb", version);
addMockSpringDataVersion(versions, "spring-data-neo4j", version);
addMockSpringDataVersion(versions, "spring-data-r2dbc", version);
addMockSpringDataVersion(versions, "spring-data-redis", version);
addMockSpringDataVersion(versions, "spring-data-rest-core", version);
addMockSpringDataVersion(versions, "spring-data-ldap", version);
addMockJacksonVersion(versions, "jackson-annotations", version);