diff --git a/build.gradle b/build.gradle
index 5051921..81e0421 100644
--- a/build.gradle
+++ b/build.gradle
@@ -49,22 +49,24 @@ configurations.create('contentassist')
 //	}
 //}
 
+def groovyVersion = '4.0.15'
+def springVersion = '5.2.0.RELEASE'
+
 dependencies {
 	contentassist(
 		'javax.annotation:javax.annotation-api:1.3.2',
 		'javax.inject:javax.inject:1',
-		'nz.net.ultraq.jaxb:jaxb-utilities:2.1.0',
-		'nz.net.ultraq.extensions:groovy-extensions:1.1.0',
-		'nz.net.ultraq.extensions:profiling-extensions:0.6.1',
+		'nz.net.ultraq.groovy:groovy-extensions:2.2.0',
+		'nz.net.ultraq.groovy:groovy-profiling-extensions:0.7.0',
 		'org.attoparser:attoparser:2.0.5.RELEASE',
-		'org.codehaus.groovy:groovy:3.0.9',
-		'org.springframework:spring-context:5.2.0.RELEASE',
+		"org.apache.groovy:groovy:${groovyVersion}",
+		"org.springframework:spring-context:${springVersion}",
 
 		// For unit tests
-		'org.codehaus.groovy:groovy-xml:3.0.9',
+		"org.apache.groovy:groovy-xml:${groovyVersion}",
 		'org.junit.jupiter:junit-jupiter:5.7.2',
 		'org.mockito:mockito-core:3.12.4',
-		'org.springframework:spring-test:5.2.0.RELEASE'
+		"org.springframework:spring-test:${springVersion}"
 	)
 }
 
diff --git a/org.thymeleaf.extras.eclipse.contentassist/src/main/groovy/org/thymeleaf/extras/eclipse/nature/AddThymeleafNatureAction.groovy b/org.thymeleaf.extras.eclipse.contentassist/src/main/groovy/org/thymeleaf/extras/eclipse/nature/AddThymeleafNatureAction.groovy
index f0513da..a29b721 100644
--- a/org.thymeleaf.extras.eclipse.contentassist/src/main/groovy/org/thymeleaf/extras/eclipse/nature/AddThymeleafNatureAction.groovy
+++ b/org.thymeleaf.extras.eclipse.contentassist/src/main/groovy/org/thymeleaf/extras/eclipse/nature/AddThymeleafNatureAction.groovy
@@ -1,12 +1,12 @@
-/* 
+/*
  * Copyright 2013, The Thymeleaf Project (http://www.thymeleaf.org/)
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,17 +19,15 @@ package org.thymeleaf.extras.eclipse.nature
 import org.eclipse.core.commands.AbstractHandler
 import org.eclipse.core.commands.ExecutionEvent
 import org.eclipse.core.resources.IProject
-import org.eclipse.jdt.core.IJavaProject 
+import org.eclipse.jdt.core.IJavaProject
+
 /**
  * Adds a Thymeleaf nature to selected projects.
- * 
+ *
  * @author Emanuel Rabina
  */
 class AddThymeleafNatureAction extends AbstractHandler {
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	Object execute(ExecutionEvent event) {