feat: upgrade swagger dependencies (#1379)

zalando · Apr 8, 2022 · 38221c0 · 38221c0
1 parent fe9b094
commit 38221c0
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 30 deletions.
diff --git a/server/build.gradle.kts b/server/build.gradle.kts
@@ -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
@@ -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 {

diff --git a/server/zally-core/build.gradle.kts b/server/zally-core/build.gradle.kts
@@ -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"))
 }
diff --git a/server/zally-rule-api/build.gradle.kts b/server/zally-rule-api/build.gradle.kts
@@ -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")
 }
diff --git a/server/zally-server/build.gradle.kts b/server/zally-server/build.gradle.kts
@@ -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"))
@@ -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 {

diff --git a/...erver/src/main/kotlin/org/zalando/zally/configuration/JacksonObjectMapperConfiguration.kt b/...erver/src/main/kotlin/org/zalando/zally/configuration/JacksonObjectMapperConfiguration.kt
@@ -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 {

diff --git a/server/zally-server/src/main/resources/api/zally-api.yaml b/server/zally-server/src/main/resources/api/zally-api.yaml
@@ -78,8 +78,7 @@ paths:
               schema:
                 $ref: 'https://opensource.zalando.com/problem/schema.yaml#/Problem'
       security:
-      - oauth2:
-        - uid
+      - BearerAuth: [ uid ]
 
   '/api-violations/{externalId}':
     get:
@@ -113,8 +112,7 @@ paths:
               schema:
                 $ref: 'https://opensource.zalando.com/problem/schema.yaml#/Problem'
       security:
-      - oauth2:
-        - uid
+      - BearerAuth: [ uid ]
 
   '/supported-rules':
     get:
@@ -146,8 +144,7 @@ paths:
               schema:
                 $ref: 'https://opensource.zalando.com/problem/schema.yaml#/Problem'
       security:
-      - oauth2:
-        - uid
+      - BearerAuth: [ uid ]
 
   '/review-statistics':
     get:
@@ -181,20 +178,16 @@ paths:
               schema:
                 $ref: 'https://opensource.zalando.com/problem/schema.yaml#/Problem'
       security:
-      - oauth2:
-        - uid
+      - BearerAuth: [ uid ]
 
 
 components:
 
   securitySchemes:
-    oauth2:
-      type: oauth2
-      flows:
-        clientCredentials:
-          tokenUrl: https://identity.zalando.com/oauth2/token
-          scopes:
-            uid: Default scope to access Zally API
+    BearerAuth:
+      type: http
+      scheme: bearer
+      bearerFormat: JWT
 
   parameters:
     RulesType:

diff --git a/server/zally-test/build.gradle.kts b/server/zally-test/build.gradle.kts
@@ -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")
 }