diff --git a/.gitignore b/.gitignore
index 6294689d21..b04f0cf8bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,4 @@ node/
 package-lock.json
 package.json
 build/
-
+.vscode/
\ No newline at end of file
diff --git a/antora-playbook.yml b/antora-playbook.yml
index 18e6d35a96..54bbe6cc90 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -32,6 +32,8 @@ asciidoc:
   extensions:
   - '@asciidoctor/tabs'
   - '@springio/asciidoctor-extensions'
+  - '@springio/asciidoctor-extensions/javadoc-extension'
+  - '@springio/asciidoctor-extensions/include-code-extension'
   - '@djencks/asciidoctor-mathjax'
 urls:
   latest_version_segment_strategy: redirect:to
@@ -40,7 +42,7 @@ urls:
 ui:
   supplemental_files: ./supplemental-ui
   bundle:
-    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.7/ui-bundle.zip
+    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.17/ui-bundle.zip
     snapshot: true
 runtime:
   log:
diff --git a/pom.xml b/pom.xml
index d6ce14510f..739c41dbdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,29 +21,31 @@
 	</issueManagement>
 
 	<properties>
-		<io.spring.maven.antora-version>0.0.4</io.spring.maven.antora-version>
+		<org.maven.antora-version>1.0.0-alpha.4</org.maven.antora-version>
 	</properties>
 
 
 	<build>
 		<plugins>
+
 			<plugin>
-				<groupId>io.spring.maven.antora</groupId>
+				<groupId>org.antora</groupId>
 				<artifactId>antora-maven-plugin</artifactId>
-				<version>${io.spring.maven.antora-version}</version>
+				<version>${org.maven.antora-version}</version>
 				<extensions>true</extensions>
 				<configuration>
 					<options>
 						<option>--to-dir=target/antora/site</option>
 						<option>--stacktrace</option>
 						<option>--fetch</option>
-					</options>
+					</options>					
 					<packages>
-						<package>@antora/atlas-extension@1.0.0-alpha.1</package>
-						<package>@antora/collector-extension@1.0.0-alpha.3</package>
-						<package>@asciidoctor/tabs@1.0.0-beta.3</package>
-						<package>@springio/antora-extensions@1.11.1</package>
-						<package>@springio/asciidoctor-extensions@1.0.0-alpha.9</package>
+						<package>@antora/cli@3.2.0-alpha.6</package>
+						<package>@antora/atlas-extension@1.0.0-alpha.2</package>
+						<package>@antora/collector-extension@1.0.0-beta.1</package>
+						<package>@asciidoctor/tabs@1.0.0-beta.6</package>
+						<package>@springio/antora-extensions@1.14.2</package>
+						<package>@springio/asciidoctor-extensions@1.0.0-alpha.12</package>
 						<package>@djencks/asciidoctor-mathjax@0.0.9</package>
 					</packages>
 				</configuration>