mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge branch '1.1.x'
This commit is contained in:
commit
de2087ff2e
@ -70,7 +70,7 @@
|
||||
<gson.version>2.3</gson.version>
|
||||
<h2.version>1.4.183</h2.version>
|
||||
<hamcrest.version>1.3</hamcrest.version>
|
||||
<hibernate.version>4.3.7.Final</hibernate.version>
|
||||
<hibernate.version>4.3.8.Final</hibernate.version>
|
||||
<hibernate-entitymanager.version>${hibernate.version}</hibernate-entitymanager.version>
|
||||
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
|
||||
<hikaricp.version>2.2.5</hikaricp.version>
|
||||
@ -107,7 +107,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.8</slf4j.version>
|
||||
<slf4j.version>1.7.10</slf4j.version>
|
||||
<snakeyaml.version>1.14</snakeyaml.version>
|
||||
<solr.version>4.7.2</solr.version>
|
||||
<spock.version>0.7-groovy-2.0</spock.version>
|
||||
@ -1626,7 +1626,7 @@
|
||||
<activeByDefault>true</activeByDefault>
|
||||
</activation>
|
||||
<repositories>
|
||||
<!-- Repositories to allow snapshot and milestone BOM imports during
|
||||
<!-- Repositories to allow snapshot and milestone BOM imports during
|
||||
development. This section is stripped out when a full release is prepared. -->
|
||||
<repository>
|
||||
<id>spring-milestones</id>
|
||||
|
Loading…
Reference in New Issue
Block a user