From 416ac4305cce82bbf6aab141625456256400977c Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 9 Mar 2017 09:28:27 -0500 Subject: [PATCH] Upgrade Gradle to 3.4.1 and others Apply `io.spring.dependency-management` plugin to use boms for dependencies --- build.gradle | 83 ++++++++++++----------- gradle/wrapper/gradle-wrapper.jar | Bin 54208 -> 54212 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- publish-maven.gradle | 4 +- 4 files changed, 49 insertions(+), 42 deletions(-) diff --git a/build.gradle b/build.gradle index d167690..082375e 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,13 @@ buildscript { maven { url 'http://repo.spring.io/plugins-release' } } dependencies { - classpath 'io.spring.gradle:dependency-management-plugin:0.6.1.RELEASE' classpath 'io.spring.gradle:spring-io-plugin:0.0.6.RELEASE' } + configurations.classpath.resolutionStrategy.eachDependency { + if (it.requested.name == 'dependency-management-plugin') { + it.useVersion '1.0.0.RELEASE' + } + } } plugins { @@ -13,7 +17,7 @@ plugins { id 'eclipse' id 'idea' id 'jacoco' - id 'org.sonarqube' version '2.1' + id 'org.sonarqube' version '2.2.1' id 'checkstyle' } description = 'Spring Integration AWS Support' @@ -29,6 +33,27 @@ repositories { maven { url 'http://repo.spring.io/libs-milestone' } } +ext { + assertjVersion = '3.6.2' + servletApiVersion = '3.1.0' + slf4jVersion = '1.7.22' + springCloudAwsVersion = '1.1.3.RELEASE' + springIntegrationVersion = '4.3.8.RELEASE' + + idPrefix = 'aws' + + linkHomepage = 'https://github.com/spring-projects/spring-integration-aws' + linkCi = 'https://build.spring.io/browse/INTEXT' + linkIssue = 'https://jira.spring.io/browse/INTEXT' + linkScmUrl = 'https://github.com/spring-projects/spring-integration-aws' + linkScmConnection = 'https://github.com/spring-projects/spring-integration-aws.git' + linkScmDevConnection = 'git@github.com:spring-projects/spring-integration-aws.git' +} + +ext.javadocLinks = [ + "http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/" +] as String[] + compileJava { sourceCompatibility = 1.7 targetCompatibility = 1.7 @@ -47,45 +72,27 @@ sourceSets { } } +apply plugin: 'io.spring.dependency-management' + if (project.hasProperty('platformVersion')) { apply plugin: 'spring-io' +} - dependencyManagement { +dependencyManagement { + imports { + mavenBom "org.springframework.cloud:spring-cloud-aws-dependencies:$springCloudAwsVersion" + mavenBom "org.springframework.integration:spring-integration-bom:$springIntegrationVersion" + } + + if (project.hasProperty('platformVersion')) { springIoTestRuntime { imports { - mavenBom "io.spring.platform:platform-bom:${platformVersion}" + mavenBom "io.spring.platform:platform-bom:$platformVersion" } } } - - springIoDependencyVersionMappingCheck { - configuration = configurations.testRuntime - failOnUnmappedDirectDependency = false - } } -ext { - assertjVersion = '3.6.2' - awsSdkVersion = '1.11.42' - servletApiVersion = '3.1.0' - slf4jVersion = '1.7.22' - springCloudAwsVersion = '1.1.3.RELEASE' - springIntegrationVersion = '4.3.7.RELEASE' - - idPrefix = 'aws' - - linkHomepage = 'https://github.com/spring-projects/spring-integration-aws' - linkCi = 'https://build.spring.io/browse/INTEXT' - linkIssue = 'https://jira.spring.io/browse/INTEXT' - linkScmUrl = 'https://github.com/spring-projects/spring-integration-aws' - linkScmConnection = 'https://github.com/spring-projects/spring-integration-aws.git' - linkScmDevConnection = 'git@github.com:spring-projects/spring-integration-aws.git' -} - -ext.javadocLinks = [ - "http://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/" -] as String[] - jacoco { toolVersion = "0.7.8" } @@ -96,18 +103,18 @@ checkstyle { } dependencies { - compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" - compile "org.springframework.cloud:spring-cloud-aws-core:$springCloudAwsVersion" + compile 'org.springframework.integration:spring-integration-core' + compile 'org.springframework.cloud:spring-cloud-aws-core' - compile("org.springframework.cloud:spring-cloud-aws-messaging:$springCloudAwsVersion", optional) - compile("org.springframework.integration:spring-integration-file:$springIntegrationVersion", optional) - compile("org.springframework.integration:spring-integration-http:$springIntegrationVersion", optional) + compile('org.springframework.cloud:spring-cloud-aws-messaging', optional) + compile('org.springframework.integration:spring-integration-file', optional) + compile('org.springframework.integration:spring-integration-http', optional) - compile("com.amazonaws:aws-java-sdk-kinesis:$awsSdkVersion", optional) + compile('com.amazonaws:aws-java-sdk-kinesis', optional) compile("javax.servlet:javax.servlet-api:$servletApiVersion", provided) - testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" + testCompile 'org.springframework.integration:spring-integration-test' testCompile "org.assertj:assertj-core:$assertjVersion" testRuntime "org.slf4j:slf4j-log4j12:$slf4jVersion" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 5c7d2c6372fc5ddfa935a04ffd5e2411cdf182e5..1e4556da8c9cb9fb1bda8debdea1c7bd83f3430f 100644 GIT binary patch delta 2084 zcmZ9Ne@t6d6vuC03+;gNqYMJP7HEk;VdJN`je$s*Xuu!{ZqxB=YeW$k2!Syrii!TQ z%!D6jaX$n_Q6Z3k8xxd}z)JZ|fntnv%O-3hOco>4sGBqMyz?02@sgK&^6lq*@44^X zdpp!7x3tOC>8WzXcE(gHCjZ#fpbk{ykir#zv6RRd+u!h1rsvre?>psdmke$q zTw>g1Cn(Sswn)F646hei->57#DU}Ha-6@!RVcCI#{+!Q6=5YRx6hOQwTfT%YO{N{f z*fV8X;3()SSmT^gNin=R@p7XbV`tUyZmS2BbvgD}3)}4osxIv$8Uo92xe0JnarSJR zjIl4}jO~WCDjm3jvS(k#xQuw0N}CwmtjZCCr0QM;{dB)(ubhI|+I9^EOO1Xi3X~ts ziSU&s5Sg+TxfoQney=1Zt@D9ccY0T%Xn5*EmZ+>=yd?%d^!+Xdll>qX<`4MEsqXsm zKR=A)7|X7|uh2Zq zbE^zKwRpnZup>#=QSy~RhQ$M1EqXt}Y5DfSiVk$RimyT96bk8Uza~Y zS7$~YhjN+$Wlwn9;0!J6ayQCHj6^Sv2GVp6V?5Us zCi;$PNjij5Z8%BY;Z8zfw2Eu@elmKg8N2Sym|n69_b4%+SHX=j4Z-#$e&=-9>Dxxe z{3Y<~2?z^i*+ay*hQ49niTu^i92g7n!dC*1z~S*dR8;dg&voa}JhS70G{>|$H@N}# z#$EihJ0)rR^9gjdDB**AcUYNpqIqtf&s8lpxLo`rwU1rZi=mY=X4>Q zFANq6C-a7`Gb{|g9 zJWKN>_p1Jm$66=1ZJlqniP9Dd>>y}XPpPT1Joicqyweg!y%)aqq3WY&PGNJ#+_rw} zBDgdgLuq$0Evb{-YCCx-o)MRtWb^#xSDd;Aml`Ko>eF2Wx6TDozIBf0PFx^KZPSso z)5dcP7f~`oh0Q=K=^gs2;tV#k1GjCw#BREeK$mYkH`=rkpuY1AwkZ`8A|>!(KlLPT zK7d@cMV{xa2wg?jT@vuc0dj4h*AghXxh3GSL2O*~Mu%M<3?IN7nrZO$lYpEVv}S$i e!|klXKYG0EQ#N1lc#=0gnNas#sC}1Nkp2hZESEO` delta 2050 zcmZWqeNa?Y6u<8+u*au)sn(kz|l5Xf$MvBjX2l-nk6&=*_&nXMX$p{m!}f zo_k-*F;(+1l|D0FGZU#2CvdPtFbu{?~TTCa`D3CwrpG zk4LKH!4*xzSiC$m#tK?*Ie_KbAwL|`HjNd;4tp^c;>*}v*kPUp)>eIEw$GRs@z?ra zrKI1`ujhC)aQINRzJAVp>D#A4scpvWO z_X_mo$WRlkZGe%X-2k-tvg;X&Wozj@Gc4!Gf_rf}}_!Nrg0 zFEH5Gs*LZZfZ6_Xq!;d}T644i)cye6X+L~3(*-e*O*R9Zw=Yq41B}~W+%E4cl9?#~ z;N!uEiQh^bt+uU;rg}|R_$U+?CKOw38#foeJzWSjmn7kiyoGVoEq@t5AUHIPeU9}< zD=b3=Nbs2n8Ny76Y0*W<`G-c-ZWK)Wa-o|` zI)1A_Vv;vw@d|PwL|!(L;gPzav7hi*Ej3J^%o-yZmKhEITdvWP^1R^+FhNa_Bfh1+@qnVYrL#T6luc zsyY%UbyVk?rupu&_LR@2EWOvCb%W>#%b8m6a&R> zBTb_UA?I0wes>!w%W#zbpA=m9bX>s%MV9mD&@vQ~d!mRKx^31e7m}{ysa~caW;dbZ zOOs8}-XjS`Fw~PwDd+b}BC|u7JreSJbrE>Ar%k=k@#{C`dBYA?dkEC`&hR>6m+}7q Da5!_f diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ad012f4..c7aa040 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Feb 07 15:09:04 EST 2017 +#Wed Mar 08 16:38:04 EST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip diff --git a/publish-maven.gradle b/publish-maven.gradle index 91db539..20e3404 100644 --- a/publish-maven.gradle +++ b/publish-maven.gradle @@ -33,8 +33,8 @@ def customizePom(pom, gradleProject) { description = gradleProject.description url = 'https://github.com/spring-projects/spring-integration-aws' organization { - name = 'SpringSource' - url = 'http://springsource.org' + name = 'SpringIO' + url = 'http://spring.io' } licenses { license {