mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge branch '1.1.x'
Conflicts: spring-boot-dependencies/pom.xml
This commit is contained in:
commit
cfd17eb479
@ -103,7 +103,7 @@
|
||||
<reactor-spring.version>1.1.3.RELEASE</reactor-spring.version>
|
||||
<servlet-api.version>3.1.0</servlet-api.version>
|
||||
<simple-json.version>1.1.1</simple-json.version>
|
||||
<slf4j.version>1.7.7</slf4j.version>
|
||||
<slf4j.version>1.7.8</slf4j.version>
|
||||
<snakeyaml.version>1.14</snakeyaml.version>
|
||||
<solr.version>4.7.2</solr.version>
|
||||
<spock.version>0.7-groovy-2.0</spock.version>
|
||||
|
Loading…
Reference in New Issue
Block a user