#197 Applying properties plugin before ml-gradle

Rob Rudin · Rob Rudin · commit 8b5f9f2dddd4 · 2017-05-21T08:22:26.000-04:00
diff --git a/build.gradle b/build.gradle
@@ -87,11 +87,11 @@ pluginBundle {
       displayName = 'ml-gradle for MarkLogic'
       description = 'Gradle plugin for configuring and deploying applications to MarkLogic'
       tags = ['marklogic']
-      version = "2.7.0"
+      version = "2.7.1"
     }
   }
 
   mavenCoordinates {
-    version = "2.7.0"
+    version = "2.7.1"
   }
 }
diff --git a/examples/alert-project/build.gradle b/examples/alert-project/build.gradle
@@ -1,7 +1,7 @@
 plugins {
   id "java"
   id "eclipse"
-  id "com.marklogic.ml-gradle" version "2.7.0"
+  id "com.marklogic.ml-gradle" version "2.7.1"
 }
 
 /**
diff --git a/examples/corb2-project/build.gradle b/examples/corb2-project/build.gradle
@@ -23,7 +23,7 @@ buildscript {
 }
 
 plugins {
-    id "com.marklogic.ml-gradle" version "2.7.0"
+    id "com.marklogic.ml-gradle" version "2.7.1"
 }
 
 repositories {
diff --git a/examples/cpf-project/build.gradle b/examples/cpf-project/build.gradle
@@ -1,7 +1,7 @@
 plugins {
   id "java"
   id "eclipse"
-  id "com.marklogic.ml-gradle" version "2.7.0"
+  id "com.marklogic.ml-gradle" version "2.7.1"
 }
 
 repositories {
diff --git a/examples/custom-forests-and-replicas-project/build.gradle b/examples/custom-forests-and-replicas-project/build.gradle
@@ -1,3 +1,3 @@
 plugins {
-	id "com.marklogic.ml-gradle" version "2.7.0"
+	id "com.marklogic.ml-gradle" version "2.7.1"
 }
diff --git a/examples/entity-services-project/build.gradle b/examples/entity-services-project/build.gradle
@@ -1,3 +1,3 @@
 plugins {
-	id "com.marklogic.ml-gradle" version "2.7.0"
+	id "com.marklogic.ml-gradle" version "2.7.1"
 }
diff --git a/examples/failover-project/build.gradle b/examples/failover-project/build.gradle
@@ -1,3 +1,3 @@
 plugins {
-	id "com.marklogic.ml-gradle" version "2.7.0"
+	id "com.marklogic.ml-gradle" version "2.7.1"
 }
diff --git a/examples/flexrep-project/build.gradle b/examples/flexrep-project/build.gradle
@@ -11,7 +11,7 @@
  */
 
 plugins {
-  id "com.marklogic.ml-gradle" version "2.7.0"
+  id "com.marklogic.ml-gradle" version "2.7.1"
 }
 
 ext {
diff --git a/examples/httpbuilder-project/build.gradle b/examples/httpbuilder-project/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 }
 
 plugins {
-	id "com.marklogic.ml-gradle" version "2.7.0"
+	id "com.marklogic.ml-gradle" version "2.7.1"
 }
 
 /*
diff --git a/examples/ignore-resources-project/build.gradle b/examples/ignore-resources-project/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id "com.marklogic.ml-gradle" version "2.7.0"
+	id "com.marklogic.ml-gradle" version "2.7.1"
 }
 
 ext {
diff --git a/examples/mimetypes-project/build.gradle b/examples/mimetypes-project/build.gradle
@@ -1,3 +1,3 @@
 plugins {
-  id "com.marklogic.ml-gradle" version "2.7.0"
+  id "com.marklogic.ml-gradle" version "2.7.1"
 }
diff --git a/examples/minimal-project/build.gradle b/examples/minimal-project/build.gradle
@@ -7,5 +7,5 @@
  */
 
 plugins {
-  id "com.marklogic.ml-gradle" version "2.7.0"
+  id "com.marklogic.ml-gradle" version "2.7.1"
 }
diff --git a/examples/no-appservers-project/build.gradle b/examples/no-appservers-project/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.marklogic.ml-gradle" version "2.7.0"
+  id "com.marklogic.ml-gradle" version "2.7.1"
 }
 
 ext {
diff --git a/examples/properties-project/build.gradle b/examples/properties-project/build.gradle
@@ -2,8 +2,8 @@ plugins {
 	// The properties plugin must be applied BEFORE ml-gradle so that ml-gradle sees the results of the properties plugin
 	// processing the gradle-(environmentName).properties files.
 	id "net.saliman.properties" version "1.4.6"
-	
-	id "com.marklogic.ml-gradle" version "2.7.0"
+
+	id "com.marklogic.ml-gradle" version "2.7.1"
 }
 
 task printHost {
diff --git a/examples/role-project/build.gradle b/examples/role-project/build.gradle
@@ -1,3 +1,3 @@
 plugins {
-	id "com.marklogic.ml-gradle" version "2.7.0"
+	id "com.marklogic.ml-gradle" version "2.7.1"
 }
diff --git a/examples/roxy-project/build.gradle b/examples/roxy-project/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.marklogic.ml-gradle" version "2.7.0"
+  id "com.marklogic.ml-gradle" version "2.7.1"
 }
 
 /**
diff --git a/examples/sample-project/build.gradle b/examples/sample-project/build.gradle
@@ -3,7 +3,7 @@
  * that those blocks can override properties before ml-gradle initializes itself.
  */
 plugins {
-  id "com.marklogic.ml-gradle" version "2.7.0"
+  id "com.marklogic.ml-gradle" version "2.7.1"
 
   // The following plugins are optional
 
diff --git a/examples/shell-project/build.gradle b/examples/shell-project/build.gradle
@@ -1,6 +1,6 @@
 plugins {
   id "java"
-  id "com.marklogic.ml-gradle" version "2.7.0"
+  id "com.marklogic.ml-gradle" version "2.7.1"
 }
 
 repositories {
diff --git a/examples/ssl-project/build.gradle b/examples/ssl-project/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.marklogic.ml-gradle" version "2.7.0"
+  id "com.marklogic.ml-gradle" version "2.7.1"
 }
 
 /*
diff --git a/examples/temporal-lsqt-project/build.gradle b/examples/temporal-lsqt-project/build.gradle
@@ -1,3 +1,3 @@
 plugins {
-	id "com.marklogic.ml-gradle" version "2.7.0"
+	id "com.marklogic.ml-gradle" version "2.7.1"
 }
diff --git a/examples/temporal-project/build.gradle b/examples/temporal-project/build.gradle
@@ -1,3 +1,3 @@
 plugins {
-	id "com.marklogic.ml-gradle" version "2.7.0"
+	id "com.marklogic.ml-gradle" version "2.7.1"
 }
diff --git a/examples/triggers-project/build.gradle b/examples/triggers-project/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.marklogic.ml-gradle" version "2.7.0"
+  id "com.marklogic.ml-gradle" version "2.7.1"
 }
 
 /**
diff --git a/examples/use-modulesdb-project/build.gradle b/examples/use-modulesdb-project/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "com.marklogic.ml-gradle" version "2.7.0"
+  id "com.marklogic.ml-gradle" version "2.7.1"
 }
 
 ext {
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 group=com.marklogic
-version=2.7.0
+version=2.7.1
 mlAppDeployerDependency=com.marklogic:ml-app-deployer:2.7.0
 mlcpUtilDependency=com.marklogic:mlcp-util:0.3.0
 
diff --git a/src/main/groovy/com/marklogic/gradle/task/NewProjectTask.groovy b/src/main/groovy/com/marklogic/gradle/task/NewProjectTask.groovy
@@ -41,8 +41,8 @@ class NewProjectTask extends MarkLogicTask {
 
 		if (ant.mlPropertiesPlugin == "y") {
 			def text = 'plugins {' +
-				'\n  id "com.marklogic.ml-gradle" version "2.7.0"' +
 				'\n  id "net.saliman.properties" version "1.4.6"' +
+				'\n  id "com.marklogic.ml-gradle" version "2.7.1"' +
 				'\n}'
 			println "Updating build.gradle so that the Gradle properties plugin can be applied"
 			writeFile("build.gradle", text)

Original file line number	Diff line number	Diff line change
`@@ -87,11 +87,11 @@ pluginBundle {`
`87`	`87`	`displayName = 'ml-gradle for MarkLogic'`
`88`	`88`	`description = 'Gradle plugin for configuring and deploying applications to MarkLogic'`
`89`	`89`	`tags = ['marklogic']`
`90`		`- version = "2.7.0"`
	`90`	`+ version = "2.7.1"`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`mavenCoordinates {`
`95`		`- version = "2.7.0"`
	`95`	`+ version = "2.7.1"`
`96`	`96`	`}`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id "java"`
`3`	`3`	`id "eclipse"`
`4`		`- id "com.marklogic.ml-gradle" version "2.7.0"`
	`4`	`+ id "com.marklogic.ml-gradle" version "2.7.1"`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ buildscript {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`plugins {`
`26`		`- id "com.marklogic.ml-gradle" version "2.7.0"`
	`26`	`+ id "com.marklogic.ml-gradle" version "2.7.1"`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`plugins {`
`2`		`- id "com.marklogic.ml-gradle" version "2.7.0"`
	`2`	`+ id "com.marklogic.ml-gradle" version "2.7.1"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*/`
`12`	`12`
`13`	`13`	`plugins {`
`14`		`- id "com.marklogic.ml-gradle" version "2.7.0"`
	`14`	`+ id "com.marklogic.ml-gradle" version "2.7.1"`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`ext {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`plugins {`
`8`		`- id "com.marklogic.ml-gradle" version "2.7.0"`
	`8`	`+ id "com.marklogic.ml-gradle" version "2.7.1"`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id "com.marklogic.ml-gradle" version "2.7.0"`
	`2`	`+ id "com.marklogic.ml-gradle" version "2.7.1"`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`ext {`