spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.1.x'

Browse Source
This commit is contained in:
Phillip Webb
2026-09-04 13:50:52 -07:00
parent 96d2a52885 c8a9ade251
commit 93b23c40c2
3 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/java/org/springframework/boot/build/antora/AntoraAsciidocAttributes.java
-15
View File
@@ -37,7 +37,6 @@ import org.springframework.boot.build.bom.ResolvedBom;
import org.springframework.boot.build.bom.ResolvedBom.ResolvedLibrary;
import org.springframework.boot.build.properties.BuildProperties;
import org.springframework.boot.build.properties.BuildType;
import org.springframework.util.Assert;
/**
* Generates Asciidoctor attributes for use with Antora.
@@ -60,8 +59,6 @@ public class AntoraAsciidocAttributes {
private final ResolvedBom resolvedBom;
private final Map<String, String> dependencyVersions;
private final Map<String, ?> projectProperties;
public AntoraAsciidocAttributes(Project project, BomExtension dependencyBom, ResolvedBom resolvedBom) {
@@ -71,7 +68,6 @@ public class AntoraAsciidocAttributes {
this.artifactRelease = ArtifactRelease.forProject(project);
this.libraries = dependencyBom.getLibraries();
this.resolvedBom = resolvedBom;
this.dependencyVersions = resolvedBom.dependencyVersions();
this.projectProperties = project.getProperties();
}
@@ -116,7 +112,6 @@ public class AntoraAsciidocAttributes {
attributes.put("version-graal", (String) this.projectProperties.get("graalVersion"));
attributes.put("version-protobuf-gradle-plugin",
(String) this.projectProperties.get("protobufGradlePluginVersion"));
addDependencyVersion(attributes, "grpc-api", "io.grpc:grpc-api");
}
private void addVersionAttributes(Map<String, String> attributes, Library library) {
@@ -128,16 +123,6 @@ public class AntoraAsciidocAttributes {
});
}
private void addDependencyVersion(Map<String, String> attributes, String name, String groupAndArtifactId) {
attributes.put("version-" + name, getVersion(groupAndArtifactId));
}
private String getVersion(String groupAndArtifactId) {
String version = this.dependencyVersions.get(groupAndArtifactId);
Assert.notNull(version, () -> "No version found for " + groupAndArtifactId);
return version;
}
private void addArtifactAttributes(Map<String, String> attributes) {
attributes.put("url-artifact-repository", this.artifactRelease.getDownloadRepo());
attributes.put("artifact-release-type", this.artifactRelease.getType());
buildSrc/src/main/resources/org/springframework/boot/build/antora/antora-asciidoc-attributes.properties
-5
View File
@@ -37,11 +37,6 @@ url-native-build-tools-docs-maven-plugin={url-native-build-tools-docs}/maven-plu
url-paketo-docs=https://paketo.io/docs
url-paketo-docs-java-buildpack={url-paketo-docs}/buildpacks/language-family-buildpacks/java
url-protobuf-docs-gradle-plugin=https://github.com/google/protobuf-gradle-plugin
https://javadoc.io/doc/io.grpc/grpc-api/latest/io/grpc/package-summary.html
# === Javadoc Locations ===
javadoc-location-io-grpc={url-grpc-api-javadoc}
# === API References ===
platform/spring-boot-dependencies/build.gradle
+3
View File
@@ -574,6 +574,9 @@ bom {
github("https://github.com/grpc/grpc-java")
docs("https://grpc.io/docs/languages/java/")
releaseNotes("https://github.com/grpc/grpc-java/releases/tag/v{version}")
module("grpc-api") {
javadoc("https://javadoc.io/doc/io.grpc/grpc-api/{version}", "io.grpc")
}
}
}
library("Grpc Kotlin", "1.5.0") {