라이브러리 버전업, mockito-inline 디펜던시 제거

- mockito-inline 디펜던시 제거 mockito 5.3.0 부터 mocktio-core에 통합된 것 같다. > * https://github.com/mockito/mockito/releases/tag/v5.3.0 > * mockito/mockito#2877
fp024 · Apr 22, 2023 · 49de68c · 49de68c
1 parent 6443dde
commit 49de68c
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 91 deletions.
diff --git a/annotations/annotations-struts/pom.xml b/annotations/annotations-struts/pom.xml
@@ -143,13 +143,6 @@
       <version>${mockito.version}</version>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <version>${mockito.version}</version>
-      <scope>test</scope>
-    </dependency>
 
     <dependency>
       <groupId>org.hamcrest</groupId>

diff --git a/control-tags/control-tags-struts/pom.xml b/control-tags/control-tags-struts/pom.xml
@@ -45,13 +45,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <version>${mockito.version}</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest</artifactId>

diff --git a/exclude-parameters/exclude-parameters-struts/pom.xml b/exclude-parameters/exclude-parameters-struts/pom.xml
@@ -44,13 +44,6 @@
       <version>${mockito.version}</version>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <version>${mockito.version}</version>
-      <scope>test</scope>
-    </dependency>
 
     <dependency>
       <groupId>org.hamcrest</groupId>

diff --git a/form-tags/form-tags-struts/pom.xml b/form-tags/form-tags-struts/pom.xml
@@ -45,11 +45,5 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <version>${mockito.version}</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git 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 @@
       <version>${mockito.version}</version>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <version>${mockito.version}</version>
-      <scope>test</scope>
-    </dependency>
 
     <dependency>
       <groupId>org.hamcrest</groupId>

diff --git 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
@@ -91,20 +91,19 @@
       <scope>test</scope>
     </dependency>
 
-    <!-- JUnit 5를 사용하기 위해 https://github.com/apache/struts/tree/master/plugins/junit 프로젝트를 수정했다. -->
     <dependency>
-      <groupId>org.fp024.struts2.study</groupId>
-      <artifactId>struts2-junit5-user-custom-plugin</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <version>${mockito.version}</version>
       <scope>test</scope>
     </dependency>
 
+    <!-- JUnit 5를 사용하기 위해 https://github.com/apache/struts/tree/master/plugins/junit 프로젝트를 수정했다. -->
     <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <version>${mockito.version}</version>
+      <groupId>org.fp024.struts2.study</groupId>
+      <artifactId>struts2-junit5-user-custom-plugin</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
 </project>
diff --git a/json/json-customize-flexjson-struts/pom.xml b/json/json-customize-flexjson-struts/pom.xml
@@ -76,13 +76,5 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <version>${mockito.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-
   </dependencies>
 </project>
diff --git a/json/json-customize-jackson-struts/pom.xml b/json/json-customize-jackson-struts/pom.xml
@@ -83,12 +83,5 @@
       <version>${mockito.version}</version>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <version>${mockito.version}</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/json/json-struts/pom.xml b/json/json-struts/pom.xml
@@ -83,14 +83,5 @@
       <version>${mockito.version}</version>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <version>${mockito.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-
   </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
     <apache.taglibs-standard-impl.version>1.2.5</apache.taglibs-standard-impl.version>
 
     <struts2.version>6.1.2</struts2.version>
-    <spring.platformVersion>5.3.26</spring.platformVersion>
+    <spring.platformVersion>5.3.27</spring.platformVersion>
 
     <log4j2.version>2.20.0</log4j2.version>
 
@@ -45,19 +45,19 @@
 
     <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
 
-    <jasperreports.version>6.20.0</jasperreports.version>
+    <jasperreports.version>6.20.3</jasperreports.version>
 
     <lombok.version>1.18.26</lombok.version>
 
     <junit.version>5.9.2</junit.version>
-    <mockito.version>5.2.0</mockito.version>
+    <mockito.version>5.3.1</mockito.version>
     <hamcrest.version>2.2</hamcrest.version>
     <assertj.version>3.24.2</assertj.version>
 
     <!-- struts2-convention-plugin에서 Java 17 바이트 코드 해석을 못해서, 버전을 올렸다. -->
     <asm.version>9.5</asm.version>
 
-    <jetty.version>10.0.14</jetty.version>
+    <jetty.version>10.0.15</jetty.version>
     <jettyContextPath>/${project.build.finalName}</jettyContextPath>
 
     <!-- 현시점 환경에서 다시 시도해봤을 때, Jetty 리로딩에 문제가 없어서 Enter를 누르면 재시작 되도록 0으로 설정을 바꾸었다. -->

diff --git a/preparable-interface/preparable-interface-struts/pom.xml b/preparable-interface/preparable-interface-struts/pom.xml
@@ -45,13 +45,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <version>${mockito.version}</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest</artifactId>

diff --git a/themes/themes-struts/pom.xml b/themes/themes-struts/pom.xml
@@ -45,13 +45,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <version>${mockito.version}</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest</artifactId>

diff --git a/wildcard-method-selection/wildcard-method-selection-struts/pom.xml b/wildcard-method-selection/wildcard-method-selection-struts/pom.xml
@@ -105,13 +105,6 @@
       <version>${mockito.version}</version>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <version>${mockito.version}</version>
-      <scope>test</scope>
-    </dependency>
 
     <dependency>
       <groupId>org.hamcrest</groupId>