diff --git a/docs/src/main/java/org/springframework/cloud/internal/asciidoctor/ReadmeMain.java b/docs/src/main/java/org/springframework/cloud/internal/asciidoctor/ReadmeMain.java
index efa198b0..9c5d3e18 100644
--- a/docs/src/main/java/org/springframework/cloud/internal/asciidoctor/ReadmeMain.java
+++ b/docs/src/main/java/org/springframework/cloud/internal/asciidoctor/ReadmeMain.java
@@ -51,15 +51,17 @@ public class ReadmeMain {
 	}
 
 	private Options options(File input, File output) {
-		Attributes attributes = new Attributes();
-		attributes.setAllowUriRead(true);
-		attributes.setAttribute("project-root", output.getParent());
-		Options options = new Options();
-		options.setSourceDir(input.getParent());
-		options.setBaseDir(input.getParent());
-		options.setAttributes(attributes);
-		options.setSafe(SafeMode.UNSAFE);
-		options.setParseHeaderOnly(true);
-		return options;
+		Attributes attributes = Attributes.builder()
+				.allowUriRead(true)
+				.attribute("project-root", output.getParent())
+				.build();
+
+		return Options.builder()
+				.sourceDir(input.getParentFile())
+				.baseDir(input.getParentFile())
+				.attributes(attributes)
+				.safe(SafeMode.UNSAFE)
+				.parseHeaderOnly(true)
+				.build();
 	}
 }
diff --git a/docs/src/test/java/org/springframework/cloud/internal/asciidoctor/ReadmeMainTests.java b/docs/src/test/java/org/springframework/cloud/internal/asciidoctor/ReadmeMainTests.java
index 41cee10f..ab15189d 100644
--- a/docs/src/test/java/org/springframework/cloud/internal/asciidoctor/ReadmeMainTests.java
+++ b/docs/src/test/java/org/springframework/cloud/internal/asciidoctor/ReadmeMainTests.java
@@ -7,7 +7,6 @@ import java.nio.file.Files;
 
 import org.junit.jupiter.api.Test;
 
-import static org.assertj.core.api.Assertions.registerCustomDateFormat;
 import static org.assertj.core.api.BDDAssertions.then;
 
 class ReadmeMainTests {
diff --git a/pom.xml b/pom.xml
index 19a788ed..50669669 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,16 +34,16 @@
 		<docs.classes.dir>${project.build.directory}/build-docs-classes</docs.classes.dir>
 		<refdocs.build.directory>${project.build.directory}/refdocs/</refdocs.build.directory>
 		<spring-doc-resources.version>0.2.2.RELEASE</spring-doc-resources.version>
-		<spring-asciidoctor-extensions-boot.version>0.5.0
+		<spring-asciidoctor-extensions-boot.version>0.6.0
 		</spring-asciidoctor-extensions-boot.version>
-		<spring-asciidoctor-extensions-block.version>0.5.0
+		<spring-asciidoctor-extensions-block.version>0.6.0
 		</spring-asciidoctor-extensions-block.version>
-		<asciidoctorj-pdf.version>1.5.3</asciidoctorj-pdf.version>
-		<asciidoctorj-diagram.version>2.0.2</asciidoctorj-diagram.version>
+		<asciidoctorj-pdf.version>1.6.0</asciidoctorj-pdf.version>
+		<asciidoctorj-diagram.version>2.1.2</asciidoctorj-diagram.version>
 		<guides-project.version>${project.version}</guides-project.version>
 		<guides-update.phase>deploy</guides-update.phase>
 		<revision>${project.version}</revision>
-		<asciidoctorj.version>2.4.1</asciidoctorj.version>
+		<asciidoctorj.version>2.5.1</asciidoctorj.version>
 		<jruby-complete.version>9.2.7.0</jruby-complete.version>
 
 		<!-- Sonar -->