From 1c57fa64b305bf0d60fafdf988f3667662169e53 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 4 Jan 2017 10:51:37 -0500 Subject: [PATCH] Compatibility with Boot 1.5 * Upgrade to Apache Kafka 0.10.1.1 * Upgrade to AssertJ 2.6 * Upgrade to Gradle 3.3 * Upgrade to spring-io-plugin 0.0.6 * Upgrade to JaCoCo 0.7.8 * Upgrade to SF 4.3.5 * Short polishing in `build.gradle` for redundant dependencies * Move `MessagingMessageListenerAdapterTests` to the proper package Mostly just upgrade. Looks like AssertJ `2.5` just has binary incompatibility with `2.6. Tested against IO `Brussels` without any problems --- build.gradle | 12 +++++------- gradle/wrapper/gradle-wrapper.jar | Bin 54224 -> 54208 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- gradlew | 11 ++++++----- .../MessagingMessageListenerAdapterTests.java | 2 +- 5 files changed, 14 insertions(+), 15 deletions(-) rename spring-kafka/src/test/java/{ => org/springframework/kafka}/adapter/MessagingMessageListenerAdapterTests.java (98%) diff --git a/build.gradle b/build.gradle index 575ed060..e6e07093 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { } dependencies { classpath 'io.spring.gradle:dependency-management-plugin:0.6.1.RELEASE' - classpath 'io.spring.gradle:spring-io-plugin:0.0.5.RELEASE' + classpath 'io.spring.gradle:spring-io-plugin:0.0.6.RELEASE' classpath 'io.spring.gradle:docbook-reference-plugin:0.3.1' classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.0' } @@ -76,17 +76,17 @@ subprojects { subproject -> } ext { - assertjVersion = '2.5.0' + assertjVersion = '2.6.0' hamcrestVersion = '1.3' jacksonVersion = '2.6.7' junitVersion = '4.12' - kafkaVersion = '0.10.1.0' + kafkaVersion = '0.10.1.1' log4jVersion = '1.2.17' mockitoVersion = '1.10.19' scalaVersion = '2.11' slf4jVersion = '1.7.21' springRetryVersion = '1.1.3.RELEASE' - springVersion = '4.3.4.RELEASE' + springVersion = '4.3.5.RELEASE' idPrefix = 'kafka' @@ -95,7 +95,7 @@ subprojects { subproject -> eclipse.project.natures += 'org.springframework.ide.eclipse.core.springnature' jacoco { - toolVersion = '0.7.7.201606060606' + toolVersion = '0.7.8' } // enable all compiler warnings; individual projects may customize further @@ -159,8 +159,6 @@ project ('spring-kafka') { testCompile "org.assertj:assertj-core:$assertjVersion" testCompile "org.springframework:spring-tx:$springVersion" - testCompile "org.springframework.integration:spring-integration-test:4.3.1.RELEASE" - testRuntime "org.slf4j:slf4j-log4j12:$slf4jVersion" } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d6e2637affb74a80bfbe87bd2da57e81b2f3c661..c89470b387752698b2422dea30156c056e59a3f9 100644 GIT binary patch delta 4749 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 OxTKwj{n0bz|NjHgf(2Os delta 4771 zcmZ`+2{@E(7k9Pzqn!Vr1Xj zPzg~)pHj$|`k!~w=Y946&viXBbFOorbMAAV1R0yUez7fwb@%0+M+;rDmT64qHmj(RecoF5TD(a=y9@tcJTCK zWoj}-U3XJAkFTb6ny3oNc%ZQk_e#JvKA~(_S;g=0#^>!4Pm7jB^>Axj9r9hiefgx^ zCaLy(z5AqgAGuQUFtokgMzwsdCq~xo@s)k0TpwHrjTcQ965NKz6q8JFY@L``qQPmC}m3i39i5OK9@D_cd*Znb?`V z%UJaqeFG=is?=J1N1{QGaCIgGnxpSQse`|_BBOEm9i;L1PSK(S7j&J zowycUo8|1-VtIS(Xkwj?V1>&%j;61ds$|R@g>r62*LtsuLm(V*=Or!-$TvEXc~hpD+rFGnxE1%*D%lly45JlCC?)?6Q}N#mQHw zslC`WOW2#KeT)5Oh{fV7{nG7rSEWfMH?W9tPscFitLu4Ks-{INq7jI1! z&dtAylPV4C`H`HnGjYC|s$^x)Q71ZLlW{j{TZxVBiDxhJrQgg&WP4r>?e|(Vn7Ysy z{3ftx_S+{k9^cxcs^cV-XK;rWxxY*bkN}^#Rk;~vz*ai0*zCv#**JbaZ-Xu56 zjv1!eb4q6;&KiZ?Q=bXU5@vgO{-Jnje1!_lGVdl!m;bSFM&UD;{z~yA_$<98zjGK2 z<;@QM%DvIkdx2qWh^hVn?hfm7qv8*lVYnXdGKinQ%-i&K-Trweu(8)^oy$(4Ib97@UmE=a0+;@L5jGZhp3kwCdl zYyFY*U@^K;eB=bkz`UbhahccZTN&NRH? zi}RfP_%^stm?u@y`L>>BhS(!kem<*Ac*a{`C#}}ZPQKI1fAj6GBTq_H7O8KpS@0GS z?;m54v!-x-G&|;=W>em&V&ydXTzS2$XspUp;}izCgvqV-h&knD*TheVWqQkH+H__3 ze`ch67uatvFncXz?7iA!9{un*^%A_W$K}(yfKi{RN4m|*jfW(nyt9K27U|hal^#%Y ziaq*v(5S{sKhQ$lc%LG%xO)KKebhf;t{i?Wn_MiEA(HFQo7Q{J@q+)8ek1#>3E9lt zv;5+VLwE48V!K7dBp(FW_L)b0P)!irz0GL%xhwv(+XWS88@v8)w$2hAcOdTMU)+=L zT@zyzQNr7D+SvD8%u{{>p(evEd?{B%Y>CH_>+btlMun$v-i1?1!>lH!xqVx?PcmKV{1c>G&2^4kDgjJzYL(Yr}OuAqsQA*xPZ}H7HeYoB;GZ{=%?H8 zgc;~>R34g;G)nnyYM);Lh%*SL#Byxp3uLy3CWl5IS@4j1501AG7X)paJx06|BmjU2he>e3nX3S$bbu(C z?qT?`C_4G0XI$KJK%}Q&N@61JSNKJ@9YwmbM3Li<99}IBkp(y*=(QjO ziDNu=gRKw#c4)6>RZ(!J9QN~DT~uZ-(QBkN5Hv-GATf-oj4m)mvSWsonh6_Ft59X;Re zC<5@pU}7uy_YwGbi|p@eBlixrg`k6&JA;NIOkO$12pj=`TZ2Bhm%kwhIXVk)UCTPO zXX75XsRV#c12>H7zfk00$hg4beq>mtl^2b79~7eXH&a5vK_!5Ls);f1^oK?Kwc+sge~%MAdR#jaT{jRUBn)!}aw7mV zgP;u~)=uDz3W3{C3*+#55FB4C2n%UieX$0y_BK?QEocu;BCH=GDd&r=XA?JiKuI zA4_D=LmZz3j6*?1u|`G3bfcVZF$~+zZiMa3UAmI9hlo)s^dL&(`#?#C{d(4;>6O=& z`XvK;1%RFohMsCA9nW1!{Da