From 247dee3debe23b3a79c83450b64189e5a14e50d7 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@gopivotal.com>
Date: Thu, 23 Apr 2015 11:04:38 -0500
Subject: [PATCH] LDAP-324: Update to Gradle 2.3

---
 build.gradle                             |  8 ++--
 gradle/java.gradle                       |  8 ++--
 gradle/maven-deployment.gradle           | 56 ++++++++++--------------
 gradle/wrapper/gradle-wrapper.properties |  4 +-
 gradlew                                  |  2 +-
 gradlew.bat                              |  2 +-
 6 files changed, 37 insertions(+), 43 deletions(-)

diff --git a/build.gradle b/build.gradle
index 69390790..3279615c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,13 +3,13 @@ buildscript {
         maven { url 'https://repo.spring.io/plugins-release' }
     }
     dependencies {
-        classpath("org.springframework.build.gradle:propdeps-plugin:0.0.3")
-        classpath('org.asciidoctor:asciidoctor-gradle-plugin:0.7.0')
-        classpath 'org.springframework.build.gradle:spring-io-plugin:0.0.3.RELEASE'
+        classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7")
+        classpath('org.asciidoctor:asciidoctor-gradle-plugin:1.5.1')
+        classpath("org.springframework.build.gradle:spring-io-plugin:0.0.3.RELEASE")
     }
 }
 
-apply plugin: "asciidoctor"
+apply plugin: 'org.asciidoctor.gradle.asciidoctor'
 apply plugin: "sonar-runner"
 
 ext.GRADLE_SCRIPT_DIR = "${rootProject.projectDir}/gradle"
diff --git a/gradle/java.gradle b/gradle/java.gradle
index 7ebdb2f1..22bd69db 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -16,7 +16,7 @@ ext.gsbaseVersion = '2.0.1'
 ext.log4jVersion = '1.2.15'
 ext.mockitoVersion = '1.9.5'
 ext.queryDslVersion = '3.2.4'
-ext.slf4jVersion = '1.7.5'
+ext.slf4jVersion = '1.7.7'
 ext.powerMockVersion = '1.5.1'
 
 ext.powerMockDependencies = [
@@ -24,7 +24,9 @@ ext.powerMockDependencies = [
     "org.powermock:powermock-api-support:$powerMockVersion",
     "org.powermock:powermock-module-junit4-common:$powerMockVersion",
     "org.powermock:powermock-module-junit4:$powerMockVersion",
-    "org.powermock:powermock-api-mockito:$powerMockVersion",
+    dependencies.create("org.powermock:powermock-api-mockito:$powerMockVersion") {
+        exclude group: 'org.mockito', module: 'mockito-all'
+    },
     "org.powermock:powermock-reflect:$powerMockVersion"
 ]
 
@@ -39,5 +41,5 @@ ext.apachedsDependencies = [
 
 repositories {
     mavenCentral()
-	maven { url 'https://repo.spring.io/libs-snapshot' }
+    maven { url 'https://repo.spring.io/libs-snapshot' }
 }
\ No newline at end of file
diff --git a/gradle/maven-deployment.gradle b/gradle/maven-deployment.gradle
index 4c105de8..570a1888 100644
--- a/gradle/maven-deployment.gradle
+++ b/gradle/maven-deployment.gradle
@@ -81,39 +81,31 @@ def customizePom(pom, gradleProject) {
                 }
             }
         }
+    }
 
-        build {
-            plugins {
-                plugin {
-                    groupId = 'org.apache.maven.plugins'
-                    artifactId = 'maven-compiler-plugin'
-                    configuration {
-                        source = '1.6'
-                        target = '1.6'
-                    }
-                }
-                if(isWar) {
-                    plugin {
-                        groupId = 'org.apache.maven.plugins'
-                        artifactId = 'maven-war-plugin'
-                        version = '2.3'
-                        configuration {
-                            failOnMissingWebXml = 'false'
-                        }
-                    }
-
-                    plugin {
-                        groupId = 'org.mortbay.jetty'
-                        artifactId = 'jetty-maven-plugin'
-                        version = '8.1.14.v20131031'
-                        configuration {
-                            webAppConfig {
-                                contextPath = "/" + projectName
-                            }
-                        }
-                    }
-                }
-            }
+    // http://forums.gradle.org/gradle/topics/after_upgrade_gradle_to_2_0_version_the_maven_pom_not_support_build_property
+    pom.withXml {
+        def plugins = asNode().appendNode('build').appendNode('plugins')
+        plugins
+            .appendNode('plugin')
+                .appendNode('artifactId','maven-compiler-plugin').parent()
+                .appendNode('configuration')
+                    .appendNode('source', '1.6').parent()
+                    .appendNode('target','1.6')
+            .appendNode('plugin')
+                .appendNode('groupId','org.mortbay.jetty').parent()
+                .appendNode('artifactId','jetty-maven-plugin').parent()
+                .appendNode('version','8.1.14.v20131031').parent()
+                .appendNode('configuration')
+                    .appendNode('webAppConfig')
+                        .appendNode('contextPath',"/" + projectName)
+        if(isWar) {
+            plugins
+                .appendNode('plugin')
+                    .appendNode('artifactId','maven-war-plugin').parent()
+                    .appendNode('version','2.3').parent()
+                    .appendNode('configuration')
+                        .appendNode('failOnMissingWebXml','false')
         }
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7a98b914..a4fa4599 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jul 05 13:57:19 CDT 2013
+#Thu Apr 23 10:41:35 CDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.7-rc-1-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-2.3-all.zip
diff --git a/gradlew b/gradlew
index 89380a06..91a7e269 100755
--- a/gradlew
+++ b/gradlew
@@ -7,7 +7,7 @@
 ##############################################################################
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS="-Xmx1024M -XX:MaxPermSize=256M"
+DEFAULT_JVM_OPTS=""
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
diff --git a/gradlew.bat b/gradlew.bat
index bbc4099e..aec99730 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -9,7 +9,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=-Xmx1024M -XX:MaxPermSize=256M
+set DEFAULT_JVM_OPTS=
 
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.