Keep supporting 0.16.x train to support Spring Boot 2.7.x and cherry-…

…pick the latest features and fixes.
ePages-de · Nov 3, 2023 · 5a82211 · 5a82211
1 parent 447f03d
commit 5a82211
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 8
           distribution: 'temurin'
       - name: Cache Gradle packages
         uses: actions/cache@v3

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - master
+      - 'maintenance/**'
   pull_request:
     types: [opened, synchronize, reopened]
 
@@ -17,7 +18,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 8
           distribution: 'temurin'
       - name: Cache SonarCloud packages
         uses: actions/cache@v3

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -57,12 +57,12 @@ allprojects {
 subprojects {
 
     val jacksonVersion by extra { "2.12.2" }
-    val springBootVersion by extra { "3.0.2" }
-    val springRestDocsVersion by extra { "3.0.0" }
+    val springBootVersion by extra { "2.1.9.RELEASE" }
+    val springRestDocsVersion by extra { "2.0.4.RELEASE" }
     val junitVersion by extra { "5.4.2" }
 
     tasks.withType<KotlinCompile> {
-        kotlinOptions.jvmTarget = "17"
+        kotlinOptions.jvmTarget = "1.8"
     }
 
     tasks.withType<Test> {

diff --git a/...napi-generator/src/main/kotlin/com/epages/restdocs/apispec/openapi2/OpenApi20Generator.kt b/...napi-generator/src/main/kotlin/com/epages/restdocs/apispec/openapi2/OpenApi20Generator.kt
@@ -327,6 +327,7 @@ object OpenApi20Generator {
                     SecurityType.OAUTH2 -> addSecurity(OAUTH2_SECURITY_NAME, securityRequirements2ScopesList(securityRequirements))
                     SecurityType.BASIC -> addSecurity(BASIC_SECURITY_NAME, null)
                     SecurityType.API_KEY -> addSecurity(API_KEY_SECURITY_NAME, null)
+                    SecurityType.JWT_BEARER -> { /* not specified for OpenApi 2.0 */ }
                 }
             }
         }

diff --git a/...3-generator/src/test/kotlin/com/epages/restdocs/apispec/openapi3/OpenApi3GeneratorTest.kt b/...3-generator/src/test/kotlin/com/epages/restdocs/apispec/openapi3/OpenApi3GeneratorTest.kt
@@ -1229,8 +1229,7 @@ class OpenApi3GeneratorTest {
             method = HTTPMethod.PUT,
             headers = listOf(),
             pathParameters = listOf(),
-            queryParameters = listOf(),
-            formParameters = listOf(),
+            requestParameters = listOf(),
             securityRequirements = null,
             requestFields = listOf(
                 FieldDescriptor(