Merge branch '2.0.x'

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java

@@ -145,7 +145,7 @@ public class QuartzAutoConfiguration {
 		}
 
 		private DataSource getDataSource(DataSource dataSource,
-				@QuartzDataSource ObjectProvider<DataSource> quartzDataSource) {
+				ObjectProvider<DataSource> quartzDataSource) {
 			DataSource dataSourceIfAvailable = quartzDataSource.getIfAvailable();
 			return (dataSourceIfAvailable != null ? dataSourceIfAvailable : dataSource);
 		}