Skip to content

Commit

Permalink
feat: upgrade swagger dependencies (#1379)
Browse files Browse the repository at this point in the history
  • Loading branch information
tkrop committed Apr 7, 2022
1 parent fe9b094 commit 84b0c8c
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 15 deletions.
6 changes: 3 additions & 3 deletions server/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ plugins {
jacoco
`maven-publish`
signing
id("com.github.ben-manes.versions") version "0.20.0"
id("com.github.ben-manes.versions") version "0.42.0"
id("org.jetbrains.dokka") version "1.6.10" apply false

// We apply this so that ktlint can format the top level buildscript
Expand Down Expand Up @@ -156,11 +156,11 @@ subprojects {
implementation("org.yaml:snakeyaml:1.30")

testImplementation("com.jayway.jsonpath:json-path-assert:2.7.0")
testImplementation("org.mockito:mockito-core:2.28.2")
testImplementation("org.mockito:mockito-core:4.4.0")
}

jacoco {
toolVersion = "0.8.2"
toolVersion = "0.8.8"
}

tasks.test {
Expand Down
6 changes: 3 additions & 3 deletions server/zally-core/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
dependencies {
kapt("com.google.auto.service:auto-service:1.0-rc6")
kapt("com.google.auto.service:auto-service:1.0.1")

api(project(":zally-rule-api"))
api("io.swagger.parser.v3:swagger-parser:2.0.26")
api("io.swagger.parser.v3:swagger-parser:2.0.32")
api("io.github.config4k:config4k:0.4.2")
implementation("com.google.auto.service:auto-service:1.0-rc6")
implementation("com.google.auto.service:auto-service:1.0.1")

testImplementation(project(":zally-test"))
}
6 changes: 3 additions & 3 deletions server/zally-rule-api/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
dependencies {
implementation("io.swagger.core.v3:swagger-models:2.1.1")
implementation("io.swagger:swagger-models:1.6.0")
implementation("io.swagger.core.v3:swagger-models:2.2.0")
implementation("io.swagger:swagger-models:1.6.6")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.12.2")

testImplementation(platform("org.junit:junit-bom:5.8.1"))
testImplementation(platform("org.junit:junit-bom:5.8.2"))
testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("org.assertj:assertj-core:3.11.0")
}
5 changes: 3 additions & 2 deletions server/zally-server/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ dependencies {
exclude("org.hibernate", "hibernate-entitymanager")
}
implementation("org.zalando.stups:stups-spring-oauth2-server:1.0.24")
implementation("org.zalando:problem-spring-web:0.26.2")
implementation("org.zalando:problem:0.27.1")
implementation("org.zalando:problem-spring-web:0.27.0")
implementation("org.zalando:twintip-spring-web:1.2.0")

testImplementation(project(":zally-test"))
Expand All @@ -43,7 +44,7 @@ dependencies {
testImplementation("net.jadler:jadler-junit:$jadlerVersion")
testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("com.jayway.jsonpath:json-path-assert:2.7.0")
testImplementation("org.mockito:mockito-core:2.28.2")
testImplementation("org.mockito:mockito-core:4.4.0")
}

tasks.bootRun {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Qualifier
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
import org.springframework.context.annotation.Primary
import org.zalando.problem.ProblemModule
import org.zalando.problem.jackson.ProblemModule

@Configuration
class JacksonObjectMapperConfiguration {
Expand Down
6 changes: 3 additions & 3 deletions server/zally-test/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dependencies {
api(project(":zally-rule-api"))
api("org.junit.jupiter:junit-jupiter-api:5.8.1")
api("org.junit.jupiter:junit-jupiter-params:5.8.1")
api("org.junit.jupiter:junit-jupiter-api:5.8.2")
api("org.junit.jupiter:junit-jupiter-params:5.8.2")
api("org.assertj:assertj-core:3.11.0")
api("ch.qos.logback:logback-classic:1.2.3")
api("ch.qos.logback:logback-classic:1.3.0-alpha14")
}

0 comments on commit 84b0c8c

Please sign in to comment.