root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch '3.3.x' 

Closes gh-41994
This commit is contained in:
Scott Frederick 2024-08-21 18:04:28 -05:00
parent 8418b18907 459d899ed9
commit ba87aca05e
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
buildSrc/src/main/java/org/springframework/boot/build/antora/AntoraAsciidocAttributes.java
View File

@ -77,7 +77,7 @@ public class AntoraAsciidocAttributes {
Map<String, String> attributes = new LinkedHashMap<>(); Map<String, String> attributes = new LinkedHashMap<>();
addGitHubAttributes(attributes); addGitHubAttributes(attributes);
addVersionAttributes(attributes); addVersionAttributes(attributes);
addUrlArtifactRepository(attributes); addArtifactAttributes(attributes);
addUrlJava(attributes); addUrlJava(attributes);
addUrlLibraryLinkAttributes(attributes); addUrlLibraryLinkAttributes(attributes);
addPropertyAttributes(attributes); addPropertyAttributes(attributes);
@ -139,8 +139,9 @@ public class AntoraAsciidocAttributes {
attributes.put("version-" + name, version); attributes.put("version-" + name, version);
} }
private void addUrlArtifactRepository(Map<String, String> attributes) { private void addArtifactAttributes(Map<String, String> attributes) {
attributes.put("url-artifact-repository", this.artifactRelease.getDownloadRepo()); attributes.put("url-artifact-repository", this.artifactRelease.getDownloadRepo());
attributes.put("artifact-release-type", this.artifactRelease.getType());
} }
private void addUrlJava(Map<String, String> attributes) { private void addUrlJava(Map<String, String> attributes) {

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

@ -112,6 +112,27 @@ class AntoraAsciidocAttributesTests {
assertThat(attributes.get()).containsEntry("url-artifact-repository", "https://repo.spring.io/snapshot"); assertThat(attributes.get()).containsEntry("url-artifact-repository", "https://repo.spring.io/snapshot");
} }
@Test
void artifactReleaseTypeWhenRelease() {
AntoraAsciidocAttributes attributes = new AntoraAsciidocAttributes("1.2.3", true, null,
mockDependencyVersions(), null);
assertThat(attributes.get()).containsEntry("artifact-release-type", "release");
}
@Test
void artifactReleaseTypeWhenMilestone() {
AntoraAsciidocAttributes attributes = new AntoraAsciidocAttributes("1.2.3-M1", true, null,
mockDependencyVersions(), null);
assertThat(attributes.get()).containsEntry("artifact-release-type", "milestone");
}
@Test
void artifactReleaseTypeWhenSnapshot() {
AntoraAsciidocAttributes attributes = new AntoraAsciidocAttributes("1.2.3-SNAPSHOT", true, null,
mockDependencyVersions(), null);
assertThat(attributes.get()).containsEntry("artifact-release-type", "snapshot");
}
@Test @Test
void urlLinksFromLibrary() { void urlLinksFromLibrary() {
Map<String, Function<LibraryVersion, String>> links = new LinkedHashMap<>(); Map<String, Function<LibraryVersion, String>> links = new LinkedHashMap<>();