From 0a2ed90feadb64fb4dcfce496fc5ef47d45dbed3 Mon Sep 17 00:00:00 2001
From: emeroad <emeroad@gmail.com>
Date: Wed, 3 Nov 2021 13:02:26 +0900
Subject: [PATCH] [#noissue] Fix configuration of hbase-schema-manager

---
 .gitignore                                                     | 3 ++-
 hbase/hbase-schema-manager/pom.xml                             | 3 ---
 .../{resources-local/log4j2.xml => resources/log4j2-dev.xml}   | 0
 .../src/main/{resources-release => resources}/log4j2.xml       | 0
 hbase/pom.xml                                                  | 2 ++
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename hbase/hbase-schema-manager/src/main/{resources-local/log4j2.xml => resources/log4j2-dev.xml} (100%)
 rename hbase/hbase-schema-manager/src/main/{resources-release => resources}/log4j2.xml (100%)

diff --git a/.gitignore b/.gitignore
index 359bbed7dc9f..e42368eea9aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,4 +31,5 @@ jsdoc/
 dist/
 
 # logs
-logs/
\ No newline at end of file
+logs/
+manager-logs/
\ No newline at end of file
diff --git a/hbase/hbase-schema-manager/pom.xml b/hbase/hbase-schema-manager/pom.xml
index a7127ea12a9d..e1e0a0affe04 100644
--- a/hbase/hbase-schema-manager/pom.xml
+++ b/hbase/hbase-schema-manager/pom.xml
@@ -65,9 +65,6 @@
 
     <build>
         <resources>
-            <resource>
-                <directory>${basedir}/src/main/resources-${env}</directory>
-            </resource>
         </resources>
 
         <plugins>
diff --git a/hbase/hbase-schema-manager/src/main/resources-local/log4j2.xml b/hbase/hbase-schema-manager/src/main/resources/log4j2-dev.xml
similarity index 100%
rename from hbase/hbase-schema-manager/src/main/resources-local/log4j2.xml
rename to hbase/hbase-schema-manager/src/main/resources/log4j2-dev.xml
diff --git a/hbase/hbase-schema-manager/src/main/resources-release/log4j2.xml b/hbase/hbase-schema-manager/src/main/resources/log4j2.xml
similarity index 100%
rename from hbase/hbase-schema-manager/src/main/resources-release/log4j2.xml
rename to hbase/hbase-schema-manager/src/main/resources/log4j2.xml
diff --git a/hbase/pom.xml b/hbase/pom.xml
index 30ab2b093e0d..9a231f3a3e0c 100644
--- a/hbase/pom.xml
+++ b/hbase/pom.xml
@@ -18,6 +18,8 @@
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
         <sniffer.artifactid>java18</sniffer.artifactid>
         <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
+
+        <spring.version>${spring5.version}</spring.version>
     </properties>
 
     <modules>