root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Upgrade to Asciidoctor Gradle JVM 3.0.0 

See gh-19953
This commit is contained in:
dreis2211 2020-01-27 23:31:25 +01:00 committed by Andy Wilkinson
parent db1c9f4058
commit 23bf948101
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
buildSrc/build.gradle
View File

@ -18,7 +18,8 @@ dependencies {
implementation("com.fasterxml.jackson.core:jackson-databind:2.10.0") implementation("com.fasterxml.jackson.core:jackson-databind:2.10.0")
implementation("commons-codec:commons-codec:1.13") implementation("commons-codec:commons-codec:1.13")
implementation("org.apache.maven:maven-embedder:3.6.2") 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-core:5.2.2.RELEASE")
implementation("org.springframework:spring-web:5.2.2.RELEASE") implementation("org.springframework:spring-web:5.2.2.RELEASE")
implementation("com.google.code.gson:gson:2.8.5") implementation("com.google.code.gson:gson:2.8.5")

2
buildSrc/src/main/java/org/springframework/boot/build/context/properties/SingleConfigurationTableEntry.java
View File

@ -74,7 +74,7 @@ class SingleConfigurationTableEntry extends ConfigurationTableEntry {
builder.append("|"); builder.append("|");
} }
else { else {
String cleanedDescription = this.description.replace("|", "\\|"); String cleanedDescription = this.description.replace("|", "\\|").replace("<", "&lt;").replace(">", "&gt;");
builder.append("|+++", cleanedDescription, "+++"); builder.append("|+++", cleanedDescription, "+++");
} }
} }

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java
View File

@ -89,7 +89,7 @@ public class DataSourceProperties implements BeanClassLoaderAware, InitializingB
private String password; 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. * set.
*/ */
private String jndiName; private String jndiName;