From 955e3ee282e6af1fa2d084f23f392e420d9cfff8 Mon Sep 17 00:00:00 2001
From: Gunnar Hillert <ghillert@vmware.com>
Date: Fri, 17 May 2013 12:25:58 -0400
Subject: [PATCH] INT-3021 - Fix Sonar Build Plan

* Upgrade to gradle 1.6
* Switch from sonar plugin to sonarRunner plugin

INT-3021 - Correct SCM syntax
---
 build.gradle                             |  51 +++++++++--------------
 gradle/wrapper/gradle-wrapper.jar        | Bin 46735 -> 46742 bytes
 gradle/wrapper/gradle-wrapper.properties |   8 ++--
 publish-maven.gradle                     |   9 ++--
 4 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/build.gradle b/build.gradle
index 011154852d..5c42ab0405 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,6 +12,15 @@ buildscript {
 	}
 }
 
+ext {
+	linkHomepage = 'http://www.springintegration.org/'
+	linkCi       = 'https://build.springsource.org/browse/INT'
+	linkIssue    = 'https://jira.springsource.org/browse/INT'
+	linkScmUrl           = 'https://github.com/SpringSource/spring-integration'
+	linkScmConnection    = 'git://github.com/SpringSource/spring-integration.git'
+	linkScmDevConnection = 'git@github.com:SpringSource/spring-integration.git'
+}
+
 allprojects {
 	group = 'org.springframework.integration'
 
@@ -595,38 +604,18 @@ reference {
 	sourceDir = file('src/reference/docbook')
 }
 
-apply plugin: 'sonar'
+apply plugin: 'sonar-runner'
 
-sonar {
-
-	if (rootProject.hasProperty('sonarHostUrl')) {
-		server.url = rootProject.sonarHostUrl
+sonarRunner {
+	sonarProperties {
+		property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec"
+		property "sonar.links.homepage", linkHomepage
+		property "sonar.links.ci", linkCi
+		property "sonar.links.issue", linkIssue
+		property "sonar.links.scm", linkScmUrl
+		property "sonar.links.scm_dev", linkScmDevConnection
+		property "sonar.java.coveragePlugin", "jacoco"
 	}
-
-	database {
-		if (rootProject.hasProperty('sonarJdbcUrl')) {
-			url = rootProject.sonarJdbcUrl
-		}
-		if (rootProject.hasProperty('sonarJdbcDriver')) {
-			driverClassName = rootProject.sonarJdbcDriver
-		}
-		if (rootProject.hasProperty('sonarJdbcUsername')) {
-			username = rootProject.sonarJdbcUsername
-		}
-		if (rootProject.hasProperty('sonarJdbcPassword')) {
-			password = rootProject.sonarJdbcPassword
-		}
-	}
-
-	project {
-		dynamicAnalysis  = "reuseReports"
-		withProjectProperties { props ->
-			props["sonar.core.codeCoveragePlugin"] = "jacoco"
-			props["sonar.jacoco.reportPath"]       = "${buildDir.name}/jacoco.exec"
-		}
-	}
-
-	logger.info("Sonar parameters used: server.url='${server.url}'; database.url='${database.url}'; database.driverClassName='${database.driverClassName}'; database.username='${database.username}'")
 }
 
 task api(type: Javadoc) {
@@ -769,5 +758,5 @@ task dist(dependsOn: assemble) {
 
 task wrapper(type: Wrapper) {
 	description = 'Generates gradlew[.bat] scripts'
-	gradleVersion = '1.5'
+	gradleVersion = '1.6'
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 42d9b0e9c5872910311a1d035995ab8ec466e7ac..faa569a9a0eedc9ff37450fed24a7efd77a86729 100644
GIT binary patch
delta 1766
zcmZWp3ou+)7(RP<S(ddVY}GX(;<1)?S&uxVsLTk<ZdO8LNW8MCQQD-KXi5j8BPNM1
zPCP1V1iR~PS&y1(I&{+1qeYBFnv}GusG^$6bWFyiJ@;IVuHKnD-+#aJ|KI=r=ltg?
zSBZ*Mf-4VWvN!-38G(`u*`-`(BLqS5)^V$)ekXS?Ed0DcfNd8ga#8JNQZORG@XUh(
z=)(AkLY)bbNmw8wXmKSvqXhu)0KE<{-;58Jn|QF7)q~yA3?`Y_2r%|Ez($5yEE^kB
zR=arEc;d*Rm)2cB=3wSS?{{cp(cgf;%v#_lY-1|jbBXh)92SNIMVlRyM*JalKkgwu
z>EYca_URV;%FkcmMtF!lyq^dKqZ1P8>#luLktBR1bVmC9$S*?ScWxu&(q6qrvyrAK
z-KKOHmCs=SU=3hNn@z5d?92DQwl|-<SS~CoNSe-9#j1p1tsOJ@6K16h6Yb1xQA+iL
zn}26yM{6d`n|-fdFDI_a(^;xFO^?;vtsnema?aUgx1c}-h{g<#T#(}%tdxAvI5Zyf
zxan<0<*C@=kh?$r;1<u3xjj9_=l^zexIHdi=haa@YsK5FKYm0m<8OR>tG~qk-ui1V
z_S|_fJ#?fp=h0|Q!ht9u+p4cT$7z1$qdcqJxrT<M`*Yk}J8z|l%5dfLtidGJ%?7)T
zfXPqew+|Eb2nmTh6QRyi;>Dy4m@Hkw#0l93fel&2GHo1=EMs71D(WE{8`{%OI7l~}
zaF8}E6@CU5)ZRV6JL#`R`=(|BZ~!LC9HCbGitc)fmX?sE`p^=E=~FZlli5Y5G0U1Y
z$LdR$)@f$`@&aw#E@m6h6_hdQeD}(q(o17id0WcWfh_D(T02QIiaI&%(_df4G@^<t
z$hlGgBh&$wJ7=Xw>=OkW)j}q^18_?1{qinAuI3Oma8RNVVa(C^V(iuUWBf}a!+5mm
z9L9krDMsVwXpD;HSd7EX5g7R`VKm=DuYc8Y0)JbzMqzxn^$f=8*6{z#x1cS=j%q-E
zGSP@`J&pM+sBCkg`iBE;WWZ)90O!(^Mak)jinOz$GifOzc^HGRWYQO&k}CTB&xAz+
zfD$$Up8x6~Y|M9)z(9$Y+s*)S{8^<MIsA%VfnGo&e7}7^&fVHh5>gpVOxXvQ+g)(U
zdkQ#}5alT_0N@S1un_3k5st(1I!MAd5{22qfsTEcnn%=F6jrk96ktlyNfIrm5#<U?
zI&Cr4iKsgX*lVp*h$&kwNth|HR)E43PU=iCeIC)_DTqD<xmr_uJPp?hd!HEsz&8iL
zS--MW_^8YQ=B64#vWt!vc9D!c7~B<#Lp@EKTji)J7HTS3FEla}S93Mf3D$MedFtP)
za;QW(9-<`rd5p4<vjYssGK68>be@=Ql6ZUxYmh~|VA~e`1)}d?Mzkwr=&b2RbtExV
zjE?G6xK`}=zvF_R4O$JN675lm?s_GT!5cb1EHRHHrpmD@uYyl)45lSLByp<>(YA2B
zmdD#M2=E444ync^=2eq$vxkl{=_QFPwXm+%&wWQkP>n7$mx*fWX8|DAt0k@u>r~WP
yygU}AZ_WP0=<hLV41k}Wb5}ifUaGgDl5XGVz&<_^tcJ1bz3^h6x#5VKiuwoqxOIL2

delta 1830
zcmZWp4NOy46uy0>l)v(?C=Ue+q5=U5GEfi@l|V}g6<YZbg5a_-ewGX}r?5?wOouvW
zuL?y#R#|~kprwF66GIT4C^#g`h6;0RfS753;FvNXyYD_I)-`$g&O7%z=R4=z(|6$|
zapon#i4`ynOaL%40<sOkXE|<02*M|MA^m5A_S%e${V_&>6-pVReDBPppl1_?S3VTL
zjf@crwWdTqVTFwFXD<@+lmLJy=;6X5^VLvca0^qiS^Z3Ggc|c$*vK<aW@F>wDr*aD
zjJul9M>Cs?O|a+imXB!TSqO{3p2@Ip*v6DpdgW@<82D9W_@3FmpW>$Yy>UJ*u|7T;
zUj|pe`rubfmJ4%dM$=LGyz1vsY5J2_^6qmL@x!AP(M|G!8`9pP_++oQS}Z{sulc3h
zb)drk1<)bN@ypX4x!q2d#RaJwwsl|1+1Fol(l!Nd%4sdz?s&Gy=44~=7gt>ahI=P2
zP8SSy6+}mJ2KqKTw|#rhB<I}POS|ln`Fu@>0sB^PW(M2A?bxT&frroRm*fGz1dr2f
z)`wm%lIq@%oS6T-@^zAP_FX|rV$Bt^fa@2=z0_7M-hsa}`5w2Wm7_Lxm%=sS&w>{1
zXBLP1F7GWIeOxvA8CS)YNJ?j_f+auBR?Vljvn0Jj?VlEh4ZA|J*DpFw^jNH19_kDl
z^F5gewSjy;CS|}};dAUrig`_7LoE7>Hg?8K8Q3!@9%5tTO3DTtq<xyUl{Ux&K`eZf
znE8e#i?jS`^65_=(w_bK8am;sgM*fsJav4A_KcT|(Z&Nb2wF?Zq%;3^ewwhN?!xuz
zp7~$~0EtWhHbYVTI_*N4cuA`~%m7D~RrS-Jtm;@g;Z3=eY4kM;KNoEvg9(aI+jn+@
zr}6cTg$)XKCfav6sMw<0duUs`jao1$s`bWrtoA*OH)=yLF4V?gjH&w=V`rTZqh);p
z#;p2ej6L-tjO&yF+OMR~?<nK&yF-H*V}3&h#>WlOZ|$?UD$<GSe`OZ|Sc7(Q`Bzg!
zL_w!0dzhs%qlN%GRV3qYIHX#S-xgFP;mU_$+O;r^Zx4lyG-+QWNhAs3NSOmXB4Wd8
zA=@)nz#wdy^e2E4G&%Z%@;d^6e+&T#URFa`Qxp-S3p^D=LQWH%)1iqZc8HdaT;QU{
z3>RK{@$UTyba4Wdi>H^zJ06oen_Mt4JITMjn2r8z)&OkRBX)~*f+i9N_&`kyikeB{
za>~*X2TrC~>O@D5R2_PX1ancoP`zCD({#CJo87T+)cncYa|QrFQvlrb$m|1{yidIb
z6X$;E4^g026lezn^@zJOF;T5{$5S6xlZ+kkjoKf-@iZjk5EN>n@S99S62g345sx%H
z?B=wP1mhrfhaEJ7vR1ms{m4CZT*sc0v*5-Poc~>x=uY~nQq*q+3jja8$_7f7f^DF=
z*4mM}*@bJnT{Ng)XEOkT^vKs?sFsh*Ii)3uZYi8obK!FL0X-$nGNhqI3!#5M_s%bA
zaG+-^7srcQN#bT1a(hraho=|TSHpXbCRd2YtiMn@%IWxWuE)Du2tkmn5RH5u32)V_
zwHSJ}MPjW(Z6vX`dZ`39tgN=ut;i#Eq?GH9rsVc|3d>)H2$XpjdK~o>LSbsVuVI&h
Ga{dRU8)+K=

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 28459f7b0c..3d1fe364bd 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Apr 11 15:10:59 EDT 2013
-zipStoreBase=GRADLE_USER_HOME
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.5-bin.zip
-distributionPath=wrapper/dists
+#Thu May 16 22:49:11 EDT 2013
 distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip
diff --git a/publish-maven.gradle b/publish-maven.gradle
index 1c636c833a..f5860924e8 100644
--- a/publish-maven.gradle
+++ b/publish-maven.gradle
@@ -31,7 +31,7 @@ def customizePom(pom, gradleProject) {
 		generatedPom.project {
 			name = gradleProject.description
 			description = gradleProject.description
-			url = 'https://github.com/SpringSource/spring-integration'
+			url = linkHomepage
 			organization {
 				name = 'SpringSource'
 				url = 'http://springsource.org'
@@ -43,10 +43,11 @@ def customizePom(pom, gradleProject) {
 					distribution 'repo'
 				}
 			}
+
 			scm {
-				url = 'https://github.com/SpringSource/spring-integration'
-				connection = 'scm:git:git://github.com/SpringSource/spring-integration'
-				developerConnection = 'scm:git:git://github.com/SpringSource/spring-integration'
+				url = linkScmUrl
+				connection = 'scm:git:' + linkScmConnection
+				developerConnection = 'scm:git:' + linkScmDevConnection
 			}
 
 			developers {