egovframe-runtime v4.1.0 FINAL

eGovFramework · Apr 24, 2023 · 1da6c02 · 1da6c02
1 parent 4fca523
commit 1da6c02
Show file tree

Hide file tree

Showing 620 changed files with 7,981 additions and 10,627 deletions.
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,8 +4,8 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.egovframe.rte</groupId>
     <artifactId>org.egovframe.rte.bat.core</artifactId>
+    <version>4.1.0</version>
     <packaging>jar</packaging>
-    <version>4.0.0</version>
     <name>org.egovframe.rte.bat.core</name>
     <description>The eGovernment Standard Framework</description>
     <url>https://www.egovframe.go.kr</url>
@@ -18,11 +18,11 @@
     </licenses>
 
     <properties>
-        <spring.maven.artifact.version>5.3.6</spring.maven.artifact.version>
-        <batch.maven.artifact.version>4.3.2</batch.maven.artifact.version>
-        <org.egovframe.rte.version>4.0.0</org.egovframe.rte.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <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>
+        <java.version>1.8</java.version>
+        <project.encoding>UTF-8</project.encoding>
     </properties>
 
     <repositories>
@@ -39,11 +39,6 @@
     </repositories>
 
     <dependencies>
-        <dependency>
-            <groupId>org.egovframe.rte</groupId>
-            <artifactId>org.egovframe.rte.fdl.logging</artifactId>
-            <version>${org.egovframe.rte.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.egovframe.rte</groupId>
             <artifactId>org.egovframe.rte.fdl.cmmn</artifactId>
@@ -207,7 +202,6 @@
             <artifactId>spring-aop</artifactId>
             <version>${spring.maven.artifact.version}</version>
         </dependency>
-        <!-- for testing - Exclude에 따른 springframework 관련 추가 test/provided -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-tx</artifactId>
@@ -228,7 +222,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.1</version>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -289,20 +283,20 @@
         </dependency>
         <dependency>
             <groupId>javax.persistence</groupId>
-            <artifactId>persistence-api</artifactId>
-            <version>1.0.2</version>
+            <artifactId>javax.persistence-api</artifactId>
+            <version>2.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>2.5.0</version>
+            <version>2.5.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-dbcp2</artifactId>
-            <version>2.4.0</version>
+            <version>2.9.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -326,7 +320,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.7</version>
+            <version>2.11.0</version>
         </dependency>
     </dependencies>
 
@@ -339,30 +333,22 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.1</version>
+                    <version>3.10.1</version>
                     <configuration>
-                        <source>1.8</source>
-                        <target>1.8</target>
-                        <encoding>UTF-8</encoding>
+                        <source>${java.version}</source>
+                        <target>${java.version}</target>
+                        <encoding>${project.encoding}</encoding>
                     </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>hibernate3-maven-plugin</artifactId>
                     <version>3.0</version>
-                    <configuration>
-                        <components>
-                            <component>
-                                <name>hbm2ddl</name>
-                                <implementation>annotationconfiguration</implementation>
-                            </component>
-                        </components>
-                    </configuration>
                     <dependencies>
                         <dependency>
                             <groupId>org.hsqldb</groupId>
                             <artifactId>hsqldb</artifactId>
-                            <version>2.5.0</version>
+                            <version>2.5.2</version>
                         </dependency>
                     </dependencies>
                 </plugin>
@@ -376,7 +362,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-pmd-plugin</artifactId>
-                    <version>3.12.0</version>
+                    <version>3.17.0</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -422,9 +408,9 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.4.0</version>
                 <configuration>
-                    <source>1.8</source>
+                    <source>${java.version}</source>
                     <additionalJOption>-Xdoclint:none</additionalJOption>
                 </configuration>
             </plugin>
@@ -437,7 +423,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>3.1.2</version>
+                <version>3.3.0</version>
                 <reportSets>
                     <reportSet>
                         <id>sunlink</id>
@@ -447,7 +433,7 @@
                         <inherited>true</inherited>
                         <configuration>
                             <links>
-                                <link>https://docs.oracle.com/javase/6/docs/api/</link>
+                                <link>https://docs.oracle.com/javase/8/docs/api/</link>
                             </links>
                         </configuration>
                     </reportSet>
@@ -478,9 +464,9 @@
                 <configuration>
                     <minmemory>128m</minmemory>
                     <maxmemory>512m</maxmemory>
-                    <encoding>UTF-8</encoding>
-                    <docencoding>UTF-8</docencoding>
-                    <charset>UTF-8</charset>
+                    <encoding>${project.encoding}</encoding>
+                    <docencoding>${project.encoding}</docencoding>
+                    <charset>${project.encoding}</charset>
                     <additionalJOption>-Xdoclint:none</additionalJOption>
                 </configuration>
             </plugin>
@@ -489,8 +475,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jxr-plugin</artifactId>
                 <configuration>
-                    <inputEncoding>UTF-8</inputEncoding>
-                    <outputEncoding>UTF-8</outputEncoding>
+                    <inputEncoding>${project.encoding}</inputEncoding>
+                    <outputEncoding>${project.encoding}</outputEncoding>
                     <linkJavadoc>true</linkJavadoc>
                     <javadocDir>apidocs</javadocDir>
                 </configuration>

diff --git a/...main/java/org/egovframe/rte/bat/core/item/composite/reader/EgovCompositeCursorReader.java b/...main/java/org/egovframe/rte/bat/core/item/composite/reader/EgovCompositeCursorReader.java
@@ -15,17 +15,12 @@
  */
 package org.egovframe.rte.bat.core.item.composite.reader;
 
-import java.util.List;
 import org.egovframe.rte.bat.core.item.composite.EgovItemsMapper;
-import org.springframework.batch.item.ExecutionContext;
-import org.springframework.batch.item.ItemStream;
-import org.springframework.batch.item.ItemStreamException;
-import org.springframework.batch.item.ItemStreamReader;
-import org.springframework.batch.item.NonTransientResourceException;
-import org.springframework.batch.item.ParseException;
-import org.springframework.batch.item.UnexpectedInputException;
+import org.springframework.batch.item.*;
 import org.springframework.batch.item.database.AbstractCursorItemReader;
 
+import java.util.List;
+
 /**
  * CompositeCursorReader를 통해 ItemReaderList에 등록된 DB아이템을 읽어들임 
  * 

diff --git a/...c/main/java/org/egovframe/rte/bat/core/item/composite/reader/EgovCompositeFileReader.java b/...c/main/java/org/egovframe/rte/bat/core/item/composite/reader/EgovCompositeFileReader.java
@@ -15,15 +15,10 @@
  */
 package org.egovframe.rte.bat.core.item.composite.reader;
 
-import java.util.List;
 import org.egovframe.rte.bat.core.item.composite.EgovItemsMapper;
-import org.springframework.batch.item.ExecutionContext;
-import org.springframework.batch.item.ItemStream;
-import org.springframework.batch.item.ItemStreamException;
-import org.springframework.batch.item.ItemStreamReader;
-import org.springframework.batch.item.NonTransientResourceException;
-import org.springframework.batch.item.ParseException;
-import org.springframework.batch.item.UnexpectedInputException;
+import org.springframework.batch.item.*;
+
+import java.util.List;
 
 /**
  * CompositeReader를 통해 ItemReaderList에 등록된 아이템을 읽어들임 

diff --git a/...main/java/org/egovframe/rte/bat/core/item/composite/reader/EgovCompositePagingReader.java b/...main/java/org/egovframe/rte/bat/core/item/composite/reader/EgovCompositePagingReader.java
@@ -15,17 +15,12 @@
  */
 package org.egovframe.rte.bat.core.item.composite.reader;
 
-import java.util.List;
 import org.egovframe.rte.bat.core.item.composite.EgovItemsMapper;
-import org.springframework.batch.item.ExecutionContext;
-import org.springframework.batch.item.ItemStream;
-import org.springframework.batch.item.ItemStreamException;
-import org.springframework.batch.item.ItemStreamReader;
-import org.springframework.batch.item.NonTransientResourceException;
-import org.springframework.batch.item.ParseException;
-import org.springframework.batch.item.UnexpectedInputException;
+import org.springframework.batch.item.*;
 import org.springframework.batch.item.database.AbstractPagingItemReader;
 
+import java.util.List;
+
 /**
  * CompositeReader를 통해 ItemReaderList에 등록된 아이템을 읽어들임 
  * 

diff --git a/....core/src/main/java/org/egovframe/rte/bat/core/item/database/EgovJdbcBatchItemWriter.java b/....core/src/main/java/org/egovframe/rte/bat/core/item/database/EgovJdbcBatchItemWriter.java
@@ -15,13 +15,6 @@
  */
 package org.egovframe.rte.bat.core.item.database;
 
-import java.lang.reflect.Method;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import javax.sql.DataSource;
 import org.egovframe.rte.bat.core.item.database.support.EgovItemPreparedStatementSetter;
 import org.egovframe.rte.bat.core.reflection.EgovReflectionSupport;
 import org.slf4j.Logger;
@@ -35,6 +28,14 @@
 import org.springframework.jdbc.core.PreparedStatementCallback;
 import org.springframework.util.Assert;
 
+import javax.sql.DataSource;
+import java.lang.reflect.Method;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
 /**
  * EgovJdbcBatchItemWriter EgovItemPreparedStatementSetter인터페이스를 상속받은
  * ItemPreparedStatementSetter이 설정되어 있어야 함.

diff --git a/...re/src/main/java/org/egovframe/rte/bat/core/item/database/EgovMyBatisBatchItemWriter.java b/...re/src/main/java/org/egovframe/rte/bat/core/item/database/EgovMyBatisBatchItemWriter.java
@@ -15,6 +15,14 @@
  */
 package org.egovframe.rte.bat.core.item.database;
 
+import org.egovframe.rte.bat.support.EgovJobVariableListener;
+import org.egovframe.rte.bat.support.EgovResourceVariable;
+import org.egovframe.rte.bat.support.EgovStepVariableListener;
+import org.mybatis.spring.batch.MyBatisBatchItemWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.ReflectionUtils;
+
 import java.beans.BeanInfo;
 import java.beans.IntrospectionException;
 import java.beans.Introspector;
@@ -25,13 +33,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.mybatis.spring.batch.MyBatisBatchItemWriter;
-import org.egovframe.rte.bat.support.EgovResourceVariable;
-import org.egovframe.rte.bat.support.EgovJobVariableListener;
-import org.egovframe.rte.bat.support.EgovStepVariableListener;
-import org.springframework.util.ReflectionUtils;
 
 /**
  * EgovMyBatisBatchItemWriter 클래스

diff --git a/...e/src/main/java/org/egovframe/rte/bat/core/item/database/EgovMyBatisPagingItemReader.java b/...e/src/main/java/org/egovframe/rte/bat/core/item/database/EgovMyBatisPagingItemReader.java
@@ -15,13 +15,15 @@
  */
 package org.egovframe.rte.bat.core.item.database;
 
-import static org.springframework.util.ClassUtils.getShortName;
-import java.util.HashMap;
-import java.util.Map;
-import org.mybatis.spring.batch.MyBatisPagingItemReader;
 import org.egovframe.rte.bat.support.EgovJobVariableListener;
 import org.egovframe.rte.bat.support.EgovResourceVariable;
 import org.egovframe.rte.bat.support.EgovStepVariableListener;
+import org.mybatis.spring.batch.MyBatisPagingItemReader;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.springframework.util.ClassUtils.getShortName;
 
 /**
  * EgovMyBatisPagingItemReader 클래스