Skip to content

Upgrade to Asciidoctor Gradle JVM 3.0.0 #19953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Upgrade to Asciidoctor Gradle JVM 3.0.0 #19953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c9e0fe5
Escape some special characters for Asciidoc PDF creation
dreis2211 Jan 27, 2020
630c6c9
Fix documentation link
dreis2211 Jan 27, 2020
6ab4680
Upgrade to Asciidoctor Gradle JVM 3.0.0
dreis2211 Jan 27, 2020
d63ec9b
Escape < and > properly in PDF documentation
dreis2211 Feb 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion buildSrc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ dependencies {
implementation("com.fasterxml.jackson.core:jackson-databind:2.10.0")
implementation("commons-codec:commons-codec:1.13")
implementation("org.apache.maven:maven-embedder:3.6.2")
implementation("org.asciidoctor:asciidoctor-gradle-jvm:2.4.0")
implementation("org.asciidoctor:asciidoctor-gradle-jvm:3.0.0")
implementation("org.asciidoctor:asciidoctor-gradle-jvm-pdf:3.0.0")
implementation("org.springframework:spring-core:5.2.2.RELEASE")
implementation("org.springframework:spring-web:5.2.2.RELEASE")
implementation("com.google.code.gson:gson:2.8.5")
Expand Down
2 changes: 1 addition & 1 deletion ...java/org/springframework/boot/build/context/properties/SingleConfigurationTableEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ private void writeDescription(AsciidocBuilder builder) {
builder.append("|");
}
else {
String cleanedDescription = this.description.replace("|", "\\|");
String cleanedDescription = this.description.replace("|", "\\|").replace("<", "&lt;").replace(">", "&gt;");
builder.append("|+++", cleanedDescription, "+++");
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...igure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public class DataSourceProperties implements BeanClassLoaderAware, InitializingB
private String password;

/**
* JNDI location of the datasource. Class, url, username & password are ignored when
* JNDI location of the datasource. Class, url, username and password are ignored when
* set.
*/
private String jndiName;
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6916,7 +6916,7 @@ NOTE: Make sure to not use the regular `@Import` annotation to import auto-confi

[[boot-features-testing-spring-boot-applications-testing-user-configuration]]
==== User Configuration and Slicing
If you <<using-boot-structuring-your-code, structure your code>> in a sensible way, your `@SpringBootApplication` class is <<boot-features-testing-spring-boot-applications-detecting-config, used by default>> as the configuration of your tests.
If you <<using-spring-boot.adoc#using-boot-structuring-your-code, structure your code>> in a sensible way, your `@SpringBootApplication` class is <<boot-features-testing-spring-boot-applications-detecting-config, used by default>> as the configuration of your tests.

It then becomes important not to litter the application's main class with configuration settings that are specific to a particular area of its functionality.

Expand Down