Skip to content

Commit

Permalink
Remove extra asciidoctor configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
bclozel committed Sep 19, 2022
1 parent fa5998e commit 3e41d7f
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 50 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 5 additions & 8 deletions gradle/docs.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -109,7 +103,7 @@ asciidoctor {
logDocuments = true
resources {
from(sourceDir) {
include 'images/*.png', 'css/**', 'js/**'
include 'images/*.png'
}
}
}
Expand All @@ -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
}

Expand Down
31 changes: 0 additions & 31 deletions src/docs/asciidoc/css/stylesheet.css

This file was deleted.

2 changes: 0 additions & 2 deletions src/docs/asciidoc/docinfo-footer.html

This file was deleted.

10 changes: 2 additions & 8 deletions src/docs/asciidoc/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 3e41d7f

Please sign in to comment.