mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge pull request #19953 from dreis2211
* gh-19953: Upgrade to Asciidoctor Gradle JVM 3.0.0 Closes gh-19953
This commit is contained in:
commit
f2a1840c88
@ -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")
|
||||
|
@ -74,7 +74,7 @@ class SingleConfigurationTableEntry extends ConfigurationTableEntry {
|
||||
builder.append("|");
|
||||
}
|
||||
else {
|
||||
String cleanedDescription = this.description.replace("|", "\\|");
|
||||
String cleanedDescription = this.description.replace("|", "\\|").replace("<", "<").replace(">", ">");
|
||||
builder.append("|+++", cleanedDescription, "+++");
|
||||
}
|
||||
}
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user