Upgraded to Spring Boot 1.0 RC3.

Moved configuration classes to main folders. Removed previously required @Enable…Repositories annotations.

jpa/spring-data-jpa-example/src/main/java/example/springdata/jpa/auditing/AuditingConfiguration.java

@@ -21,7 +21,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.orm.jpa.vendor.Database;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
@@ -32,16 +31,13 @@ import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 @Configuration
 @EnableAutoConfiguration
 @EnableJpaAuditing
-@EnableJpaRepositories
-// TODO: Remove once Boot can work with Codd
 class AuditingConfiguration {
 
 	/**
 	 * We need to configure a {@link LocalContainerEntityManagerFactoryBean} manually here as Spring does <em>not</em>
 	 * automatically add the {@code orm.xml} <em>if</em> a {@code persistence.xml} is located right beside it. This is
-	 * necessary to get the {@link example.springdata.jpa.basics.BasicFactorySetup} sample
-	 * working. However, in a {code persistence.xml}-less codebase you can rely on Spring Boot on setting the correct
-	 * defaults.
+	 * necessary to get the {@link example.springdata.jpa.basics.BasicFactorySetup} sample working. However, in a {code
+	 * persistence.xml}-less codebase you can rely on Spring Boot on setting the correct defaults.
 	 * 
 	 * @return
 	 */

jpa/spring-data-jpa-example/src/main/java/example/springdata/jpa/caching/CachingConfiguration.java

@@ -25,7 +25,6 @@ import org.springframework.cache.concurrent.ConcurrentMapCache;
 import org.springframework.cache.support.SimpleCacheManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 /**
  * Java config to use Spring Data JPA alongside the Spring caching support.
@@ -36,8 +35,6 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 @Configuration
 @EnableCaching
 @EnableAutoConfiguration
-// TODO: Remove once Boot can work with Codd
-@EnableJpaRepositories
 class CachingConfiguration {
 
 	@Bean

jpa/spring-data-jpa-example/src/main/java/example/springdata/jpa/custom/CustomRepositoryConfig.java

@@ -17,7 +17,6 @@ package example.springdata.jpa.custom;
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 /**
  * Sample configuration to bootstrap Spring Data JPA through JavaConfig
@@ -27,6 +26,4 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
  */
 @Configuration
 @EnableAutoConfiguration
-// TODO: Remove once Boot can work with Codd
-@EnableJpaRepositories
 class CustomRepositoryConfig {}

jpa/spring-data-jpa-example/src/main/java/example/springdata/jpa/simple/SimpleConfiguration.java

@@ -17,13 +17,10 @@ package example.springdata.jpa.simple;
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 /**
  * @author Oliver Gierke
  */
 @Configuration
 @EnableAutoConfiguration
-// TODO: Remove once Boot can work with Codd
-@EnableJpaRepositories
 class SimpleConfiguration {}

jpa/spring-data-jpa-interceptors/src/main/java/example/springdata/jpa/interceptors/ApplicationConfiguration.java

@@ -23,13 +23,10 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @Configuration
 @EnableAspectJAutoProxy
 @EnableAutoConfiguration
-// TODO: Remove once Boot can work with Codd
-@EnableJpaRepositories
 public class ApplicationConfiguration {
 
 	@Bean

jpa/spring-data-jpa-java8-auditing/src/main/java/example/springdata/jpa/java8/AuditingConfiguration.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package example.springdata.jpa.java8;
+
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+
+@Configuration
+@EnableAutoConfiguration
+@EnableJpaAuditing class AuditingConfiguration {
+
+}

jpa/spring-data-jpa-java8-auditing/src/test/java/example/springdata/jpa/java8/Java8AuditingIntegrationTests.java

@@ -21,33 +21,18 @@ import static org.junit.Assert.*;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import example.springdata.jpa.java8.Customer;
-import example.springdata.jpa.java8.CustomerRepository;
-
 /**
  * Integration test to show the usage of Java 8 date time APIs with Spring Data JPA auditing.
  * 
  * @author Oliver Gierke
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration
+@ContextConfiguration(classes = AuditingConfiguration.class)
 public class Java8AuditingIntegrationTests {
 
-	@Configuration
-	@EnableAutoConfiguration
-	@EnableJpaRepositories
-	@EnableJpaAuditing
-	static class Config {
-
-	}
-
 	@Autowired CustomerRepository repository;
 
 	@Test

jpa/spring-data-jpa-showcase/src/test/java/example/springdata/jpa/showcase/AbstractShowcaseTest.java

@@ -19,7 +19,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests;
 import org.springframework.test.context.transaction.BeforeTransaction;
 import org.springframework.transaction.annotation.Transactional;
@@ -35,8 +34,6 @@ public abstract class AbstractShowcaseTest extends AbstractTransactionalJUnit4Sp
 
 	@Configuration
 	@EnableAutoConfiguration
-	// TODO: Remove once Boot can work with Codd
-	@EnableJpaRepositories
 	@ComponentScan
 	static class TestConfig {
 

mongodb/pom.xml

@@ -13,7 +13,7 @@
 	</parent>
 
 	<properties>
-		<spring-data-mongo.version>1.4.0.DATAMONGO-838-SNAPSHOT</spring-data-mongo.version>
+		<spring-data-mongodb.version>1.4.0.BUILD-SNAPSHOT</spring-data-mongodb.version>
 	</properties>
 
 	<dependencies>
@@ -29,6 +29,11 @@
 			<version>${querydsl.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+		</dependency>
+		
 	</dependencies>
 
 	<build>

mongodb/src/main/java/example/springdata/mongodb/ApplicationConfiguration.java

@@ -15,11 +15,9 @@
  */
 package example.springdata.mongodb;
 
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.mongodb.config.AbstractMongoConfiguration;
-import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
 
-import com.mongodb.Mongo;
 import com.mongodb.MongoClient;
 
 /**
@@ -29,16 +27,5 @@ import com.mongodb.MongoClient;
  * @author Oliver Gierke
  */
 @Configuration
-@EnableMongoRepositories
-public class TestConfiguration extends AbstractMongoConfiguration {
-
-	@Override
-	protected String getDatabaseName() {
-		return "test";
-	}
-
-	@Override
-	public Mongo mongo() throws Exception {
-		return new MongoClient();
-	}
-}
+@EnableAutoConfiguration
+public class ApplicationConfiguration {}

mongodb/src/test/java/example/springdata/mongodb/customer/CustomerRepositoryIntegrationTest.java

@@ -32,7 +32,8 @@ import org.springframework.data.querydsl.QSort;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import example.springdata.mongodb.TestConfiguration;
+import example.springdata.mongodb.ApplicationConfiguration;
+
 
 /**
  * Integration test for {@link CustomerRepository}.
@@ -40,7 +41,7 @@ import example.springdata.mongodb.TestConfiguration;
  * @author Oliver Gierke
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = TestConfiguration.class)
+@ContextConfiguration(classes = ApplicationConfiguration.class)
 public class CustomerRepositoryIntegrationTest {
 
 	@Autowired CustomerRepository repository;

mongodb/src/test/java/example/springdata/mongodb/shop/OrderRepositoryIntegrationTests.java

@@ -28,7 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import example.springdata.mongodb.TestConfiguration;
+import example.springdata.mongodb.ApplicationConfiguration;
 
 /**
  * Integration tests for {@link OrderRepository}.
@@ -37,7 +37,7 @@ import example.springdata.mongodb.TestConfiguration;
  * @author Oliver Gierke
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = TestConfiguration.class)
+@ContextConfiguration(classes = ApplicationConfiguration.class)
 public class OrderRepositoryIntegrationTests {
 
 	@Autowired OrderRepository repository;

pom.xml

@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.0.0.RC1</version>
+		<version>1.0.0.RC3</version>
 	</parent>
 
 	<modules>