diff --git a/docs/pom.xml b/docs/pom.xml
index edc67a18..27293018 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -18,7 +18,7 @@
 		<docs.whitelisted.branches>2.1.x,2.2.x</docs.whitelisted.branches>
 		<main.basedir>${basedir}/..</main.basedir>
 		<gmavenplus-plugin.version>1.8.1</gmavenplus-plugin.version>
-		<groovy.version>3.0.2</groovy.version>
+		<groovy.version>2.5.10</groovy.version>
 		<!-- For the Groovy plugin -->
 		<groovyVersion>${groovy.version}</groovyVersion>
 		<!-- We don't want to downloaded sources of our own project-->
@@ -110,12 +110,12 @@
 			<version>${groovy.version}</version>
 			<scope>compile</scope>
 		</dependency>
-		<dependency>
+		<!-- <dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy-astbuilder</artifactId>
 			<version>${groovy.version}</version>
 			<scope>compile</scope>
-		</dependency>
+		</dependency> -->
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy-console</artifactId>
diff --git a/pom.xml b/pom.xml
index 2d109fc2..2d161b87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1109,6 +1109,8 @@
 									<project-version>${project.version}@</project-version>
 									<github-tag>${github-tag}@</github-tag>
 									<version-type>${version-type}@</version-type>
+									<!-- Once we go to docs.spring.io should be changed to -->
+									<!-- https://docs.spring.io/${docs.main}/${project.version} -->
 									<docs-url>${docs-url}@</docs-url>
 									<raw-docs-url>${raw-docs-url}@</raw-docs-url>
 									<project-version>${project.version}@</project-version>