Merge branch '1.4.x' into 1.5.x
This commit is contained in:
		
						commit
						5d7453a635
					
				| 
						 | 
					@ -148,7 +148,7 @@
 | 
				
			||||||
		<snakeyaml.version>1.17</snakeyaml.version>
 | 
							<snakeyaml.version>1.17</snakeyaml.version>
 | 
				
			||||||
		<solr.version>5.5.3</solr.version>
 | 
							<solr.version>5.5.3</solr.version>
 | 
				
			||||||
		<spock.version>1.0-groovy-2.4</spock.version>
 | 
							<spock.version>1.0-groovy-2.4</spock.version>
 | 
				
			||||||
		<spring.version>4.3.5.BUILD-SNAPSHOT</spring.version>
 | 
							<spring.version>4.3.4.RELEASE</spring.version>
 | 
				
			||||||
		<spring-amqp.version>1.7.0.BUILD-SNAPSHOT</spring-amqp.version>
 | 
							<spring-amqp.version>1.7.0.BUILD-SNAPSHOT</spring-amqp.version>
 | 
				
			||||||
		<spring-cloud-connectors.version>1.2.3.RELEASE</spring-cloud-connectors.version>
 | 
							<spring-cloud-connectors.version>1.2.3.RELEASE</spring-cloud-connectors.version>
 | 
				
			||||||
		<spring-batch.version>3.0.7.RELEASE</spring-batch.version>
 | 
							<spring-batch.version>3.0.7.RELEASE</spring-batch.version>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue