From 4a807ebbf4c5411b0c45076547f0c4102531d2d3 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 9 Aug 2022 10:16:31 +0100 Subject: [PATCH] Upgrade to Groovy 3.0.12 Closes gh-32008 --- .../ResolveDependencyCoordinatesTransformationTests.java | 8 +++++--- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformationTests.java b/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformationTests.java index cbea73ba22..99e918574e 100644 --- a/spring-boot-project/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformationTests.java +++ b/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.BlockStatement; 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 @@ final class ResolveDependencyCoordinatesTransformationTests { 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)), diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 6ae627dd23..82e470db17 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -380,7 +380,7 @@ bom { ] } } - library("Groovy", "3.0.11") { + library("Groovy", "3.0.12") { group("org.codehaus.groovy") { imports = [ "groovy-bom"