Skip to content

Commit

Permalink
BATCH-2515: Update Spring dependency to resolve merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
breglerj committed Nov 19, 2018
1 parent 70a566c commit 2440080
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ allprojects {

environmentProperty = project.hasProperty('environment') ? getProperty('environment') : 'hsql'

springVersionDefault = '5.1.0.RELEASE'
springVersionDefault = '5.1.2.RELEASE'
springVersion = project.hasProperty('springVersion') ? getProperty('springVersion') : springVersionDefault
springRetryVersion = '1.2.1.RELEASE'
springAmqpVersion = '2.0.0.RELEASE'
Expand Down

0 comments on commit 2440080

Please sign in to comment.