From 9838ae7e0f445b46f8e4f1505889b596b11a65e3 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Mon, 18 Feb 2019 00:23:58 +0100 Subject: [PATCH] Fix SpringBootWebApplication auto-configuration annotation The exclude is supposed to be on SpringBootApplication annotation, otherwise IntelliJ Spring plugin errors, and also SpringBootApplication already contains EnableAutoConfiguration. Signed-off-by: Tomas Slusny --- .../net/runelite/http/service/SpringBootWebApplication.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/http-service/src/main/java/net/runelite/http/service/SpringBootWebApplication.java b/http-service/src/main/java/net/runelite/http/service/SpringBootWebApplication.java index bfdac0a254..d0103d89f8 100644 --- a/http-service/src/main/java/net/runelite/http/service/SpringBootWebApplication.java +++ b/http-service/src/main/java/net/runelite/http/service/SpringBootWebApplication.java @@ -44,7 +44,6 @@ import org.slf4j.ILoggerFactory; import org.slf4j.impl.StaticLoggerBinder; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; @@ -58,9 +57,8 @@ import org.sql2o.Sql2o; import org.sql2o.converters.Converter; import org.sql2o.quirks.NoQuirks; -@SpringBootApplication +@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) @EnableScheduling -@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class}) @Slf4j public class SpringBootWebApplication extends SpringBootServletInitializer {