Skip to content

Commit 3e41d7f

Browse files
committed
Remove extra asciidoctor configuration
See spring-projectsgh-29162
1 parent fa5998e commit 3e41d7f

File tree

5 files changed

+8
-50
lines changed

5 files changed

+8
-50
lines changed

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ follow-up reports will need to be created as new issues with a fresh description
6666
#### Submit a Pull Request
6767

6868
1. If you have not previously done so, please sign the
69-
[Contributor License Agreement](https://cla.pivotal.io/sign/spring). You will be reminded
69+
[Contributor License Agreement](https://cla.spring.io/sign/spring). You will be reminded
7070
automatically when you submit the PR.
7171

7272
1. Should you create an issue first? No, just create the pull request and use the

gradle/docs.gradle

+5-8
Original file line numberDiff line numberDiff line change
@@ -68,22 +68,16 @@ pluginManager.withPlugin("kotlin") {
6868
asciidoctorj {
6969
def docRoot = 'https://docs.spring.io'
7070
def docsSpringFramework = "${docRoot}/spring-framework/docs/${project.version}"
71-
version = '2.4.1'
71+
version = '2.4.3'
7272
fatalWarnings ".*"
7373
options doctype: 'book', eruby: 'erubis'
7474
attributes([
7575
icons: 'font',
7676
idprefix: '',
7777
idseparator: '-',
78-
docinfo: 'shared,private-header', // https://docs.asciidoctor.org/asciidoctor/latest/docinfo/
7978
revnumber: project.version,
8079
sectanchors: '',
8180
sectnums: '',
82-
'source-highlighter': 'highlight.js',
83-
highlightjsdir: 'js/highlight',
84-
'highlightjs-theme': 'googlecode',
85-
stylesdir: 'css/',
86-
stylesheet: 'stylesheet.css',
8781
'spring-version': project.version,
8882
'spring-framework-main-code': 'https://github.com/spring-projects/spring-framework/tree/main',
8983
'doc-root': docRoot,
@@ -109,7 +103,7 @@ asciidoctor {
109103
logDocuments = true
110104
resources {
111105
from(sourceDir) {
112-
include 'images/*.png', 'css/**', 'js/**'
106+
include 'images/*.png'
113107
}
114108
}
115109
}
@@ -125,6 +119,9 @@ asciidoctorPdf {
125119
include '*.adoc'
126120
}
127121
outputDir "$buildDir/docs/ref-docs/pdf"
122+
forkOptions {
123+
jvmArgs += ["--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED", "--add-opens", "java.base/java.io=ALL-UNNAMED"]
124+
}
128125
logDocuments = true
129126
}
130127

src/docs/asciidoc/css/stylesheet.css

-31
This file was deleted.

src/docs/asciidoc/docinfo-footer.html

-2
This file was deleted.

src/docs/asciidoc/index.adoc

+2-8
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,7 @@ Email, Tasks, Scheduling, Caching.
2121
https://github.com/spring-projects/spring-framework/wiki[*Wiki*] :: What's New,
2222
Upgrade Notes, Supported Versions, and other cross-version information.
2323

24-
ifdef::backend-html5[]
25-
NOTE: This documentation is also available as {docs-spring-framework}/reference/pdf/index.pdf[PDF].
26-
endif::[]
27-
28-
ifdef::backend-pdf[]
29-
NOTE: This documentation is also available as {docs-spring-framework}/reference/html/index.html[HTML].
30-
endif::[]
24+
NOTE: This documentation is available in {docs-spring-framework}/reference/html/index.html[HTML] and {docs-spring-framework}/reference/pdf/index.pdf[PDF] formats.
3125

3226
Rod Johnson, Juergen Hoeller, Keith Donald, Colin Sampaleanu, Rob Harrop, Thomas Risberg,
3327
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
3630
Syer, Oliver Gierke, Rossen Stoyanchev, Phillip Webb, Rob Winch, Brian Clozel, Stephane
3731
Nicoll, Sebastien Deleuze, Jay Bryant, Mark Paluch
3832

39-
Copyright © 2002 - 2022 Pivotal, Inc. All Rights Reserved.
33+
Copyright © 2002 - 2022 VMware, Inc. All Rights Reserved.
4034

4135
Copies of this document may be made for your own use and for distribution to others,
4236
provided that you do not charge any fee for such copies and further provided that each

0 commit comments

Comments
 (0)