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:06:26 -07:00
parent 7dcc12ac59 37d4d8625d
commit 908669c785
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/java/org/springframework/boot/build/antora/AntoraAsciidocAttributes.java
-5
View File
@@ -117,11 +117,6 @@ public class AntoraAsciidocAttributes {
attributes.put("version-protobuf-gradle-plugin",
(String) this.projectProperties.get("protobufGradlePluginVersion"));
addDependencyVersion(attributes, "grpc-api", "io.grpc:grpc-api");
addDependencyVersion(attributes, "jackson-annotations", "com.fasterxml.jackson.core:jackson-annotations");
addDependencyVersion(attributes, "jackson-core", "tools.jackson.core:jackson-core");
addDependencyVersion(attributes, "jackson-databind", "tools.jackson.core:jackson-databind");
addDependencyVersion(attributes, "jackson-dataformat-xml", "tools.jackson.dataformat:jackson-dataformat-xml");
addDependencyVersion(attributes, "jackson2-databind", "com.fasterxml.jackson.core:jackson-databind");
addDependencyVersion(attributes, "pulsar-client-api", "org.apache.pulsar:pulsar-client-api");
}
buildSrc/src/main/resources/org/springframework/boot/build/antora/antora-asciidoc-attributes.properties
-10
View File
@@ -38,22 +38,12 @@ 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
url-pulsar-client-api-javadoc=https://javadoc.io/doc/org.apache.pulsar/pulsar-client-api/{version-pulsar-client-api}
url-jackson-annotations-javadoc=https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-annotations/{version-jackson-annotations}
url-jackson-core-javadoc=https://javadoc.io/doc/tools.jackson.core/jackson-core/{version-jackson-core}
url-jackson-databind-javadoc=https://javadoc.io/doc/tools.jackson.core/jackson-databind/{version-jackson-databind}
url-jackson-dataformat-xml-javadoc=https://javadoc.io/doc/tools.jackson.dataformat/jackson-dataformat-xml/{version-jackson-dataformat-xml}
url-jackson2-databind-javadoc=https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-databind/{version-jackson2-databind}
https://javadoc.io/doc/io.grpc/grpc-api/latest/io/grpc/package-summary.html
# === Javadoc Locations ===
javadoc-location-com-fasterxml-jackson-annotation={url-jackson-annotations-javadoc}
javadoc-location-com-fasterxml-jackson-databind={url-jackson2-databind-javadoc}
javadoc-location-org-apache-pulsar-client-api={url-pulsar-client-api-javadoc}
javadoc-location-tools-jackson-core={url-jackson-core-javadoc}
javadoc-location-tools-jackson-databind={url-jackson-databind-javadoc}
javadoc-location-tools-jackson-dataformat-xml={url-jackson-dataformat-xml-javadoc}
javadoc-location-io-grpc={url-grpc-api-javadoc}
# === API References ===
platform/spring-boot-dependencies/build.gradle
+15
View File
@@ -791,6 +791,9 @@ bom {
}
links {
releaseNotes("https://github.com/FasterXML/jackson/wiki/Jackson-Release-{version}")
module("jackson2-databind", ["jackson-databind"]) {
javadoc("https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-databind/{version}", "com.fasterxml.jackson.databind")
}
}
}
library("Jackson Bom", "${jacksonVersion}") {
@@ -805,6 +808,18 @@ bom {
}
links {
releaseNotes("https://github.com/FasterXML/jackson/wiki/Jackson-Release-{version}")
module("jackson-annotations") {
javadoc("https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-annotations/{version}", "com.fasterxml.jackson.annotation")
}
module("jackson-core") {
javadoc("https://javadoc.io/doc/tools.jackson.core/jackson-core//{version}", "tools.jackson.core")
}
module("jackson-databind") {
javadoc("https://javadoc.io/doc/tools.jackson.core/jackson-databind/{version}", "tools.jackson.databind")
}
module("jackson-dataformat-xml") {
javadoc("https://javadoc.io/doc/tools.jackson.dataformat/jackson-dataformat-xml//{version}", "tools.jackson.dataformat.xml")
}
}
}
library("Jakarta Activation", "2.1.4") {