From 23bf948101a83e811e53b1c2a22acdb3421f06ea Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Mon, 27 Jan 2020 23:31:25 +0100 Subject: [PATCH] Upgrade to Asciidoctor Gradle JVM 3.0.0 See gh-19953 --- buildSrc/build.gradle | 3 ++- .../context/properties/SingleConfigurationTableEntry.java | 2 +- .../boot/autoconfigure/jdbc/DataSourceProperties.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 1e8c165aa4..2772207c45 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -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") diff --git a/buildSrc/src/main/java/org/springframework/boot/build/context/properties/SingleConfigurationTableEntry.java b/buildSrc/src/main/java/org/springframework/boot/build/context/properties/SingleConfigurationTableEntry.java index a269281843..0abdfdbf29 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/context/properties/SingleConfigurationTableEntry.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/context/properties/SingleConfigurationTableEntry.java @@ -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, "+++"); } } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java index 7f0f6e246a..adfe5bcfab 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java @@ -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;