작업내역 반영

.idea/compiler.xml

@@ -5,21 +5,12 @@
   </component>
   <component name="CompilerConfiguration">
     <option name="DEFAULT_COMPILER" value="ajc" />
-    <bytecodeTargetLevel>
-      <module name="elink-root.BATWeb.main" target="1.8" />
-      <module name="elink-root.BATWeb.test" target="1.8" />
-      <module name="ppcb-root.BATWeb.main" target="1.8" />
-      <module name="ppcb-root.BATWeb.test" target="1.8" />
-      <module name="ppcb-root.IIMWeb.main" target="1.8" />
-      <module name="ppcb-root.IIMWeb.test" target="1.8" />
-      <module name="ppcb-root.ONLFramework.main" target="1.8" />
-      <module name="ppcb-root.ONLFramework.test" target="1.8" />
-      <module name="ppcb-root.ONLRMSClient.main" target="1.8" />
-      <module name="ppcb-root.ONLRMSClient.test" target="1.8" />
-      <module name="ppcb-root.ONLWeb.main" target="1.8" />
-      <module name="ppcb-root.ONLWeb.test" target="1.8" />
-      <module name="ppcb-root.RMSWeb.main" target="1.8" />
-      <module name="ppcb-root.RMSWeb.test" target="1.8" />
-    </bytecodeTargetLevel>
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+      </profile>
+    </annotationProcessing>
   </component>
 </project>
\ No newline at end of file

.idea/encodings.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/AqTest/src/main/resources/logback.xml" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/IIMWeb/src/main/java/com/eactive/eai/rms/common/context/MonitoringContextImpl.java" charset="x-windows-949" />
+    <file url="file://$PROJECT_DIR$/IIMWeb/src/main/java/com/eactive/eai/rms/common/startup/AppListener.java" charset="x-windows-949" />
+    <file url="file://$PROJECT_DIR$/IIMWeb/src/main/java/com/eactive/eai/rms/common/util/ContainerUtil.java" charset="x-windows-949" />
+    <file url="file://$PROJECT_DIR$/../openbanking-demo" charset="UTF-8" />
     <file url="PROJECT" charset="x-windows-949" />
   </component>
 </project>
\ No newline at end of file

.idea/misc.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$/../openbanking-demo" />
+  </component>
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.7" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/classes" />
   </component>
 </project>
\ No newline at end of file

.idea/vcs.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/IIMWeb" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/ONLFramework" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/ONLRMSClient" vcs="Git" />

IIMWeb @ c85385b1

-Subproject commit 7d9e9ae2fcc72a23014c18ca6a315c9dd169cf85
+Subproject commit c85385b1a025775997986224735515f6e76d498d

ONLFramework @ ad98c6ee

-Subproject commit b80cb4639af9d2801828df81205b206e61b7bb4a
+Subproject commit ad98c6eea0bc1610d0953b0e9d41f0f443e350a2

ONLWeb @ ca5cd5d9

-Subproject commit 941c4f5ceb8699d18bed4f6bb831be4cb95e647d
+Subproject commit ca5cd5d964400a3cb517e238be833856a56aa799

RMSWeb @ 424b2008

-Subproject commit 1d5161500927bae5e5bf2bead6aed4026dfadf96
+Subproject commit 424b2008fa72c31586c756c85ecd203d279fcbb9

build.gradle

@@ -52,7 +52,7 @@ subprojects {
 
         implementation group: 'org.postgresql', name: 'postgresql', version: '42.2.8'
         implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.3.0'
-        implementation group: 'com.oracle', name: 'ojdbc6', version: '11.2.0.3'
+        //implementation group: 'com.oracle', name: 'ojdbc6', version: '11.2.0.3'
 
         testCompile group: 'junit', name: 'junit', version: '4.12'
 

gradle/wrapper/gradle-wrapper.properties

-#Thu Aug 20 09:49:34 KST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

settings.gradle

 rootProject.name = 'elink-root'
 include 'IIMWeb'
+include 'BAPWeb'
 include 'ONLFramework'
 include 'ONLRMSClient'
 include 'ONLWeb'
 include 'RMSWeb'
-
+include 'AqTest'