diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index edf976fff7..d705455596 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -66,7 +66,7 @@ follow-up reports will need to be created as new issues with a fresh description
#### Submit a Pull Request
1. If you have not previously done so, please sign the
-[Contributor License Agreement](https://cla.pivotal.io/sign/spring). You will be reminded
+[Contributor License Agreement](https://cla.spring.io/sign/spring). You will be reminded
automatically when you submit the PR.
1. Should you create an issue first? No, just create the pull request and use the
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index 3be6b68af6..7109e4427a 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -68,22 +68,16 @@ pluginManager.withPlugin("kotlin") {
asciidoctorj {
def docRoot = 'https://docs.spring.io'
def docsSpringFramework = "${docRoot}/spring-framework/docs/${project.version}"
- version = '2.4.1'
+ version = '2.4.3'
fatalWarnings ".*"
options doctype: 'book', eruby: 'erubis'
attributes([
icons: 'font',
idprefix: '',
idseparator: '-',
- docinfo: 'shared,private-header', // https://docs.asciidoctor.org/asciidoctor/latest/docinfo/
revnumber: project.version,
sectanchors: '',
sectnums: '',
- 'source-highlighter': 'highlight.js',
- highlightjsdir: 'js/highlight',
- 'highlightjs-theme': 'googlecode',
- stylesdir: 'css/',
- stylesheet: 'stylesheet.css',
'spring-version': project.version,
'spring-framework-main-code': 'https://github.com/spring-projects/spring-framework/tree/main',
'doc-root': docRoot,
@@ -109,7 +103,7 @@ asciidoctor {
logDocuments = true
resources {
from(sourceDir) {
- include 'images/*.png', 'css/**', 'js/**'
+ include 'images/*.png'
}
}
}
@@ -125,6 +119,9 @@ asciidoctorPdf {
include '*.adoc'
}
outputDir "$buildDir/docs/ref-docs/pdf"
+ forkOptions {
+ jvmArgs += ["--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED", "--add-opens", "java.base/java.io=ALL-UNNAMED"]
+ }
logDocuments = true
}
diff --git a/src/docs/asciidoc/css/stylesheet.css b/src/docs/asciidoc/css/stylesheet.css
deleted file mode 100644
index ad1f1bd0c8..0000000000
--- a/src/docs/asciidoc/css/stylesheet.css
+++ /dev/null
@@ -1,31 +0,0 @@
-@import 'css/spring.css';
-
-.listingblock .switch {
- border-style: none;
- display: inline-block;
- position: relative;
- bottom: -3px;
-}
-
-.listingblock .switch--item {
- padding: 10px;
- background-color: #e6e1dc;
- color: #282c34;
- display: inline-block;
- cursor: pointer;
- border-top-left-radius: 4px;
- border-top-right-radius: 4px;
-}
-
-.listingblock .switch--item:not(:first-child) {
- border-style: none;
-}
-
-.listingblock .switch--item.selected {
- background-color: #282c34;
- color: #e6e1dc;
-}
-
-.listingblock pre.highlightjs {
- padding: 0;
-}
diff --git a/src/docs/asciidoc/docinfo-footer.html b/src/docs/asciidoc/docinfo-footer.html
deleted file mode 100644
index a7a58d584a..0000000000
--- a/src/docs/asciidoc/docinfo-footer.html
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/src/docs/asciidoc/index.adoc b/src/docs/asciidoc/index.adoc
index afae295261..4450487261 100644
--- a/src/docs/asciidoc/index.adoc
+++ b/src/docs/asciidoc/index.adoc
@@ -21,13 +21,7 @@ Email, Tasks, Scheduling, Caching.
https://github.com/spring-projects/spring-framework/wiki[*Wiki*] :: What's New,
Upgrade Notes, Supported Versions, and other cross-version information.
-ifdef::backend-html5[]
-NOTE: This documentation is also available as {docs-spring-framework}/reference/pdf/index.pdf[PDF].
-endif::[]
-
-ifdef::backend-pdf[]
-NOTE: This documentation is also available as {docs-spring-framework}/reference/html/index.html[HTML].
-endif::[]
+NOTE: This documentation is available in {docs-spring-framework}/reference/html/index.html[HTML] and {docs-spring-framework}/reference/pdf/index.pdf[PDF] formats.
Rod Johnson, Juergen Hoeller, Keith Donald, Colin Sampaleanu, Rob Harrop, Thomas Risberg,
Alef Arendsen, Darren Davison, Dmitriy Kopylenko, Mark Pollack, Thierry Templier, Erwin
@@ -36,7 +30,7 @@ Brannen, Ramnivas Laddad, Arjen Poutsma, Chris Beams, Tareq Abedrabbo, Andy Clem
Syer, Oliver Gierke, Rossen Stoyanchev, Phillip Webb, Rob Winch, Brian Clozel, Stephane
Nicoll, Sebastien Deleuze, Jay Bryant, Mark Paluch
-Copyright © 2002 - 2022 Pivotal, Inc. All Rights Reserved.
+Copyright © 2002 - 2022 VMware, Inc. All Rights Reserved.
Copies of this document may be made for your own use and for distribution to others,
provided that you do not charge any fee for such copies and further provided that each