diff --git a/annotations/annotations-struts/pom.xml b/annotations/annotations-struts/pom.xml index 2894cfc..46c586b 100644 --- a/annotations/annotations-struts/pom.xml +++ b/annotations/annotations-struts/pom.xml @@ -143,13 +143,6 @@ ${mockito.version} test - - - org.mockito - mockito-inline - ${mockito.version} - test - org.hamcrest diff --git a/control-tags/control-tags-struts/pom.xml b/control-tags/control-tags-struts/pom.xml index a023c09..975c79d 100644 --- a/control-tags/control-tags-struts/pom.xml +++ b/control-tags/control-tags-struts/pom.xml @@ -45,13 +45,6 @@ test - - org.mockito - mockito-inline - ${mockito.version} - test - - org.hamcrest hamcrest diff --git a/exclude-parameters/exclude-parameters-struts/pom.xml b/exclude-parameters/exclude-parameters-struts/pom.xml index 115c1fa..6162089 100644 --- a/exclude-parameters/exclude-parameters-struts/pom.xml +++ b/exclude-parameters/exclude-parameters-struts/pom.xml @@ -44,13 +44,6 @@ ${mockito.version} test - - - org.mockito - mockito-inline - ${mockito.version} - test - org.hamcrest diff --git a/form-tags/form-tags-struts/pom.xml b/form-tags/form-tags-struts/pom.xml index 26dd3dd..0dfa388 100644 --- a/form-tags/form-tags-struts/pom.xml +++ b/form-tags/form-tags-struts/pom.xml @@ -45,11 +45,5 @@ test - - org.mockito - mockito-inline - ${mockito.version} - test - diff --git a/form-validation-using-xml/form-xml-validation-struts/pom.xml b/form-validation-using-xml/form-xml-validation-struts/pom.xml index 8b4040b..dc6c73a 100644 --- a/form-validation-using-xml/form-xml-validation-struts/pom.xml +++ b/form-validation-using-xml/form-xml-validation-struts/pom.xml @@ -44,13 +44,6 @@ ${mockito.version} test - - - org.mockito - mockito-inline - ${mockito.version} - test - org.hamcrest diff --git a/introducing-interceptors/README.md b/introducing-interceptors/README.md index d67e441..cad74dc 100644 --- a/introducing-interceptors/README.md +++ b/introducing-interceptors/README.md @@ -135,12 +135,22 @@ INFO: Executed action /register!execute took 177 ms. * 프로젝트 변경사항 * 프로젝트명: [interceptors-struts](interceptors-struts) 로 변경. + * Spring 5 + JPA + Hibernate + HSQLDB 로 동작하도록 프로젝트를 구성. + * 액션, 서비스, 레파지토리코드에 대한 테스트코드를 추가. + * 나만의 인터셉터 만들기를 별도 가이드 링크만 해주시길레 그 가이드 보고 추가해보았다. + * [SimpleInterceptor.java](./interceptors-struts/src/main/java/org/fp024/struts2/study/register/interceptor/SimpleInterceptor.java) + * mockito-inline 사용해보았는데.. 훌륭한 모듈 같다. CALLS_REAL_METHODS 옵션을 지정하면 스텁으로 정의하지 않은 메서드는 실제 메서드를 호출하는 부분이 정말 마음에 들었다! + > ✨ Mockito 5.3.0 부터 Core에 통합된 것 같다. + > + > * https://github.com/mockito/mockito/releases/tag/v5.3.0 + > * https://github.com/mockito/mockito/issues/2877 + * [x] 소개 * [x] 인터셉터 입문 diff --git a/introducing-interceptors/interceptors-struts/pom.xml b/introducing-interceptors/interceptors-struts/pom.xml index 106ca3b..37e1118 100644 --- a/introducing-interceptors/interceptors-struts/pom.xml +++ b/introducing-interceptors/interceptors-struts/pom.xml @@ -91,20 +91,19 @@ test - - org.fp024.struts2.study - struts2-junit5-user-custom-plugin - 1.0.0-SNAPSHOT + org.mockito + mockito-junit-jupiter + ${mockito.version} test + - org.mockito - mockito-inline - ${mockito.version} + org.fp024.struts2.study + struts2-junit5-user-custom-plugin + 1.0.0-SNAPSHOT test - diff --git a/json/json-customize-flexjson-struts/pom.xml b/json/json-customize-flexjson-struts/pom.xml index f18f9b2..4e8f8ad 100644 --- a/json/json-customize-flexjson-struts/pom.xml +++ b/json/json-customize-flexjson-struts/pom.xml @@ -76,13 +76,5 @@ test - - org.mockito - mockito-inline - ${mockito.version} - test - - - diff --git a/json/json-customize-jackson-struts/pom.xml b/json/json-customize-jackson-struts/pom.xml index 67fa1e1..3c1b440 100644 --- a/json/json-customize-jackson-struts/pom.xml +++ b/json/json-customize-jackson-struts/pom.xml @@ -83,12 +83,5 @@ ${mockito.version} test - - - org.mockito - mockito-inline - ${mockito.version} - test - diff --git a/json/json-struts/pom.xml b/json/json-struts/pom.xml index 96362b7..6c94afc 100644 --- a/json/json-struts/pom.xml +++ b/json/json-struts/pom.xml @@ -83,14 +83,5 @@ ${mockito.version} test - - - org.mockito - mockito-inline - ${mockito.version} - test - - - diff --git a/pom.xml b/pom.xml index d36a853..0b7dc1d 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 1.2.5 6.1.2 - 5.3.26 + 5.3.27 2.20.0 @@ -45,19 +45,19 @@ 1.3.2 - 6.20.0 + 6.20.3 1.18.26 5.9.2 - 5.2.0 + 5.3.1 2.2 3.24.2 9.5 - 10.0.14 + 10.0.15 /${project.build.finalName} diff --git a/preparable-interface/preparable-interface-struts/pom.xml b/preparable-interface/preparable-interface-struts/pom.xml index f356ea2..7d0753f 100644 --- a/preparable-interface/preparable-interface-struts/pom.xml +++ b/preparable-interface/preparable-interface-struts/pom.xml @@ -45,13 +45,6 @@ test - - org.mockito - mockito-inline - ${mockito.version} - test - - org.hamcrest hamcrest diff --git a/themes/themes-struts/pom.xml b/themes/themes-struts/pom.xml index f22ba05..b139b5f 100644 --- a/themes/themes-struts/pom.xml +++ b/themes/themes-struts/pom.xml @@ -45,13 +45,6 @@ test - - org.mockito - mockito-inline - ${mockito.version} - test - - org.hamcrest hamcrest diff --git a/wildcard-method-selection/wildcard-method-selection-struts/pom.xml b/wildcard-method-selection/wildcard-method-selection-struts/pom.xml index 2318201..798f001 100644 --- a/wildcard-method-selection/wildcard-method-selection-struts/pom.xml +++ b/wildcard-method-selection/wildcard-method-selection-struts/pom.xml @@ -105,13 +105,6 @@ ${mockito.version} test - - - org.mockito - mockito-inline - ${mockito.version} - test - org.hamcrest