Skip to content

Commit

Permalink
mockito-inline 디펜던시제거, 라이브러리 버전업
Browse files Browse the repository at this point in the history
- mockito-inline 디펜던시 제거
  mockito 5.3.0 부터 mocktio-core에 통합된 것 같다.
  > * https://github.com/mockito/mockito/releases/tag/v5.3.0
  > * mockito/mockito#2877
  • Loading branch information
mklinkj committed Apr 22, 2023
1 parent be767dd commit 6d42ef7
Show file tree
Hide file tree
Showing 14 changed files with 9 additions and 21 deletions.
1 change: 0 additions & 1 deletion chap09/pro09/build.gradle
Expand Up @@ -38,7 +38,6 @@ dependencies {
testImplementation "org.junit.jupiter:junit-jupiter:${junitVersion}"
testImplementation "org.assertj:assertj-core:${assertJVersion}"
testImplementation "org.mockito:mockito-core:${mockitoVersion}"
testImplementation "org.mockito:mockito-inline:${mockitoVersion}"

testRuntimeOnly "jakarta.servlet:jakarta.servlet-api:${jakartaServletApiVersion}"

Expand Down
1 change: 0 additions & 1 deletion chap10/pro10/build.gradle
Expand Up @@ -38,7 +38,6 @@ dependencies {
testImplementation "org.junit.jupiter:junit-jupiter:${junitVersion}"
testImplementation "org.assertj:assertj-core:${assertJVersion}"
testImplementation "org.mockito:mockito-core:${mockitoVersion}"
testImplementation "org.mockito:mockito-inline:${mockitoVersion}"

testRuntimeOnly "jakarta.servlet:jakarta.servlet-api:${jakartaServletApiVersion}"

Expand Down
1 change: 0 additions & 1 deletion chap11/pro11/build.gradle
Expand Up @@ -38,7 +38,6 @@ dependencies {
testImplementation "org.junit.jupiter:junit-jupiter:${junitVersion}"
testImplementation "org.assertj:assertj-core:${assertJVersion}"
testImplementation "org.mockito:mockito-core:${mockitoVersion}"
testImplementation "org.mockito:mockito-inline:${mockitoVersion}"

testRuntimeOnly "jakarta.servlet:jakarta.servlet-api:${jakartaServletApiVersion}"

Expand Down
1 change: 0 additions & 1 deletion chap12/pro12/build.gradle
Expand Up @@ -38,7 +38,6 @@ dependencies {
testImplementation "org.junit.jupiter:junit-jupiter:${junitVersion}"
testImplementation "org.assertj:assertj-core:${assertJVersion}"
testImplementation "org.mockito:mockito-core:${mockitoVersion}"
testImplementation "org.mockito:mockito-inline:${mockitoVersion}"

testRuntimeOnly "jakarta.servlet:jakarta.servlet-api:${jakartaServletApiVersion}"

Expand Down
1 change: 0 additions & 1 deletion chap13/pro13/build.gradle
Expand Up @@ -38,7 +38,6 @@ dependencies {
testImplementation "org.junit.jupiter:junit-jupiter:${junitVersion}"
testImplementation "org.assertj:assertj-core:${assertJVersion}"
testImplementation "org.mockito:mockito-core:${mockitoVersion}"
testImplementation "org.mockito:mockito-inline:${mockitoVersion}"

testRuntimeOnly "jakarta.servlet:jakarta.servlet-api:${jakartaServletApiVersion}"

Expand Down
1 change: 0 additions & 1 deletion chap14/pro14/build.gradle
Expand Up @@ -40,7 +40,6 @@ dependencies {
testImplementation "org.junit.jupiter:junit-jupiter:${junitVersion}"
testImplementation "org.assertj:assertj-core:${assertJVersion}"
testImplementation "org.mockito:mockito-core:${mockitoVersion}"
testImplementation "org.mockito:mockito-inline:${mockitoVersion}"

testRuntimeOnly "jakarta.servlet:jakarta.servlet-api:${jakartaServletApiVersion}"

Expand Down
1 change: 0 additions & 1 deletion chap15/pro15-servlet4/build.gradle
Expand Up @@ -46,7 +46,6 @@ dependencies {
testImplementation "org.junit.jupiter:junit-jupiter:${junitVersion}"
testImplementation "org.assertj:assertj-core:${assertJVersion}"
testImplementation "org.mockito:mockito-core:${mockitoVersion}"
testImplementation "org.mockito:mockito-inline:${mockitoVersion}"

testRuntimeOnly "javax.servlet:javax.servlet-api:${javaxServletApiVersion}"

Expand Down
1 change: 0 additions & 1 deletion chap15/pro15/build.gradle
Expand Up @@ -44,7 +44,6 @@ dependencies {
testImplementation "org.junit.jupiter:junit-jupiter:${junitVersion}"
testImplementation "org.assertj:assertj-core:${assertJVersion}"
testImplementation "org.mockito:mockito-core:${mockitoVersion}"
testImplementation "org.mockito:mockito-inline:${mockitoVersion}"

testRuntimeOnly "jakarta.servlet:jakarta.servlet-api:${jakartaServletApiVersion}"

Expand Down
1 change: 0 additions & 1 deletion chap16/pro16/build.gradle
Expand Up @@ -44,7 +44,6 @@ dependencies {
testImplementation "org.assertj:assertj-core:${assertJVersion}"
testImplementation "net.javacrumbs.json-unit:json-unit-assertj:${jsonUnitAssertJVersion}"
testImplementation "org.mockito:mockito-core:${mockitoVersion}"
testImplementation "org.mockito:mockito-inline:${mockitoVersion}"

testRuntimeOnly "jakarta.servlet:jakarta.servlet-api:${jakartaServletApiVersion}"

Expand Down
1 change: 0 additions & 1 deletion chap17/pro17/build.gradle
Expand Up @@ -46,7 +46,6 @@ dependencies {
testImplementation "org.assertj:assertj-core:${assertJVersion}"
testImplementation "net.javacrumbs.json-unit:json-unit-assertj:${jsonUnitAssertJVersion}"
testImplementation "org.mockito:mockito-core:${mockitoVersion}"
testImplementation "org.mockito:mockito-inline:${mockitoVersion}"

testRuntimeOnly "jakarta.servlet:jakarta.servlet-api:${jakartaServletApiVersion}"

Expand Down
1 change: 0 additions & 1 deletion chap18/pro18/build.gradle
Expand Up @@ -50,7 +50,6 @@ dependencies {
testImplementation "org.assertj:assertj-core:${assertJVersion}"
testImplementation "net.javacrumbs.json-unit:json-unit-assertj:${jsonUnitAssertJVersion}"
testImplementation "org.mockito:mockito-core:${mockitoVersion}"
testImplementation "org.mockito:mockito-inline:${mockitoVersion}"

testRuntimeOnly "jakarta.servlet:jakarta.servlet-api:${jakartaServletApiVersion}"

Expand Down
1 change: 0 additions & 1 deletion chap19/pro19/build.gradle
Expand Up @@ -52,7 +52,6 @@ dependencies {
testImplementation "org.assertj:assertj-core:${assertJVersion}"
testImplementation "net.javacrumbs.json-unit:json-unit-assertj:${jsonUnitAssertJVersion}"
testImplementation "org.mockito:mockito-core:${mockitoVersion}"
testImplementation "org.mockito:mockito-inline:${mockitoVersion}"

testRuntimeOnly "jakarta.servlet:jakarta.servlet-api:${jakartaServletApiVersion}"

Expand Down
16 changes: 8 additions & 8 deletions gradle.properties
Expand Up @@ -15,15 +15,15 @@ junitVersion=5.9.2
assertJVersion=3.24.2
# https://github.com/lukas-krecan/JsonUnit
jsonUnitAssertJVersion=2.37.0
mockitoVersion=5.3.0
mockitoVersion=5.3.1

# 17장 이전 까지는 Spring을 사용하진 않지만, MockHttpServletResponse/Request 테스트를 위해 spring-test만 먼저 추가해본다.
# 18장 부터는 Spring을 정식으로 사용함.
springVersion=6.0.7
springVersion=6.0.8

# Gretty : https://github.com/gretty-gradle-plugin/gretty
grettyVersion=4.0.3
tomcat10Version=10.1.7
tomcat10Version=10.1.8
# https://github.com/gretty-gradle-plugin/gretty/blob/master/gradle.properties
tomcat10ServletApiVersion=6.0.0

Expand All @@ -40,10 +40,10 @@ jakartaServletJspJstlVersion=3.0.1

# https://www.oracle.com/kr/database/technologies/appdev/jdbc-downloads.html
# https://mvnrepository.com/artifact/com.oracle.database.jdbc/ojdbc8
ojdbcVersion=21.9.0.0
ojdbcVersion=23.2.0.0

# https://mvnrepository.com/artifact/com.mysql/mysql-connector-j
mysqlConnectorJVersion=8.0.32
mysqlConnectorJVersion=8.0.33

# https://github.com/h-thurow/Simple-JNDI
simpleJndiVersion=0.23.0
Expand All @@ -61,7 +61,7 @@ bootstrapVersion=5.2.3
# MyBatis
mybatisVersion=3.5.13
mybatisSpringVersion=3.0.1
mybatisDynamicSqlVersion=1.4.1
mybatisDynamicSqlVersion=1.5.0

hikariCpVersion=5.0.1

Expand All @@ -73,7 +73,7 @@ hikariCpVersion=5.0.1
# #
##################################################

spring5Version=5.3.26
spring5Version=5.3.27
commonsFileUploadVersion=1.5

gretty3Version=3.1.1
Expand All @@ -89,4 +89,4 @@ javaxServletJspJstlVersion=1.2

javaTimeJspTagsJavaxVersion=1.1.4

tomcat9Version=9.0.73
tomcat9Version=9.0.74
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 6d42ef7

Please sign in to comment.