Upgraded to Spring 3.2.0.M2.

Simplified component scanning configuration.
odrotbohm · Oct 16, 2012 · 0a97dcd · 0a97dcd
1 parent db09156
commit 0a97dcd
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/packages-after/src/main/java/de/olivergierke/whoops/ApplicationConfiguration.java b/packages-after/src/main/java/de/olivergierke/whoops/ApplicationConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 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.
@@ -23,11 +23,10 @@
 import org.springframework.stereotype.Controller;
 
 /**
- * 
  * @author Oliver Gierke
  */
 @Configuration
-@ComponentScan(basePackageClasses = ApplicationConfiguration.class, excludeFilters = @Filter(Controller.class))
+@ComponentScan(excludeFilters = @Filter(Controller.class))
 public class ApplicationConfiguration {
 
 	public static <T> Answer<T> withArgument() {

diff --git a/packages-before/src/main/java/de/olivergierke/whoops/ApplicationConfiguration.java b/packages-before/src/main/java/de/olivergierke/whoops/ApplicationConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 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.
@@ -32,11 +32,10 @@
 import de.olivergierke.whoops.repository.customer.CustomerRepository;
 
 /**
- * 
  * @author Oliver Gierke
  */
 @Configuration
-@ComponentScan(basePackageClasses = ApplicationConfiguration.class, excludeFilters = { @Filter(Controller.class) })
+@ComponentScan(excludeFilters = { @Filter(Controller.class) })
 class ApplicationConfiguration {
 
 	@Bean

diff --git a/plugins-sample/equities/src/main/java/de/olivergierke/whoops/hera/equities/EquityConfig.java b/plugins-sample/equities/src/main/java/de/olivergierke/whoops/hera/equities/EquityConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 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.
@@ -24,7 +24,7 @@
  * @author Oliver Gierke
  */
 @Configuration
-@ComponentScan(basePackageClasses = EquityConfig.class)
+@ComponentScan
 public class EquityConfig {
 
 }
diff --git a/plugins-sample/options/src/main/java/de/olivergierke/whoops/hera/options/OptionConfig.java b/plugins-sample/options/src/main/java/de/olivergierke/whoops/hera/options/OptionConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 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.
@@ -24,7 +24,7 @@
  * @author Oliver Gierke
  */
 @Configuration
-@ComponentScan(basePackageClasses = OptionConfig.class)
+@ComponentScan
 public class OptionConfig {
 
 }
diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
 	</modules>
 
 	<properties>
-		<spring.version>3.1.2.RELEASE</spring.version>
+		<spring.version>3.2.0.M2</spring.version>
 		<slf4j.version>1.7.1</slf4j.version>
 		<spring.data.commons.version>1.4.0.RELEASE</spring.data.commons.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>