Merge branch '2.6.x' into 2.7.x

Closes gh-32017

Author: wilkinsona

spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,6 +37,8 @@
 import org.codehaus.groovy.ast.stmt.ExpressionStatement;
 import org.codehaus.groovy.control.SourceUnit;
 import org.codehaus.groovy.control.io.ReaderSource;
+import org.codehaus.groovy.syntax.Token;
+import org.codehaus.groovy.syntax.Types;
 import org.codehaus.groovy.transform.ASTTransformation;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -195,8 +197,8 @@ void transformationOfAnnotationOnLocalVariable() {
 		ClassNode classNode = new ClassNode("Test", 0, new ClassNode(Object.class));
 		this.moduleNode.addClass(classNode);
 
-		DeclarationExpression declarationExpression = new DeclarationExpression(new VariableExpression("test"), null,
-				new ConstantExpression("test"));
+		DeclarationExpression declarationExpression = new DeclarationExpression(new VariableExpression("test"),
+				new Token(Types.ASSIGN, "=", 1, 1), new ConstantExpression("test"));
 		declarationExpression.addAnnotation(this.grabAnnotation);
 
 		BlockStatement code = new BlockStatement(Arrays.asList(new ExpressionStatement(declarationExpression)),

spring-boot-project/spring-boot-dependencies/build.gradle

@@ -411,7 +411,7 @@ bom {
 			]
 		}
 	}
-	library("Groovy", "3.0.11") {
+	library("Groovy", "3.0.12") {
 		group("org.codehaus.groovy") {
 			imports = [
 				"groovy-bom"