From 1f9a1528003bc67da20034ed0fc81e19f4722367 Mon Sep 17 00:00:00 2001
From: fp024 <aopenasus@naver.com>
Date: Mon, 3 Jun 2024 12:48:39 +0900
Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=EB=9F=AC=EB=A6=AC?=
 =?UTF-8?q?=20=EB=B2=84=EC=A0=84=EC=97=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Maven Wrapper를 버전업하려다 Maven 버전만 올렸다.

예전에는 현재 디렉토리에 .mvn이 없더라도 상위 폴더의 .mvn 폴더의 설정이 적용이 되었던 것 같은데..
지금은 mvnw가 위치한 디렉토리에 .mvn 폴더가 없으면 에러남.
---
 .mvn/wrapper/maven-wrapper.properties |  2 +-
 pom.xml                               | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 346d645..11f5868 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
diff --git a/pom.xml b/pom.xml
index 9bf751a..49866e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
     
     
     <struts2.version>6.4.0</struts2.version>
-    <spring.platformVersion>5.3.34</spring.platformVersion>
+    <spring.platformVersion>5.3.36</spring.platformVersion>
     
     <struts2-junit5-user-custom-plugin.version>${project.version}</struts2-junit5-user-custom-plugin.version>
     
@@ -33,13 +33,13 @@
     <log4j2.version>2.23.1</log4j2.version>
     
     <!-- Jackson 버전이 뒤섞이는 경우가 있어서 jackson-bom을 추가했다. -->
-    <jackson.version>2.17.0</jackson.version>
+    <jackson.version>2.17.1</jackson.version>
     
     <flexjson.version>3.3</flexjson.version>
 
     <hikaricp.version>5.1.0</hikaricp.version>
     <hibernate.version>5.6.15.Final</hibernate.version>
-    <hsqldb.version>2.7.2</hsqldb.version>
+    <hsqldb.version>2.7.3</hsqldb.version>
 
     <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
 
@@ -48,15 +48,15 @@
     <lombok.version>1.18.32</lombok.version>
 
     <junit.version>5.10.2</junit.version>
-    <mockito.version>5.11.0</mockito.version>
+    <mockito.version>5.12.0</mockito.version>
     <hamcrest.version>2.2</hamcrest.version>
-    <assertj.version>3.25.3</assertj.version>
+    <assertj.version>3.26.0</assertj.version>
 
     <!-- struts2-convention-plugin에서 Java 17 바이트 코드 해석을 못해서, 버전을 올렸다. -->
     <asm.version>9.7</asm.version>
 
 
-    <jetty.version>12.0.8</jetty.version>
+    <jetty.version>12.0.9</jetty.version>
     <jetty-plugin-group-id>org.eclipse.jetty.ee8</jetty-plugin-group-id>
     <jetty-plugin-artifact-id>jetty-ee8-maven-plugin</jetty-plugin-artifact-id>
     
@@ -69,7 +69,7 @@
     <jetty-exclude-jstl-version>1.2.5</jetty-exclude-jstl-version>
 
 
-    <jetty10.version>10.0.20</jetty10.version>
+    <jetty10.version>10.0.21</jetty10.version>
     <jetty10-plugin-group-id>org.eclipse.jetty</jetty10-plugin-group-id>
     <jetty10-plugin-artifact-id>jetty-maven-plugin</jetty10-plugin-artifact-id>
     
@@ -96,12 +96,12 @@
     <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
     <maven-failsafe-plugin.version>3.2.5</maven-failsafe-plugin.version>
     <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
-    <maven-install-plugin.version>3.1.1</maven-install-plugin.version>
-    <maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
+    <maven-install-plugin.version>3.1.2</maven-install-plugin.version>
+    <maven-deploy-plugin.version>3.1.2</maven-deploy-plugin.version>
     <maven-toolchains-plugin.version>3.2.0</maven-toolchains-plugin.version>
     
     <!-- Struts JUnit Plugin -->
-    <commons-compress.version>1.26.1</commons-compress.version>
+    <commons-compress.version>1.26.2</commons-compress.version>
     <portlet-api.version>3.0.1</portlet-api.version>
   </properties>