egovframe-runtime v4.2.0 FINAL

eGovFramework · Feb 28, 2024 · bba5db1 · bba5db1
1 parent 8268575
commit bba5db1
Show file tree

Hide file tree

Showing 256 changed files with 9,210 additions and 4,137 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/egovframe-runtime-4.0.iml b/.idea/egovframe-runtime-4.0.iml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/Batch/org.egovframe.rte.bat.core/pom.xml b/Batch/org.egovframe.rte.bat.core/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.egovframe.rte</groupId>
     <artifactId>org.egovframe.rte.bat.core</artifactId>
-    <version>4.1.0</version>
+    <version>4.2.0</version>
     <packaging>jar</packaging>
     <name>org.egovframe.rte.bat.core</name>
     <description>The eGovernment Standard Framework</description>
@@ -18,11 +18,12 @@
     </licenses>
 
     <properties>
-        <spring.maven.artifact.version>5.3.20</spring.maven.artifact.version>
-        <batch.maven.artifact.version>4.3.6</batch.maven.artifact.version>
-        <org.egovframe.rte.version>4.1.0</org.egovframe.rte.version>
+        <org.egovframe.rte.version>4.2.0</org.egovframe.rte.version>
+        <spring.maven.artifact.version>5.3.27</spring.maven.artifact.version>
+        <batch.maven.artifact.version>4.3.8</batch.maven.artifact.version>
         <java.version>1.8</java.version>
-        <project.encoding>UTF-8</project.encoding>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
 
     <repositories>
@@ -281,16 +282,11 @@
             <version>1.5.0-b01</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>javax.persistence-api</artifactId>
-            <version>2.2</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>2.5.2</version>
+            <version>2.7.2</version>
+            <classifier>jdk8</classifier>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -302,7 +298,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
+            <version>4.0.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -320,7 +316,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.11.0</version>
+            <version>2.12.0</version>
         </dependency>
     </dependencies>
 
@@ -333,11 +329,10 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.10.1</version>
+                    <version>3.11.0</version>
                     <configuration>
                         <source>${java.version}</source>
                         <target>${java.version}</target>
-                        <encoding>${project.encoding}</encoding>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -348,21 +343,16 @@
                         <dependency>
                             <groupId>org.hsqldb</groupId>
                             <artifactId>hsqldb</artifactId>
-                            <version>2.5.2</version>
+                            <version>2.7.2</version>
+                            <classifier>jdk8</classifier>
                         </dependency>
                     </dependencies>
                 </plugin>
-                <!-- EMMA -->
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>emma-maven-plugin</artifactId>
-                    <version>1.0-alpha-3</version>
-                </plugin>
                 <!-- PMD manven plugin -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-pmd-plugin</artifactId>
-                    <version>3.17.0</version>
+                    <version>3.21.0</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -380,14 +370,41 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- JavaDoc -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.5.0</version>
+                <configuration>
+                    <doclint>none</doclint>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <id>deploy</id>
+                        <phase>deploy</phase>
+                    </execution>
+                </executions>
+            </plugin>
             <!-- EMMA -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
+                <version>3.1.0</version>
                 <configuration>
                     <skipTests>true</skipTests>
-                    <forkMode>once</forkMode>
                     <reportFormat>xml</reportFormat>
                     <excludes>
                         <exclude>**/Abstract*.java</exclude>
@@ -404,16 +421,6 @@
                 <version>1.0-alpha-3</version>
                 <inherited>true</inherited>
             </plugin>
-            <!-- JavaDoc -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.4.0</version>
-                <configuration>
-                    <source>${java.version}</source>
-                    <additionalJOption>-Xdoclint:none</additionalJOption>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
@@ -423,7 +430,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.4.4</version>
                 <reportSets>
                     <reportSet>
                         <id>sunlink</id>
@@ -443,11 +450,13 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>emma-maven-plugin</artifactId>
+                <version>1.0-alpha-3</version>
                 <inherited>true</inherited>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
+                <version>3.1.0</version>
                 <inherited>true</inherited>
                 <reportSets>
                     <reportSet>
@@ -461,24 +470,21 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.5.0</version>
                 <configuration>
                     <minmemory>128m</minmemory>
                     <maxmemory>512m</maxmemory>
-                    <encoding>${project.encoding}</encoding>
-                    <docencoding>${project.encoding}</docencoding>
-                    <charset>${project.encoding}</charset>
                     <additionalJOption>-Xdoclint:none</additionalJOption>
                 </configuration>
             </plugin>
             <!-- Generating Java Source in HTML -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jxr-plugin</artifactId>
+                <version>3.3.0</version>
                 <configuration>
-                    <inputEncoding>${project.encoding}</inputEncoding>
-                    <outputEncoding>${project.encoding}</outputEncoding>
                     <linkJavadoc>true</linkJavadoc>
-                    <javadocDir>apidocs</javadocDir>
+                    <javadocDir>api docs</javadocDir>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/...a/org/egovframe/rte/bat/core/item/file/transform/EgovEscapableDelimitedLineTokenizer.java b/...a/org/egovframe/rte/bat/core/item/file/transform/EgovEscapableDelimitedLineTokenizer.java
@@ -33,7 +33,8 @@
  *
  * 수정일		수정자				수정내용
  * ----------------------------------------------
- * 2017.10.23	신용호				최초 생성
+ * 2017.10.23	신용호			최초 생성
+ * 2023.08.31	ESFC			불필요한 replaceAll을 replace 로 수정(getRegexDelimiter(), Contribution 반영)
  * </pre>
 */
 public class EgovEscapableDelimitedLineTokenizer extends EgovAbstractLineTokenizer {

diff --git a/...t.core/src/main/java/org/egovframe/rte/bat/core/launch/support/EgovCommandLineRunner.java b/...t.core/src/main/java/org/egovframe/rte/bat/core/launch/support/EgovCommandLineRunner.java
@@ -47,7 +47,8 @@
  * 수정일		수정자				수정내용
  * ----------------------------------------------
  * 2012.07.25	배치실행개발팀		최초 생성
- * 2017.02.15	장동한				시큐어코딩(ES)-부적절한 예외 처리[CWE-253, CWE-440, CWE-754]
+ * 2017.02.15	장동한			시큐어코딩(ES)-부적절한 예외 처리[CWE-253, CWE-440, CWE-754]
+ * 2023.08.31	ESFC			NullPointerException를 분리(start(), Contribution 반영)
  * </pre>
 */
 public class EgovCommandLineRunner {
@@ -266,7 +267,7 @@ public int start(String jobPath, String jobIdentifier, String[] parameters, Set<
 		} catch (Throwable e) {
 			String message = "Job Terminated in error: " + e.getMessage();
 			//2017.02.15 장동한 시큐어코딩(ES)-부적절한 예외 처리[CWE-253, CWE-440, CWE-754]
-			LOGGER.error("["+e.getClass()+"] Try/Catch...job start Running : " + e.getMessage());
+			LOGGER.error("["+e.getClass()+"] Try/Catch...job start Runing : " + e.getMessage());
 			EgovCommandLineRunner.message = message;
 			return exitCodeMapper.intValue(ExitStatus.FAILED.getExitCode());
 		} finally {
@@ -403,4 +404,5 @@ private JobParameters getNextJobParameters(Job job) throws JobParametersNotFound
 		}
 		return jobParameters;
 	}
+
 }
diff --git a/...bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101090712.csv b/...bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101090712.csv
@@ -0,0 +1,4 @@
+customer1,10
+customer2,20
+customer3,30
+customer4,40
diff --git a/...bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101090812.csv b/...bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101090812.csv
@@ -0,0 +1,4 @@
+customer1,10
+customer2,20
+customer3,30
+customer4,40
diff --git a/...bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101090912.csv b/...bat.core/src/test/resources/org/egovframe/data/input/index/csvData_NDX_20171101090912.csv
@@ -0,0 +1,4 @@
+customer1,10
+customer2,20
+customer3,30
+customer4,40