From 89614f7ff69957db0e9ab651c57457ca1eec8288 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 15 Nov 2017 14:52:35 -0500 Subject: [PATCH] Upgrade to SF-5.0.2.B-S to ensure compatibility * Fix `EnableIntegrationTests.testMessagingGateway()` do not check for compiled SpEL since it isn't compilable any more for the Proxy classes --- build.gradle | 2 +- .../integration/configuration/EnableIntegrationTests.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index b2237ee5ab..0295a57501 100644 --- a/build.gradle +++ b/build.gradle @@ -137,7 +137,7 @@ subprojects { subproject -> springSecurityVersion = '5.0.0.RC1' springSocialTwitterVersion = '2.0.0.M4' springRetryVersion = '1.2.1.RELEASE' - springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.1.RELEASE' + springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.2.BUILD-SNAPSHOT' springWsVersion = '3.0.0.RELEASE' tomcatVersion = "8.5.23" xmlUnitVersion = '1.6' diff --git a/spring-integration-core/src/test/java/org/springframework/integration/configuration/EnableIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/configuration/EnableIntegrationTests.java index b0c9ba525f..512bbeee7c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/configuration/EnableIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/configuration/EnableIntegrationTests.java @@ -21,7 +21,6 @@ import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -452,12 +451,12 @@ public class EnableIntegrationTests { assertThat(result, containsString("SpelExpression")); assertThat(result, containsString("CompoundExpression.getValueInternal")); assertNotNull(this.testGateway2.echo2("baz")); - result = this.testGateway2.echo2("baz"); // third one should be compiled + // third one should be compiled, but it's not since SF-5.0.2 - proxies aren't compilable SpELs any more + result = this.testGateway2.echo2("baz"); assertNotNull(result); assertEquals("BAZ2", result.substring(0, 4)); assertThat(result, not(containsString("InvocableHandlerMethod"))); assertThat(result, containsString("SpelExpression")); - assertThat(result, is(new RegexMatcher(".+Ex\\d.getValue\\(.+"))); this.testGateway.sendAsync("foo"); assertTrue(this.asyncAnnotationProcessLatch.await(1, TimeUnit.SECONDS)); assertNotSame(Thread.currentThread(), this.asyncAnnotationProcessThread.get());