From b3f18afdd7b5940889b3ff6125448dddf2944351 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Wed, 10 Nov 2010 08:09:26 -0800
Subject: [PATCH] Further reorganization and polish of build script

---
 build.gradle                              |  30 +++++++++-------------
 buildSrc                                  |   2 +-
 docs/src/reference/docbook/.index.xml.swo | Bin 12288 -> 0 bytes
 spring-integration-jdbc/build.gradle      |   2 ++
 4 files changed, 15 insertions(+), 19 deletions(-)
 delete mode 100644 docs/src/reference/docbook/.index.xml.swo

diff --git a/build.gradle b/build.gradle
index 9582c9ff64..572396d417 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,19 +25,21 @@ import org.springframework.build.Version
 // @author Mark Fisher
 // -----------------------------------------------------------------------------
 
-
 // -----------------------------------------------------------------------------
 // Configuration for the root project
 // -----------------------------------------------------------------------------
-def buildSrcDir = "$rootDir/buildSrc"
-
-apply from: "$buildSrcDir/wrapper.gradle"
-apply plugin: 'idea'
-
 // used for artifact names, building doc upload urls, etc.
 description = 'Spring Integration'
 abbreviation = 'INT'
 
+apply plugin: 'base'
+apply plugin: 'idea'
+
+def buildSrcDir = "$rootDir/buildSrc"
+apply from: "$buildSrcDir/wrapper.gradle"
+apply from: "$buildSrcDir/maven-root-pom.gradle"
+
+
 
 // -----------------------------------------------------------------------------
 // Configuration for all projects including this one (the root project)
@@ -75,11 +77,11 @@ allprojects {
 //
 // @see configure(*) sections below
 // -----------------------------------------------------------------------------
-
 javaprojects = subprojects.findAll { project ->
     project.path.startsWith(':spring-integration-')
 }
 
+
 // -----------------------------------------------------------------------------
 // Configuration for all java subprojects
 // -----------------------------------------------------------------------------
@@ -415,20 +417,12 @@ project('spring-integration-xmpp') {
     }
 }
 
+// -----------------------------------------------------------------------------
+// Configuration for the docs subproject
+// -----------------------------------------------------------------------------
 project('docs') {
     apply from: "$buildSrcDir/docs.gradle"
 }
 
-// add basic tasks like 'clean' and 'assemble' to the root project. e.g.: allows
-// running `gradle clean` from the root project and deleting the build directory
-apply plugin: 'base'
-
-// add tasks like 'distArchive'
 apply from: "$buildSrcDir/dist.gradle"
-
-// add tasks like 'snapshotDependencyCheck'
 apply from: "$buildSrcDir/checks.gradle"
-
-// add 'generatePom' task to generate root pom with <modules> section
-apply from: "$buildSrcDir/maven-root-pom.gradle"
-
diff --git a/buildSrc b/buildSrc
index 86070e09b5..7b64fc1098 160000
--- a/buildSrc
+++ b/buildSrc
@@ -1 +1 @@
-Subproject commit 86070e09b55613c3a97e462e25df7a5a5c572f74
+Subproject commit 7b64fc109828edf1b3d08c9bef07fc00a984c3dc
diff --git a/docs/src/reference/docbook/.index.xml.swo b/docs/src/reference/docbook/.index.xml.swo
deleted file mode 100644
index 782ad922c7ef9bcfd62aaff35a6cbf56a1ca559a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2O^n+_6vy52(Lz~31yKPP*MQ*A#M!M7-Ni|zQd;fOFZBaZFLYv0oN4SCGc!)I
zpuz=ioH#+n0aPT!0VIyVsZc=N;DX=^5>(>A1tbnV@V6811~#!*>Iros{WkLW&3iNd
z89z_7uibcd`KbLweZj)#Zp-?0>o-SMFJ0Ptxwggf+mysAyHWljob-q$^+@<6DlvU!
z<j{Ri$eybb$#_^}T+>hz%><v;6bN6rO8Ty(9V#jJsf(tz5IvXifDY@!xGZAHV9YI}
zz>TCpsynrPbJpI4`9?PFhn(H^Jv-0bND7#_8U>63MggOMQNSo*6fg=H1#Wl+bh5>I
z6)J2UE72Z*Z~4#n_|kkC1&jhl0i%FXz$jo8FbWt2i~>dhqkvJsDDXd2fCQGc3qSrp
zzX^lK|No2M|3BSjS*u_LJOJjv4|iJD+aLr@;DMdM0zc1L*1KQ`eDD<b`wq+c1$+lS
z1D}Eqz*|6rli&c@3+BMp9hUVY_!hhmUIQBVpamWTJHWNuVFx||?}0Y~2hV^f!5*+3
zT)ho;;45$iTmS-aa1Oix7QwyXkL`#HE`k^=gGa!%ZJ0Os7`zV7fhM>g{CO+<f{P#q
zE8sD(4g7YCWql3a0WX2GU?128{<_(+z6T$HH$Vp*0QZ64u?|<jmmph{%fNh$0#g+5
z+^i0!Wm&fE4cQXoev}5(?xIwt>C{m%qeLows<Ijx$8F6p^9Ap)FddcPOqlMj)uwq>
zBu=6=pS9X7x1kiGzdGS>$_N$pQ^|CN6-Hm~hW07fV-tJEER~k1Wh(bGjFY6?;(VMJ
z9L*LpCahwxtRh5L>rGfN-WNS8D<&;tRz9CW#ojm{R~ZCtzdS^TMYLj=F;$9$wAN)x
z3t6!nv?N>+KdTq37+c{sN!t-qT@;&@k2EBj4oF4#wq!wAOlZbl^Sgxc@>l_l$m-hq
z&G3T<n7){1HE+d2&oCrmC@F?7D(qAeF|Dh-<qCI%jH?W>w3W`JNGoli7w0spk$@zX
z#)`^5^Jy*H0{!YKQywG&HHPKOF&;s=(Re?V8;O24J~}9@vK7<9Z+UL^H&4}h)@HmT
zveb#&5tc6ELSt4fFCmh&zWC5Sl~+fe$`iP~%>DWvd!aGk@Z8+Mb0<4xUg5_jsqPAi
z#G57~*XxbNHCj|EIf-fOh~S~;7FW58+)al`rE`lFp}L;Cem%DFMsW(4Mcm?gBE-p5
zDH=uPQ4SNidR<Y@cJcD+iB$FAr))mQA=-6CIzgo7RF+3s5uB(gVW7*Vg*%i+L3xzr
z0cCtjl+DLDAVNX$D6#TDM~P(VwE1j4(jjEuD%B9CS2dk+#PJ5tccX_>iv9GlgZAm;
z2ansM(@3`KV;V3b+UKdSi+$<2EXG^r-;J=%TLY9Y+u5rsKRe}3%8j5<J>j8aXW5YG
zrgP%hVaFyB3whJ=ap<6ObQH)RoC)`~6cKGYU5$fRMSOcx&ZmzvtBcO6p?kyi!`^6?
z6N4|F+Kt2Oi1FaO4RYnWW|}V98n0!WDgLOoRaXq~8nx4;o@+f?0!brE6t*KW+QTm+
z|0%qiFL)Tzdi%&Sks?U_QF0k2IHb0<@^9p}iTk4-nrS#`w<YbjHukV5!%dn_be`7j
zWKm0QA0<2`NKkp_Y^A*HNWGq%arWeDX&5oy%a&6oORhT@4C;fub!1w1esOWp&F_wt
z9NV*L#tV(cy!$+Id3H*7tUQvPcUZF?m$v7=xhg8%9eXTl(|Nq!aI!v2END6#E9h%$
gRr2t^A9m|K=d+$TONam~*mTaEK2+Q1>~C5B02%vB(f|Me

diff --git a/spring-integration-jdbc/build.gradle b/spring-integration-jdbc/build.gradle
index 92540e21a2..9bbfcaa323 100644
--- a/spring-integration-jdbc/build.gradle
+++ b/spring-integration-jdbc/build.gradle
@@ -1,3 +1,5 @@
+//apply plugin: 'java'
+
 /**
  * Generate schema creation and drop scripts for various databases
  * supported by the Spring Integration JDBC adapter.