Upgraded to Gradle 1.3 and latest DocBook reference plugin

Author: habuma

build.gradle

@@ -3,7 +3,7 @@ buildscript {
         maven { url 'http://repo.springsource.org/plugins-release' }
     }
     dependencies {
-        classpath 'org.springframework.build.gradle:docbook-reference-plugin:0.1.3'
+        classpath 'org.springframework.build.gradle:docbook-reference-plugin:0.2.2'
     }
 }
 
@@ -97,10 +97,10 @@ configure(subprojects) { subproject ->
 project('spring-social-facebook') {
     description = 'Facebook API'
     dependencies {
-        compile "org.springframework.social:spring-social-core:$springSocialVersion"
-        compile "org.springframework.social:spring-social-config:$springSocialVersion"
-        compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
-        testCompile "org.springframework:spring-test-mvc:$springTestMvcVersion"
+        compile ("org.springframework.social:spring-social-core:$springSocialVersion")
+        compile ("org.springframework.social:spring-social-config:$springSocialVersion")
+        compile ("org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion")
+        testCompile ("org.springframework:spring-test-mvc:$springTestMvcVersion")
     }
 }
 
@@ -114,7 +114,7 @@ project('spring-social-facebook-web') {
         compile ("org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion", optional)
         compile ("javax.servlet:servlet-api:$servletApiVersion", provided)
         compile ("javax.servlet.jsp:jsp-api:$jspApiVersion", provided)
-        testCompile "org.springframework:spring-test-mvc:$springTestMvcVersion"
+        testCompile ("org.springframework:spring-test-mvc:$springTestMvcVersion")
     }
 }
 
@@ -245,7 +245,7 @@ configure(rootProject) {
 
     task wrapper(type: Wrapper) {
         description = 'Generates gradlew[.bat] scripts'
-        gradleVersion = '1.1'
+        gradleVersion = '1.3'
     }
 
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Sep 06 10:40:29 CDT 2012
+#Tue Dec 11 10:05:48 CST 2012
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.1-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.3-bin.zip

publish-maven.gradle

@@ -1,10 +1,10 @@
 apply plugin: 'maven'
 
-optionalDeps = []
-providedDeps = []
+ext.optionalDeps = []
+ext.providedDeps = []
 
-optional = { optionalDeps << it }
-provided = { providedDeps << it }
+ext.optional = { optionalDeps << it }
+ext.provided = { providedDeps << it }
 
 install {
     repositories.mavenInstaller {
@@ -16,10 +16,10 @@ def customizePom(pom, gradleProject) {
     pom.whenConfigured { generatedPom ->
         // respect 'optional' and 'provided' dependencies
         gradleProject.optionalDeps.each { dep ->
-            generatedPom.dependencies.find { it.artifactId == dep.name }?.optional = true
+            generatedPom.dependencies.findAll { it.artifactId == dep.name }*.optional = true
         }
         gradleProject.providedDeps.each { dep ->
-            generatedPom.dependencies.find { it.artifactId == dep.name }?.scope = 'provided'
+            generatedPom.dependencies.findAll { it.artifactId == dep.name }*.scope = 'provided'
         }
 
         // eliminate test-scoped dependencies (no need in maven central poms)

settings.gradle

@@ -16,6 +16,5 @@
 
 rootProject.name = 'spring-social-facebook'
 
-include 'docs'
 include 'spring-social-facebook'
 include 'spring-social-facebook-web'

src/reference/docbook/index.xml

@@ -1,42 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<book xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="spring-social-reference"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xlink="http://www.w3.org/1999/xlink">
-  <bookinfo>
+<book xml:id="spring-framework-reference"
+  xmlns="http://docbook.org/ns/docbook" version="5.0"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xl="http://www.w3.org/1999/xlink"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="
+      http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd 
+      http://www.w3.org/1999/xlink http://www.docbook.org/xml/5.0/xsd/xlink.xsd">
+
+  <info>
     <title>Spring Social Facebook Reference Manual</title>
-    <titleabbrev>Spring Social Facebook ${version}</titleabbrev>
     <productname>Spring Social Facebook</productname>
-    <releaseinfo>${version}</releaseinfo>
 
-    <!-- TODO: this isn't showing up. -->
-    <mediaobject>
-      <imageobject role="fo">
-        <imagedata fileref="images/logo.png"
-          format="PNG" align="center"/>
-      </imageobject>
-      <imageobject role="html">
-        <imagedata fileref="images/logo.png" format="PNG" align="center"/>
-      </imageobject>
-    </mediaobject>
-    <!-- END TODO -->
+    <releaseinfo>${version}</releaseinfo>
 
     <authorgroup>
       <author>
-        <firstname>Craig</firstname>
-        <surname>Walls</surname>
+        <personname>
+          <firstname>Craig</firstname>
+          <surname>Walls</surname>
+        </personname>
       </author>
       <author>
-        <firstname>Keith</firstname>
-        <surname>Donald</surname>
+        <personname>
+          <firstname>Keith</firstname>
+          <surname>Donald</surname>
+        </personname>
       </author>
     </authorgroup>
 
-    <legalnotice><para>© SpringSource Inc., 2011</para></legalnotice>
-  </bookinfo>
+    <copyright>
+      <year>2011-2012</year>
+    </copyright>
 
+    <legalnotice>
+      <para>Copies of this document may be made for your own use and for
+        distribution to others, provided that you do not charge any fee for such
+        copies and further provided that each copy contains this Copyright
+        Notice, whether distributed in print or electronically.</para>
+    </legalnotice>
+  </info>
   <toc></toc>
 
     <xi:include href="./overview.xml"/>
     <xi:include href="./connecting.xml"/>
     <xi:include href="./api.xml" />
+  
 </book>