From d8891c751f91176f9f32c667377f04a000f78314 Mon Sep 17 00:00:00 2001 From: mjkhan21 Date: Tue, 13 Jun 2023 18:35:52 +0900 Subject: [PATCH] @Import -> @ImportAutoConfiguration --- pom.xml | 12 ++++++++++++ .../xit/foundation/boot/FoundationApplication.java | 4 ++-- .../xit/foundation/boot/StandAloneApplication.java | 4 ++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index b248eb1..d2e7766 100644 --- a/pom.xml +++ b/pom.xml @@ -124,6 +124,18 @@ + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + diff --git a/src/main/java/cokr/xit/foundation/boot/FoundationApplication.java b/src/main/java/cokr/xit/foundation/boot/FoundationApplication.java index 09fa7a3..7cb97f0 100644 --- a/src/main/java/cokr/xit/foundation/boot/FoundationApplication.java +++ b/src/main/java/cokr/xit/foundation/boot/FoundationApplication.java @@ -1,7 +1,7 @@ package cokr.xit.foundation.boot; +import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Import; import org.springframework.test.context.ContextConfiguration; /**Spring Boot에서 xit-foundation.jar를 사용하는 웹 애플리케이션의 베이스 클래스 @@ -14,7 +14,7 @@ import org.springframework.test.context.ContextConfiguration; */ @SpringBootApplication @ContextConfiguration("classpath:spring/context-*.xml") -@Import({ +@ImportAutoConfiguration({ CommonConfig.class, ServletConfig.class, MvcConfig.class, diff --git a/src/main/java/cokr/xit/foundation/boot/StandAloneApplication.java b/src/main/java/cokr/xit/foundation/boot/StandAloneApplication.java index 2982888..496a94d 100644 --- a/src/main/java/cokr/xit/foundation/boot/StandAloneApplication.java +++ b/src/main/java/cokr/xit/foundation/boot/StandAloneApplication.java @@ -3,9 +3,9 @@ package cokr.xit.foundation.boot; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.WebApplicationType; +import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; -import org.springframework.context.annotation.Import; import org.springframework.test.context.ContextConfiguration; /**Spring Boot에서 xit-foundation.jar를 사용하는 stand-alone 애플리케이션의 베이스 클래스 @@ -19,7 +19,7 @@ import org.springframework.test.context.ContextConfiguration; @SpringBootApplication(exclude = { WebMvcAutoConfiguration.class }) -@Import({ +@ImportAutoConfiguration({ CommonConfig.class, DatasourceConfig.class, TransactionConfig.class,