From 6ae6a18e677017ef5f2a8bcfad14cd14ca487b67 Mon Sep 17 00:00:00 2001
From: mjkhan21 <mjkhan21@xit.co.kr>
Date: Tue, 13 Jun 2023 18:36:20 +0900
Subject: [PATCH] @Import -> @ImportAutoConfiguration

---
 pom.xml                                         | 13 +++++++++++++
 .../cokr/xit/base/boot/XitBaseApplication.java  | 17 +++++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 415d16b..65a3483 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,6 +99,19 @@
 	</dependencies>
 	
 	<build>
+        <defaultGoal>install</defaultGoal>
+        <directory>${basedir}/target</directory>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+
+        <resources>
+        	<resource><directory>${basedir}/src/main/resources</directory></resource>
+        </resources>
+
+        <testResources>
+        	<testResource><directory>${basedir}/src/test/resources</directory></testResource>
+        	<testResource><directory>${basedir}/src/main/resources</directory></testResource>
+        </testResources>
+
         <plugins>
 			<plugin>
 			    <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/cokr/xit/base/boot/XitBaseApplication.java b/src/main/java/cokr/xit/base/boot/XitBaseApplication.java
index fbaa526..fd808af 100644
--- a/src/main/java/cokr/xit/base/boot/XitBaseApplication.java
+++ b/src/main/java/cokr/xit/base/boot/XitBaseApplication.java
@@ -1,14 +1,23 @@
 package cokr.xit.base.boot;
 
-import org.springframework.context.annotation.Import;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-import cokr.xit.foundation.boot.FoundationApplication;
+import cokr.xit.foundation.boot.CommonConfig;
+import cokr.xit.foundation.boot.DatasourceConfig;
+import cokr.xit.foundation.boot.ServletConfig;
+import cokr.xit.foundation.boot.TransactionConfig;
 
 /**Spring Boot에서 xit-base 모듈을 사용하는 웹 애플리케이션의 베이스 클래스
  * @author mjkhan
  */
-@Import({
+@SpringBootApplication
+@ImportAutoConfiguration({
+	CommonConfig.class,
+	ServletConfig.class,
 	MvcConfig2.class,
+	DatasourceConfig.class,
+	TransactionConfig.class,
 	SecurityConfig.class,
 })
-public class XitBaseApplication extends FoundationApplication {}
\ No newline at end of file
+public class XitBaseApplication {}
\ No newline at end of file