From ccc6c56296481fa264d0ef13ada1ad57d206903e Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Fri, 17 Jul 2015 17:13:30 -0400 Subject: [PATCH] INT-3774: Update to Groovy 2.4.4 JIRA: https://jira.spring.io/browse/INT-3774 --- build.gradle | 2 +- .../groovy/config/GroovyServiceActivatorTests.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 04a040c518..12f8bc759c 100644 --- a/build.gradle +++ b/build.gradle @@ -87,7 +87,7 @@ subprojects { subproject -> derbyVersion = '10.10.2.0' eclipseLinkVersion = '2.4.2' ftpServerVersion = '1.0.6' - groovyVersion = '2.3.6' + groovyVersion = '2.4.4' guavaVersion = '16.0.1' hamcrestVersion = '1.3' hibernateVersion = '4.3.6.Final' diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java index 49d3b18d20..7657bc7250 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java @@ -190,7 +190,7 @@ public class GroovyServiceActivatorTests { catch (Exception e) { Throwable cause = e.getCause(); assertEquals(MissingPropertyException.class, cause.getClass()); - assertThat(cause.getMessage(), Matchers.containsString("No such property: ReplyRequiredException for class: groovy.lang")); + assertThat(cause.getMessage(), Matchers.containsString("No such property: ReplyRequiredException for class: groovy_lang")); throw e; } @@ -209,6 +209,7 @@ public class GroovyServiceActivatorTests { public static class SampleScriptVariSource implements ScriptVariableGenerator{ + @Override public Map generateScriptVariables(Message message) { Map variables = new HashMap(); variables.put("foo", "foo"); @@ -225,6 +226,7 @@ public class GroovyServiceActivatorTests { private volatile boolean executed; + @Override public void customize(GroovyObject goo) { this.executed = true; }