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

Merge branch '3.2.x' into 3.3.x

Browse Source 
Closes gh-42269
This commit is contained in:
Stéphane Nicoll
2024-09-11 18:56:35 +02:00
parent 3649852f49 5bddca850a
commit 726ee27cce
7 changed files with 133 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* Tests for {@link AntoraAsciidocAttributes}.
*
* @author Phillip Webb
* @author Stephane Nicoll
*/
class AntoraAsciidocAttributesTests {
@@ -78,10 +79,19 @@ class AntoraAsciidocAttributesTests {
}
@Test
void versionReferenceFromSpringDataDependencyVersion() {
void versionReferenceFromSpringDataDependencyReleaseVersion() {
AntoraAsciidocAttributes attributes = new AntoraAsciidocAttributes("1.2.3", true, null,
mockDependencyVersions(), null);
assertThat(attributes.get()).containsEntry("version-spring-data-mongodb", "1.2.3");
mockDependencyVersions("3.2.5"), null);
assertThat(attributes.get()).containsEntry("version-spring-data-mongodb-docs", "3.2");
assertThat(attributes.get()).containsEntry("version-spring-data-mongodb-javadoc", "3.2.x");
}
@Test
void versionReferenceFromSpringDataDependencySnapshotVersion() {
AntoraAsciidocAttributes attributes = new AntoraAsciidocAttributes("1.2.3", true, null,
mockDependencyVersions("3.2.0-SNAPSHOT"), null);
assertThat(attributes.get()).containsEntry("version-spring-data-mongodb-docs", "3.2-SNAPSHOT");
assertThat(attributes.get()).containsEntry("version-spring-data-mongodb-javadoc", "3.2.x");
}
@Test
@@ -173,29 +183,33 @@ class AntoraAsciidocAttributesTests {
}
private Map<String, String> mockDependencyVersions() {
return mockDependencyVersions("1.2.3");
}
private Map<String, String> mockDependencyVersions(String version) {
Map<String, String> versions = new LinkedHashMap<>();
addMockSpringDataVersion(versions, "spring-data-commons");
addMockSpringDataVersion(versions, "spring-data-cassandra");
addMockSpringDataVersion(versions, "spring-data-couchbase");
addMockSpringDataVersion(versions, "spring-data-elasticsearch");
addMockSpringDataVersion(versions, "spring-data-jdbc");
addMockSpringDataVersion(versions, "spring-data-jpa");
addMockSpringDataVersion(versions, "spring-data-mongodb");
addMockSpringDataVersion(versions, "spring-data-neo4j");
addMockSpringDataVersion(versions, "spring-data-r2dbc");
addMockSpringDataVersion(versions, "spring-data-rest-core");
addMockJacksonVersion(versions, "jackson-annotations");
addMockJacksonVersion(versions, "jackson-core");
addMockJacksonVersion(versions, "jackson-databind");
addMockSpringDataVersion(versions, "spring-data-commons", version);
addMockSpringDataVersion(versions, "spring-data-cassandra", version);
addMockSpringDataVersion(versions, "spring-data-couchbase", version);
addMockSpringDataVersion(versions, "spring-data-elasticsearch", version);
addMockSpringDataVersion(versions, "spring-data-jdbc", version);
addMockSpringDataVersion(versions, "spring-data-jpa", version);
addMockSpringDataVersion(versions, "spring-data-mongodb", version);
addMockSpringDataVersion(versions, "spring-data-neo4j", version);
addMockSpringDataVersion(versions, "spring-data-r2dbc", version);
addMockSpringDataVersion(versions, "spring-data-rest-core", version);
addMockJacksonVersion(versions, "jackson-annotations", version);
addMockJacksonVersion(versions, "jackson-core", version);
addMockJacksonVersion(versions, "jackson-databind", version);
return versions;
}
private void addMockSpringDataVersion(Map<String, String> versions, String artifactId) {
versions.put("org.springframework.data:" + artifactId, "1.2.3");
private void addMockSpringDataVersion(Map<String, String> versions, String artifactId, String version) {
versions.put("org.springframework.data:" + artifactId, version);
}
private void addMockJacksonVersion(Map<String, String> versions, String artifactId) {
versions.put("com.fasterxml.jackson.core:" + artifactId, "2.3.4");
private void addMockJacksonVersion(Map<String, String> versions, String artifactId, String version) {
versions.put("com.fasterxml.jackson.core:" + artifactId, version);
}
}

12
buildSrc/src/test/java/org/springframework/boot/build/bom/LibraryTests.java
View File

@@ -72,4 +72,16 @@ class LibraryTests {
assertThat(library.getLinkRootName()).isEqualTo("spring-data");
}
@Test
void toMajorMinorGenerationWithRelease() {
LibraryVersion version = new LibraryVersion(DependencyVersion.parse("1.2.3"));
assertThat(version.forMajorMinorGeneration()).isEqualTo("1.2.x");
}
@Test
void toMajorMinorGenerationWithSnapshot() {
LibraryVersion version = new LibraryVersion(DependencyVersion.parse("2.0.0-SNAPSHOT"));
assertThat(version.forMajorMinorGeneration()).isEqualTo("2.0.x-SNAPSHOT");
}
}