spring-projects
diff --git a/Collapse file
‎build.gradle‎
Copy file name to clipboardExpand all lines: build.gradle
+2-2Lines changed: 2 additions & 2 deletions b/Collapse file
‎build.gradle‎
Copy file name to clipboardExpand all lines: build.gradle
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/Collapse file
‎buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy‎
Copy file name to clipboardExpand all lines: buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy
+4-3Lines changed: 4 additions & 3 deletions b/Collapse file
‎buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy‎
Copy file name to clipboardExpand all lines: buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy
+4-3Lines changed: 4 additions & 3 deletions
diff --git a/Collapse file
‎gradle/wrapper/gradle-wrapper.properties‎
Copy file name to clipboardExpand all lines: gradle/wrapper/gradle-wrapper.properties
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎gradle/wrapper/gradle-wrapper.properties‎
Copy file name to clipboardExpand all lines: gradle/wrapper/gradle-wrapper.properties
+1-1Lines changed: 1 addition & 1 deletion
@@ -4,7 +4,7 @@ buildscript {
 	}
 	dependencies {
 		classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7")
-		classpath("org.springframework.build.gradle:docbook-reference-plugin:0.2.8")
+		classpath("io.spring.gradle:docbook-reference-plugin:0.3.1")
 	}
 }
 
@@ -1050,7 +1050,7 @@ configure(rootProject) {
 
 	task wrapper(type: Wrapper) {
 		description = "Generates gradlew[.bat] scripts"
-		gradleVersion = "1.12"
+		gradleVersion = "2.5"
 
 		doLast() {
 			def gradleOpts = "-XX:MaxPermSize=1024m -Xmx1024m"
 
@@ -68,8 +68,8 @@ class MergePlugin implements Plugin<Project> {
 		Configuration runtimeMerge = project.configurations.create("runtimeMerge")
 
 		// Ensure the IDE can reference merged projects
-		project.eclipse.classpath.plusConfigurations += [runtimeMerge]
-		project.idea.module.scopes.PROVIDED.plus += runtimeMerge
+		project.eclipse.classpath.plusConfigurations += [ runtimeMerge ]
+		project.idea.module.scopes.PROVIDED.plus += [ runtimeMerge ]
 
 		// Hook to perform the actual merge logic
 		project.afterEvaluate{
@@ -132,8 +132,9 @@ class MergePlugin implements Plugin<Project> {
 						intoConfiguration.dependencies.add(it)
 					}
 				}
+				def index = project.parent.childProjects.findIndexOf {p -> p.getValue() == project}
 				project.merge.into.install.repositories.mavenInstaller.pom.scopeMappings.addMapping(
-					mapping.priority + 100, intoConfiguration, mapping.scope)
+					mapping.priority + 100 + index, intoConfiguration, mapping.scope)
 			}
 		}
 	}
 
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-bin.zip
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ buildscript {`
`4`	`4`	`}`
`5`	`5`	`dependencies {`
`6`	`6`	`classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7")`
`7`		`- classpath("org.springframework.build.gradle:docbook-reference-plugin:0.2.8")`
	`7`	`+ classpath("io.spring.gradle:docbook-reference-plugin:0.3.1")`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`
`@@ -1050,7 +1050,7 @@ configure(rootProject) {`
`1050`	`1050`
`1051`	`1051`	`task wrapper(type: Wrapper) {`
`1052`	`1052`	`description = "Generates gradlew[.bat] scripts"`
`1053`		`- gradleVersion = "1.12"`
	`1053`	`+ gradleVersion = "2.5"`
`1054`	`1054`
`1055`	`1055`	`doLast() {`
`1056`	`1056`	`def gradleOpts = "-XX:MaxPermSize=1024m -Xmx1024m"`
Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,8 @@ class MergePlugin implements Plugin<Project> {`
`68`	`68`	`Configuration runtimeMerge = project.configurations.create("runtimeMerge")`
`69`	`69`
`70`	`70`	`// Ensure the IDE can reference merged projects`
`71`		`- project.eclipse.classpath.plusConfigurations += [runtimeMerge]`
`72`		`- project.idea.module.scopes.PROVIDED.plus += runtimeMerge`
	`71`	`+ project.eclipse.classpath.plusConfigurations += [ runtimeMerge ]`
	`72`	`+ project.idea.module.scopes.PROVIDED.plus += [ runtimeMerge ]`
`73`	`73`
`74`	`74`	`// Hook to perform the actual merge logic`
`75`	`75`	`project.afterEvaluate{`
`@@ -132,8 +132,9 @@ class MergePlugin implements Plugin<Project> {`
`132`	`132`	`intoConfiguration.dependencies.add(it)`
`133`	`133`	`}`
`134`	`134`	`}`
	`135`	`+ def index = project.parent.childProjects.findIndexOf {p -> p.getValue() == project}`
`135`	`136`	`project.merge.into.install.repositories.mavenInstaller.pom.scopeMappings.addMapping(`
`136`		`- mapping.priority + 100, intoConfiguration, mapping.scope)`
	`137`	`+ mapping.priority + 100 + index, intoConfiguration, mapping.scope)`
`137`	`138`	`}`
`138`	`139`	`}`
`139`	`140`	`}`