Merge pull request #19953 from dreis2211

* gh-19953:
  Upgrade to Asciidoctor Gradle JVM 3.0.0

Closes gh-19953

Author: wilkinsona

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")

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

@@ -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, "+++");
 		}
 	}

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;