From 9592d828bc898828cb198c7a51e773a6642e8ca6 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 4 Nov 2014 09:36:04 +0100
Subject: [PATCH 2/2] Enable XMvn local mode

---
 build.gradle                             | 28 +++-------------------------
 buildSrc/build.gradle                    |  6 ------
 buildSrc/src/main/groovy/PdfGuide.groovy | 12 ------------
 3 files changed, 3 insertions(+), 43 deletions(-)

diff --git a/build.gradle b/build.gradle
index 71fa27c..638cfdb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -89,6 +89,7 @@ jar {
 jar.dependsOn copyDSLDefinitions
 
 repositories {
+    xmvn()
     if (project.hasProperty('gpars_useMavenLocal') && gpars_useMavenLocal) {
         mavenLocal()
     }
@@ -115,28 +116,10 @@ configurations {
 
 dependencies {
     compile group: 'org.codehaus.groovy', name: 'groovy-all', version: project.hasProperty('gpars_groovyVersion') ? gpars_groovyVersion : '2.1.9'
-    compile 'org.codehaus.jsr166-mirror:jsr166y:1.7.0'
+    compile 'org.codehaus.jsr166-mirror:extra166y:1.7.0'
     compile('org.multiverse:multiverse-core:0.7.0') { transitive = false }
-    compile group: 'org.jboss.netty', name: 'netty', version: project.hasProperty('gpars_nettyVersion') ? gpars_nettyVersion : '3.2.9.Final'
+    compile group: 'org.jboss.netty', name: 'netty', version: project.hasProperty('gpars_nettyVersion') ? gpars_nettyVersion : '3'
     compile 'org.codehaus.jcsp:jcsp:1.1-rc5'
-    testCompile group: 'junit', name: 'junit', version: project.hasProperty('gpars_junitVersion') ? gpars_junitVersion : '4.11'
-    testCompile group: 'org.spockframework', name: 'spock-core', version: project.hasProperty('gpars_spockVersion') ? gpars_spockVersion : '0.7-groovy-2.0'
-    testCompile 'com.google.code.gson:gson:2.2.2'
-    testCompile 'com.google.guava:guava:14.0.1'
-    testCompile fileTree(dir: 'lib', include: '*.jar')
-    //  Manually load up the required dependencies for grailsDoc to avoid pulling in everything needed for
-    //  Grails, including all the SpringRoo stuff.
-    docs group: 'org.codehaus.groovy', name: 'groovy-all', version: project.hasProperty('gpars_groovyVersion') ? gpars_groovyVersion : '2.0.8'
-    docs 'org.yaml:snakeyaml:1.12'
-    docs 'commons-lang:commons-lang:2.6'
-    docs project.ext.grailsDocs
-    docs project.ext.radeox
-    docs project.ext.lowagieItext
-    docs project.ext.xhtmlRenderer
-    docs 'commons-logging:commons-logging:1.1.1'
-    deployerJars "org.apache.maven.wagon:wagon-http-lightweight:2.4"
-    cover 'net.sourceforge.cobertura:cobertura:1.9.4.1'
-    testRuntime 'net.sourceforge.cobertura:cobertura:1.9.4.1'
 }
 
 task runBenchmarks(type: JavaExec) {
@@ -300,11 +283,6 @@ task zipSrc(type: Jar, dependsOn: classes) {
     from sourceSets.main.allSource
 }
 
-artifacts {
-    archives(zipSrc)
-    archives(zipDoc)
-}
-
 task zipSamples(type: Zip) {
     appendix = 'samples'
     from sourceSets.test.allSource.matching {
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 2516924..829175c 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -22,8 +22,6 @@
 
 apply plugin: 'groovy'
 
-apply from: '../gradle/docsDependencies.gradle'
-
 repositories {
   mavenCentral()
   //mavenRepo name: 'SpringSource', url: 'http://repository.springsource.com/maven/bundles/release'
@@ -33,8 +31,4 @@ repositories {
 dependencies {
 	compile localGroovy()
   compile gradleApi()
-  compile(project.ext.grailsDocs) { transitive = false }
-  compile(project.ext.xhtmlRenderer) { transitive = false }
-  compile(project.ext.lowagieItext) { transitive = false }
-  compile(project.ext.radeox) { transitive = false }
 }
diff --git a/buildSrc/src/main/groovy/PdfGuide.groovy b/buildSrc/src/main/groovy/PdfGuide.groovy
index 4ada443..b2d1ae9 100644
--- a/buildSrc/src/main/groovy/PdfGuide.groovy
+++ b/buildSrc/src/main/groovy/PdfGuide.groovy
@@ -24,7 +24,6 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
-import grails.doc.PdfBuilder
 
 class PdfGuide extends DefaultTask {
 
@@ -38,17 +37,6 @@ class PdfGuide extends DefaultTask {
 
     @TaskAction
     def publish() {
-        try {
-            PdfBuilder.build(
-                    basedir: outputDirectory.absolutePath,
-                    home: project.file('grails-doc').absolutePath,
-                    tool: 'pdf/gpars'
-            )
-        } catch (ignore) {
-            // it's very likely that the stream is closed before
-            // the renderer 'finishes' but it actually does
-            // ignore for now
-        }
         project.file(outputDirectory.absolutePath + '/guide/single.pdf')
                 .renameTo(new File(outputDirectory, pdfName).absolutePath)
     }
-- 
2.1.0