Skip to content

Commit 2ed8985

Browse files
artembilangaryrussell
authored andcommitted
Bump to the latest BUILD-SNAPSHOTs (#1172)
* Bump to the latest BUILD-SNAPSHOTs After introducing a `BeanDefinition.getResolvableType()` we have several failed builds because of `NoSuchMethodError`. Looks like interface and its implementation classes are loaded from different versions. * Exclude `org.springframework` from `spring-data-commons` to avoid CLASSPATH conflicts Related to https://build.spring.io/browse/SK-SON-1242/ spring-projects/spring-framework#23178 * * Fix race condition in `testSeekToLastOnIdle()`
1 parent 3950995 commit 2ed8985

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

build.gradle

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ subprojects { subproject ->
9292
scalaVersion = '2.12'
9393
springRetryVersion = '1.2.4.RELEASE'
9494
springVersion = '5.2.0.BUILD-SNAPSHOT'
95-
springDataCommonsVersion = '2.2.0.RC1'
96-
reactorVersion = '3.3.0.M2'
95+
springDataCommonsVersion = '2.2.0.BUILD-SNAPSHOT'
96+
reactorVersion = '3.3.0.BUILD-SNAPSHOT'
9797
reactorKafkaVersion = '1.1.1.RELEASE'
9898

9999
idPrefix = 'kafka'
@@ -241,7 +241,10 @@ project ('spring-kafka') {
241241
compile ("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion", optional)
242242

243243
// Spring Data projection message binding support
244-
compile ("org.springframework.data:spring-data-commons:$springDataCommonsVersion", optional)
244+
compile ("org.springframework.data:spring-data-commons:$springDataCommonsVersion") {
245+
optional(it)
246+
exclude group: 'org.springframework'
247+
}
245248
compile ("com.jayway.jsonpath:json-path:$jaywayJsonPathVersion", optional)
246249

247250
//Reactive

spring-kafka/src/test/java/org/springframework/kafka/annotation/EnableKafkaIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1742,9 +1742,9 @@ public static class SeekToLastOnIdleListener extends AbstractConsumerSeekAware {
17421742
@KafkaListener(id = "seekOnIdle", topics = "seekOnIdle", autoStartup = "false", concurrency = "2",
17431743
clientIdPrefix = "seekOnIdle", containerFactory = "kafkaManualAckListenerContainerFactory")
17441744
public void listen(@SuppressWarnings("unused") String in, Acknowledgment ack) {
1745-
this.latch1.countDown();
1746-
this.latch2.countDown();
17471745
this.latch3.countDown();
1746+
this.latch2.countDown();
1747+
this.latch1.countDown();
17481748
ack.acknowledge();
17491749
}
17501750

0 commit comments

Comments
 (0)