diff --git a/build.gradle b/build.gradle
index 0bf7cc52..c21741d1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,7 +51,10 @@ antora {
tasks.named("generateAntoraYml") {
asciidocAttributes = project.provider( {
- return ['project-version': project.version]
+ return [
+ 'project-version': project.version,
+ 'spring-core-version': '6.1.6'
+ ]
} )
}
diff --git a/modules/ROOT/pages/community.adoc b/modules/ROOT/pages/community.adoc
new file mode 100644
index 00000000..dae17dd4
--- /dev/null
+++ b/modules/ROOT/pages/community.adoc
@@ -0,0 +1,37 @@
+[[community]]
+= Spring Security Community
+
+Welcome to the Spring Security Community!
+This section discusses how you can make the most of our vast community.
+
+
+[[community-help]]
+== Getting Help
+If you need help with Spring Security, we are here to help.
+The following are some of the best ways to get help:
+
+* Read through this documentation.
+* Try one of our many https://github.com/spring-projects/spring-ldap-samples[sample applications].
+* Ask a question on https://stackoverflow.com/questions/tagged/spring-security[https://stackoverflow.com] with the `spring-security` tag.
+* Report bugs and enhancement requests at https://github.com/spring-projects/spring-security/issues
+
+[[community-becoming-involved]]
+== Becoming Involved
+We welcome your involvement in the Spring Security project.
+There are many ways to contribute, including answering questions on Stack Overflow, writing new code, improving existing code, assisting with documentation, developing samples or tutorials, reporting bugs, or simply making suggestions.
+For more information, see our https://github.com/spring-projects/spring-security/blob/main/CONTRIBUTING.adoc[Contributing] documentation.
+
+[[community-source]]
+== Source Code
+
+You can find Spring Security's source code on GitHub at https://github.com/spring-projects/spring-security/
+
+[[community-license]]
+== Apache 2 License
+
+Spring Security is Open Source software released under the https://www.apache.org/licenses/LICENSE-2.0.html[Apache 2.0 license].
+
+== Social Media
+
+You can follow https://twitter.com/SpringSecurity[@SpringSecurity] and the https://twitter.com/SpringSecurity/lists/team[Spring Security team] on Twitter to stay up to date with the latest news.
+You can also follow https://twitter.com/SpringCentral[@SpringCentral] to keep up to date with the entire Spring portfolio.
diff --git a/modules/ROOT/pages/getting-spring-ldap.adoc b/modules/ROOT/pages/getting-spring-ldap.adoc
new file mode 100644
index 00000000..78e8c1c2
--- /dev/null
+++ b/modules/ROOT/pages/getting-spring-ldap.adoc
@@ -0,0 +1,289 @@
+[[getting]]
+= Getting Spring LDAP
+
+This section describes how to get the Spring LDAP binaries.
+See xref:community.adoc#community-source[Source Code] for how to obtain the source code.
+
+== Release Numbering
+
+Spring LDAP versions are formatted as MAJOR.MINOR.PATCH such that:
+
+* MAJOR versions may contain breaking changes.
+Typically, these are done to provide improved security to match modern security practices.
+* MINOR versions contain enhancements but are considered passive updates.
+* PATCH level should be perfectly compatible, forwards and backwards, with the possible exception of changes that fix bugs.
+
+
+[[maven]]
+== Usage
+
+As most open source projects, Spring LDAP deploys its dependencies as Maven artifacts, which makes them compatible with both Maven and Gradle. The following sections demonstrate how to integrate Spring LDAP with these build tools, with examples for Spring Boot and standalone usage.
+
+[[getting-maven-boot]]
+[[getting-gradle-boot]]
+=== Spring Boot
+
+Spring Boot provides a `spring-boot-starter-ldap` starter that aggregates Spring LDAP-related dependencies.
+The simplest and preferred way to use the starter is to use https://docs.spring.io/initializr/docs/current/reference/html/[Spring Initializr] by using an IDE integration in (https://joshlong.com/jl/blogPost/tech_tip_geting_started_with_spring_boot.html[Eclipse] or https://www.jetbrains.com/help/idea/spring-boot.html#d1489567e2[IntelliJ], https://github.com/AlexFalappa/nb-springboot/wiki/Quick-Tour[NetBeans]) or through https://start.spring.io.
+Alternatively, you can manually add the starter, as the following example shows:
+
+[tabs]
+======
+Maven::
++
+.pom.xml
+[source,xml,subs="verbatim,attributes"]
+----
+
+
+
+ org.springframework.boot
+ spring-boot-starter-ldap
+
+
+----
+
+Gradle::
++
+.build.gradle
+[source,groovy]
+[subs="verbatim,attributes"]
+----
+dependencies {
+ implementation "org.springframework.boot:spring-boot-starter-ldap"
+}
+----
+======
+
+Since Spring Boot provides a Maven BOM to manage dependency versions, you do not need to specify a version.
+If you wish to override the Spring LDAP version, you can do so with a build property as shown below:
+
+[tabs]
+======
+Maven::
++
+.pom.xml
+[source,xml,subs="verbatim,attributes"]
+----
+
+
+ {project-version}
+
+----
+
+Gradle::
++
+.build.gradle
+[source,groovy]
+[subs="verbatim,attributes"]
+----
+ext['spring-ldap.version']='{project-version}'
+----
+======
+
+Since Spring LDAP makes breaking changes only in major releases, you can safely use a newer version of Spring LDAP with Spring Boot.
+However, at times, you may need to update the version of Spring Framework as well.
+You can do so by adding a build property like so:
+
+[tabs]
+======
+Maven::
++
+.pom.xml
+[source,xml,subs="verbatim,attributes"]
+----
+
+
+ {spring-core-version}
+
+----
+
+Gradle::
++
+.build.gradle
+[source,groovy]
+[subs="verbatim,attributes"]
+----
+ext['spring.version']='{spring-core-version}'
+----
+======
+
+If you use additional features (such as LDIF), you need to also include the appropriate xref:modules.adoc#modules[modules].
+
+[[getting-maven-no-boot]]
+=== Standalone Usage (Without Spring Boot)
+
+When you use Spring LDAP without Spring Boot, you must specify the version you intend to use:.
+
+[tabs]
+======
+Maven::
++
+.pom.xml
+[source,xml,ubs="verbatim,attributes"]
+----
+
+
+
+
+ org.springframework.ldap
+ spring-ldap-core
+ {project-version}
+
+
+
+----
+
+Gradle::
++
+.build.gradle
+[source,groovy]
+[subs="verbatim,attributes"]
+----
+plugins {
+ id "io.spring.dependency-management" version "1.0.6.RELEASE"
+}
+
+dependencyManagement {
+ imports {
+ mavenBom 'org.springframework.ldap:spring-ldap-core:{project-version}'
+ }
+}
+----
+======
+
+[TIP]
+Spring provides a https://github.com/spring-gradle-plugins/dependency-management-plugin[`Dependency Management Plugin`] for Gradle
+
+For most projects, including `spring-ldap-core` is sufficient.
+
+If you use additional features (such as LDIF), you need to also include the appropriate xref:modules.adoc#modules[modules].
+
+Spring LDAP builds against Spring Framework 6 but should generally work with any newer version of Spring Framework 5.x.
+Many users are likely to run afoul of the fact that Spring LDAP's transitive dependencies resolve Spring Framework 6, which can cause strange classpath problems.
+The easiest way to resolve this is to use the `spring-framework-bom` within the `` section of your `pom.xml` or your `dependencyManagement` section of your `build.gradle`.
+
+[tabs]
+======
+Maven::
++
+.pom.xml
+[source,xml,subs="verbatim,attributes"]
+----
+
+
+
+
+ org.springframework
+ spring-framework-bom
+ {spring-core-version}
+ pom
+ import
+
+
+
+----
+
+Gradle::
++
+.build.gradle
+[source,groovy]
+[subs="verbatim,attributes"]
+----
+plugins {
+ id "io.spring.dependency-management" version "1.0.6.RELEASE"
+}
+
+dependencyManagement {
+ imports {
+ mavenBom 'org.springframework:spring-framework-bom:{spring-core-version}'
+ }
+}
+----
+======
+
+[TIP]
+Spring provides a https://github.com/spring-gradle-plugins/dependency-management-plugin[`Dependency Management Plugin`] for Gradle
+
+The preceding example ensures that all the transitive dependencies of Spring LDAP use the Spring 6 modules.
+
+[NOTE]
+====
+This approach uses Maven's "`bill of materials`" (BOM) concept and is only available in Maven 2.0.9+.
+For additional details about how dependencies are resolved, see https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html[Maven's Introduction to the Dependency Mechanism documentation].
+====
+
+[[maven-repositories]]
+=== Maven Repositories
+All https://github.com/spring-projects/spring-security/wiki/Release-Schedule-Guidelines[GA releases] are deployed to Maven Central, so you need not declare additional Maven repositories in your build configuration.
+
+For Gradle using the `mavenCentral()` repository is sufficient for GA releases.
+
+.build.gradle
+[source,groovy]
+----
+repositories {
+ mavenCentral()
+}
+----
+
+If you use a SNAPSHOT version, you need to ensure that you have the Spring Snapshot repository defined:
+
+[tabs]
+======
+Maven::
++
+.pom.xml
+[source,xml]
+----
+
+
+
+ spring-snapshot
+ Spring Snapshot Repository
+ https://repo.spring.io/snapshot
+
+
+----
+
+Gradle::
++
+.build.gradle
+[source,groovy]
+----
+repositories {
+ maven { url 'https://repo.spring.io/snapshot' }
+}
+----
+======
+
+If you use a milestone or release candidate version, you need to ensure that you have the Spring Milestone repository defined, as the following example shows:
+
+[tabs]
+======
+Maven::
++
+.pom.xml
+[source,xml]
+----
+
+
+
+ spring-milestone
+ Spring Milestone Repository
+ https://repo.spring.io/milestone
+
+
+----
+
+Gradle::
++
+.build.gradle
+[source,groovy]
+----
+repositories {
+ maven { url 'https://repo.spring.io/milestone' }
+}
+----
+======
+
diff --git a/modules/ROOT/pages/modules.adoc b/modules/ROOT/pages/modules.adoc
new file mode 100644
index 00000000..35f43a54
--- /dev/null
+++ b/modules/ROOT/pages/modules.adoc
@@ -0,0 +1,12 @@
+// FIXME: This might make sense in Getting Spring Security along with the artifact information
+
+[[modules]]
+= Project Modules
+Spring LDAP is broken up into the following separate modules:
+
+* spring-ldap-core - the xref:spring-ldap-basic-usage.adoc[core] Spring LDAP library, including xref:odm.adoc[the ODM framework]
+* spring-ldap-test - support classes that help LDAP with xref:testing.adoc[integration testing]
+* spring-ldap-ldif-core - the Spring LDAP xref:ldif-parsing.adoc[LDIF parsing library]
+* spring-ldap-ldif-batch - the Spring Batch integration layer for the LDIF parsing library
+
+Also of interest is https://docs.spring.io/spring-data/ldap/reference[spring-data-ldap], Spring Data's integration with Spring LDAP.
\ No newline at end of file