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

Merge branch '3.3.x' 

Closes gh-42627
This commit is contained in:
Moritz Halbritter 2024-10-14 11:05:58 +02:00
parent 384a623363 a658c6b70f
commit 2c929db53d
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,6 +136,7 @@ public class AntoraAsciidocAttributes {
addSpringDataDependencyVersion(attributes, "spring-data-neo4j");
addSpringDataDependencyVersion(attributes, "spring-data-r2dbc");
addSpringDataDependencyVersion(attributes, "spring-data-rest", "spring-data-rest-core");
addSpringDataDependencyVersion(attributes, "spring-data-ldap");
}
private void addSpringDataDependencyVersion(Map<String, String> attributes, String artifactId) {

2
buildSrc/src/main/resources/org/springframework/boot/build/antora/antora-asciidoc-attributes.properties
View File

@ -35,6 +35,7 @@ url-spring-boot-for-apache-geode-docs=https://docs.spring.io/spring-boot-data-ge
url-spring-boot-for-apache-geode-site=https://github.com/spring-projects/spring-boot-data-geode
url-spring-data-cassandra-javadoc=https://docs.spring.io/spring-data/cassandra/docs/{version-spring-data-cassandra-javadoc}/api
url-spring-data-cassandra-site=https://spring.io/projects/spring-data-cassandra
url-spring-data-cassandra-docs=https://docs.spring.io/spring-data/cassandra/reference/{version-spring-data-cassandra-docs}
url-spring-data-commons-javadoc=https://docs.spring.io/spring-data/commons/docs/{version-spring-data-commons-javadoc}/api
url-spring-data-couchbase-docs=https://docs.spring.io/spring-data/couchbase/reference/{version-spring-data-couchbase-docs}
url-spring-data-couchbase-site=https://spring.io/projects/spring-data-couchbase
@ -49,6 +50,7 @@ url-spring-data-jpa-javadoc=https://docs.spring.io/spring-data/jpa/docs/{version
url-spring-data-jpa-site=https://spring.io/projects/spring-data-jpa
url-spring-data-jpa-docs=https://docs.spring.io/spring-data/jpa/reference/{version-spring-data-jpa-docs}
url-spring-data-ldap-site=https://spring.io/projects/spring-data-ldap
url-spring-data-ldap-docs=https://docs.spring.io/spring-data/ldap/reference/{version-spring-data-ldap-docs}
url-spring-data-mongodb-javadoc=https://docs.spring.io/spring-data/mongodb/docs/{version-spring-data-mongodb-javadoc}/api
url-spring-data-mongodb-site=https://spring.io/projects/spring-data-mongodb
url-spring-data-mongodb-docs=https://docs.spring.io/spring-data/mongodb/reference/{version-spring-data-mongodb-docs}

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

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

4
spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/data/nosql.adoc
View File

@ -525,7 +525,7 @@ Repositories and entities are found through scanning.
By default, the xref:using/auto-configuration.adoc#using.auto-configuration.packages[auto-configuration packages] are scanned.
You can customize the locations to look for repositories and entities by using `@EnableCassandraRepositories` and `@EntityScan` respectively.
TIP: For complete details of Spring Data Cassandra, see the https://docs.spring.io/spring-data/cassandra/docs/[reference documentation].
TIP: For complete details of Spring Data Cassandra, see the {url-spring-data-cassandra-docs}[reference documentation].
@ -688,7 +688,7 @@ Repositories and documents are found through scanning.
By default, the xref:using/auto-configuration.adoc#using.auto-configuration.packages[auto-configuration packages] are scanned.
You can customize the locations to look for repositories and documents by using `@EnableLdapRepositories` and `@EntityScan` respectively.
For complete details of Spring Data LDAP, see the https://docs.spring.io/spring-data/ldap/docs/1.0.x/reference/html/[reference documentation].
TIP: For complete details of Spring Data LDAP, see the {url-spring-data-ldap-docs}[reference documentation].
You can also inject an auto-configured `LdapTemplate` instance as you would with any other Spring Bean, as shown in the following example: