Skip to content

S
spring-boot
Commit 00b18b11 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '1.0.x'

parents 94b8b387 b9c80433
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfiguration.java
View file @ 00b18b11
...@@ -16,7 +16,6 @@ ...@@ -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 ...@@ -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 {
} }
spring-boot-dependencies/pom.xml
View file @ 00b18b11
...@@ -87,7 +87,7 @@ ...@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment