Polishing
This commit is contained in:
		
							parent
							
								
									8ee94a4392
								
							
						
					
					
						commit
						987806f7c2
					
				|  | @ -17,7 +17,7 @@ eclipse.classpath.file.whenMerged { classpath -> | ||||||
| 	def projectOutputDependencies = classpath.entries.findAll { entry -> entry.path =~ regexp } | 	def projectOutputDependencies = classpath.entries.findAll { entry -> entry.path =~ regexp } | ||||||
| 	projectOutputDependencies.each { entry -> | 	projectOutputDependencies.each { entry -> | ||||||
| 		def matcher = (entry.path =~ regexp) | 		def matcher = (entry.path =~ regexp) | ||||||
| 		if(matcher) { | 		if (matcher) { | ||||||
| 			def projectName = matcher[0][1] | 			def projectName = matcher[0][1] | ||||||
| 			def path = "/${projectName}" | 			def path = "/${projectName}" | ||||||
| 			if(!classpath.entries.find { e -> e instanceof ProjectDependency && e.path == path }) { | 			if(!classpath.entries.find { e -> e instanceof ProjectDependency && e.path == path }) { | ||||||
|  | @ -50,12 +50,11 @@ eclipse.classpath.file.whenMerged { classpath -> | ||||||
| // Ensure project dependencies come after 3rd-party libs (SPR-11836) | // Ensure project dependencies come after 3rd-party libs (SPR-11836) | ||||||
| // https://jira.spring.io/browse/SPR-11836 | // https://jira.spring.io/browse/SPR-11836 | ||||||
| eclipse.classpath.file.whenMerged { classpath -> | eclipse.classpath.file.whenMerged { classpath -> | ||||||
| 	def projectOutputDependencies = classpath.entries.findAll { entry -> entry instanceof ProjectDependency } | 	classpath.entries.findAll { it instanceof ProjectDependency }.each { | ||||||
| 	projectOutputDependencies.each { entry -> |  | ||||||
| 		// delete from original position | 		// delete from original position | ||||||
| 		classpath.entries.remove(entry) | 		classpath.entries.remove(it) | ||||||
| 		// append to end of classpath | 		// append to end of classpath | ||||||
| 		classpath.entries.add(entry) | 		classpath.entries.add(it) | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue