root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '1.0.x'

This commit is contained in:
Andy Wilkinson 2014-05-21 09:14:07 +01:00
parent 94b8b387e8 b9c80433bc
commit 00b18b114a
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfiguration.java
View File

@ -16,7 +16,6 @@
package org.springframework.boot.autoconfigure.data.rest; package org.springframework.boot.autoconfigure.data.rest;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@ -46,7 +45,6 @@ import org.springframework.data.rest.webmvc.config.RepositoryRestMvcConfiguratio
@ConditionalOnMissingBean(RepositoryRestMvcConfiguration.class) @ConditionalOnMissingBean(RepositoryRestMvcConfiguration.class)
@ConditionalOnClass(RepositoryRestMvcConfiguration.class) @ConditionalOnClass(RepositoryRestMvcConfiguration.class)
@Import(RepositoryRestMvcConfiguration.class) @Import(RepositoryRestMvcConfiguration.class)
@AutoConfigureBefore(JpaRepositoriesAutoConfiguration.class)
public class RepositoryRestMvcAutoConfiguration { public class RepositoryRestMvcAutoConfiguration {
} }

2
spring-boot-dependencies/pom.xml
View File

@ -87,7 +87,7 @@
<slf4j.version>1.7.7</slf4j.version> <slf4j.version>1.7.7</slf4j.version>
<snakeyaml.version>1.13</snakeyaml.version> <snakeyaml.version>1.13</snakeyaml.version>
<spock.version>0.7-groovy-2.0</spock.version> <spock.version>0.7-groovy-2.0</spock.version>
<spring.version>4.0.4.RELEASE</spring.version> <spring.version>4.0.5.RELEASE</spring.version>
<spring-amqp.version>1.3.3.RELEASE</spring-amqp.version> <spring-amqp.version>1.3.3.RELEASE</spring-amqp.version>
<spring-batch.version>3.0.0.RC2</spring-batch.version> <spring-batch.version>3.0.0.RC2</spring-batch.version>
<spring-data-cassandra.version>1.0.0.RC1</spring-data-cassandra.version> <spring-data-cassandra.version>1.0.0.RC1</spring-data-cassandra.version>