Skip to content

Commit e57785e

Browse files
committed
Struts 7.1.1 버전 업데이트 및 Jackson 설정 수정
commons.lang3.StringUtils의 startsWith()도 표준 메서드로 변경
1 parent b60fa23 commit e57785e

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

json/json-customize-jackson-struts/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
<dependency>
4646
<groupId>com.fasterxml.jackson.core</groupId>
4747
<artifactId>jackson-databind</artifactId>
48+
<version>${jackson.version}</version>
4849
</dependency>
4950

5051
<!--

json/json-customize-jackson-struts/src/main/java/org/fp024/struts2/study/demo/json/JacksonJSONWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public String write(
4141
// Flexjson 의 경우처럼 아무일도 하지 않는 ExcludeTransformer 를 따로 만들필요는 없는 것 같다.
4242
// https://www.baeldung.com/jackson-ignore-null-fields
4343
if (excludeNullProperties) {
44-
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
44+
mapper.setDefaultPropertyInclusion(JsonInclude.Include.NON_NULL);
4545
}
4646

4747
if (dateFormatter != null) {

plugins/struts2-junit5-user-custom-plugin/src/main/java/org/apache/struts2/junit/ConventionPluginResourceLoader.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
package org.apache.struts2.junit;
2020

2121
import java.net.URL;
22-
import org.apache.commons.lang3.StringUtils;
2322
import org.apache.logging.log4j.LogManager;
2423
import org.apache.logging.log4j.Logger;
2524
import org.springframework.core.io.DefaultResourceLoader;
@@ -31,7 +30,7 @@ public class ConventionPluginResourceLoader extends DefaultResourceLoader {
3130

3231
@Override
3332
public Resource getResource(String location) {
34-
if (StringUtils.startsWith(location, "/WEB-INF/")) {
33+
if (location != null && location.startsWith("/WEB-INF/")) {
3534
try {
3635
URL url =
3736
new URL("file:/" + System.getProperty("user.dir") + "/src/main/webapp" + location);

pom.xml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,48 +25,48 @@
2525
<jakarta.servlet.jsp.jstl.version>3.0.1</jakarta.servlet.jsp.jstl.version>
2626

2727

28-
<struts2.version>7.0.3</struts2.version>
29-
<spring.platformVersion>6.2.5</spring.platformVersion>
28+
<struts2.version>7.1.1</struts2.version>
29+
<spring.platformVersion>6.2.15</spring.platformVersion>
3030

3131
<struts2-junit5-user-custom-plugin.version>${project.version}</struts2-junit5-user-custom-plugin.version>
3232

3333

34-
<log4j2.version>2.24.3</log4j2.version>
34+
<log4j2.version>2.25.3</log4j2.version>
3535

3636
<!-- Jackson 버전이 뒤섞이는 경우가 있어서 jackson-bom을 추가했다. -->
37-
<jackson.version>2.18.3</jackson.version>
37+
<jackson.version>2.20.1</jackson.version>
3838

3939
<flexjson.version>3.3</flexjson.version>
4040

41-
<hikaricp.version>6.3.0</hikaricp.version>
42-
<hibernate.version>6.6.13.Final</hibernate.version>
41+
<hikaricp.version>7.0.2</hikaricp.version>
42+
<hibernate.version>6.6.40.Final</hibernate.version>
4343
<hsqldb.version>2.7.4</hsqldb.version>
4444

4545
<jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
4646

47-
<jasperreports.version>6.21.4</jasperreports.version>
47+
<jasperreports.version>6.21.5</jasperreports.version>
4848

49-
<lombok.version>1.18.38</lombok.version>
49+
<lombok.version>1.18.42</lombok.version>
5050

51-
<junit.version>5.12.1</junit.version>
52-
<mockito.version>5.17.0</mockito.version>
51+
<junit.version>5.14.1</junit.version>
52+
<mockito.version>5.21.0</mockito.version>
5353
<hamcrest.version>3.0</hamcrest.version>
54-
<assertj.version>3.27.3</assertj.version>
54+
<assertj.version>3.27.6</assertj.version>
5555

5656
<!-- struts2-convention-plugin에서 Java 17 바이트 코드 해석을 못해서, 버전을 올렸다. -->
57-
<asm.version>9.8</asm.version>
57+
<asm.version>9.9.1</asm.version>
5858

59-
<byte-buddy.version>1.17.5</byte-buddy.version>
59+
<byte-buddy.version>1.18.3</byte-buddy.version>
6060

6161
<!-- WebJars-->
6262
<webjars-locator-core.version>0.59</webjars-locator-core.version>
6363
<webjars.jquery.version>3.7.1</webjars.jquery.version>
6464

65-
<jetty.version>12.0.19</jetty.version>
65+
<jetty.version>12.1.5</jetty.version>
6666
<jetty-plugin-group-id>org.eclipse.jetty.ee10</jetty-plugin-group-id>
6767
<jetty-plugin-artifact-id>jetty-ee10-maven-plugin</jetty-plugin-artifact-id>
6868

69-
<jetty11.version>11.0.25</jetty11.version>
69+
<jetty11.version>11.0.26</jetty11.version>
7070
<jetty11-plugin-group-id>org.eclipse.jetty</jetty11-plugin-group-id>
7171
<jetty11-plugin-artifact-id>jetty-maven-plugin</jetty11-plugin-artifact-id>
7272

@@ -79,18 +79,18 @@
7979
<jettyAutoDeploy>-1</jettyAutoDeploy>
8080

8181
<!-- Maven Plugin 버전 -->
82-
<maven-clean-plugin.version>3.4.1</maven-clean-plugin.version>
83-
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
84-
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
85-
<maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
86-
<maven-failsafe-plugin.version>3.5.3</maven-failsafe-plugin.version>
87-
<maven-war-plugin.version>3.4.0</maven-war-plugin.version>
82+
<maven-clean-plugin.version>3.5.0</maven-clean-plugin.version>
83+
<maven-resources-plugin.version>3.4.0</maven-resources-plugin.version>
84+
<maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
85+
<maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
86+
<maven-failsafe-plugin.version>3.5.4</maven-failsafe-plugin.version>
87+
<maven-war-plugin.version>3.5.1</maven-war-plugin.version>
8888
<maven-install-plugin.version>3.1.4</maven-install-plugin.version>
8989
<maven-deploy-plugin.version>3.1.4</maven-deploy-plugin.version>
9090
<maven-toolchains-plugin.version>3.2.0</maven-toolchains-plugin.version>
9191

9292
<!-- Struts JUnit Plugin -->
93-
<commons-compress.version>1.27.1</commons-compress.version>
93+
<commons-compress.version>1.28.0</commons-compress.version>
9494
<portlet-api.version>3.0.1</portlet-api.version>
9595
</properties>
9696

0 commit comments

Comments
 (0)