Spring Boot 3.0

.github/workflows/master.yml

@@ -0,0 +1,33 @@
+name: Test CI
+on: [ push, fork ]
+
+jobs:
+  TEST_ALL:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [ '11', '17' ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: 🪜 Setup java ${{ matrix.java }}
+        uses: actions/setup-java@v3
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: temurin
+
+      - name: 🦞 chmod /gradlew
+        run:  chmod +x ./gradlew
+
+      - name: 🔦 Test
+        run: ./gradlew test --info

.run/TEST.run.xml

@@ -0,0 +1,33 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="TEST" type="JUnit" factoryName="JUnit">
+    <module name="springdoc-openapi-gradle-plugin.test" />
+    <shortenClasspath name="ARGS_FILE" />
+    <useClassPathOnly />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="org.springdoc.openapi.gradle.plugin.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" />
+      </ENTRIES>
+    </extension>
+    <option name="ALTERNATIVE_JRE_PATH" value="corretto-19" />
+    <option name="PACKAGE_NAME" value="org.springdoc.openapi.gradle.plugin" />
+    <option name="MAIN_CLASS_NAME" value="org.springdoc.openapi.gradle.plugin.OpenApiGradlePluginTest" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="class" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

README.md

@@ -27,15 +27,15 @@ Gradle Groovy DSL
 ```groovy
 plugins {
       id "org.springframework.boot" version "2.7.0"
-      id "org.springdoc.openapi-gradle-plugin" version "1.5.0"
+      id "org.springdoc.openapi-gradle-plugin" version "1.6.0"
 }
 ```
 
 Gradle Kotlin DSL
 ```groovy
 plugins {
     id("org.springframework.boot") version "2.7.0"
-    id("org.springdoc.openapi-gradle-plugin") version "1.5.0"
+    id("org.springdoc.openapi-gradle-plugin") version "1.6.0"
 }
 ```
 
@@ -133,7 +133,7 @@ The `groupedApiMappings` customization allows you to specify multiple URLs/file
 2. Update the version for the plugin to match the current version found in `build.gradle.kts`
 
     ```
-    id("org.springdoc.openapi-gradle-plugin") version "1.5.0"
+    id("org.springdoc.openapi-gradle-plugin") version "1.6.0"
     ```
 
 3. Add the following to the spring boot apps `settings.gradle`

build.gradle.kts

@@ -1,15 +1,16 @@
 plugins {
 	`java-gradle-plugin`
-	id("com.gradle.plugin-publish") version "0.14.0"
-	id("org.sonarqube") version "3.1.1"
-	kotlin("jvm") version "1.4.31"
 	`maven-publish`
-	id("com.github.ben-manes.versions") version "0.38.0"
-	id("io.gitlab.arturbosch.detekt") version "1.16.0"
+	kotlin("jvm") version "1.8.0-RC"
+	id ("com.palantir.idea-test-fix") version "0.1.0"
+	id("com.gradle.plugin-publish") version "0.14.0"
+	id("org.sonarqube") version "3.5.0.2730"
+	id("com.github.ben-manes.versions") version "0.44.0"
+	id("io.gitlab.arturbosch.detekt") version "1.22.0"
 }
 
 group = "org.springdoc"
-version = "1.5.0"
+version = "1.6.0"
 
 sonarqube {
 	properties {
@@ -45,20 +46,19 @@ publishing {
 }
 
 dependencies {
-	implementation(kotlin("reflect"))
-	implementation("com.google.code.gson:gson:2.8.6")
-	implementation("org.awaitility:awaitility-kotlin:4.0.3")
+	implementation("com.google.code.gson:gson:2.10")
+	implementation("org.awaitility:awaitility-kotlin:4.2.0")
 	implementation("com.github.psxpaul:gradle-execfork-plugin:0.2.0")
-	implementation("org.springframework.boot:spring-boot-gradle-plugin:2.5.6")
+	implementation("org.springframework.boot:spring-boot-gradle-plugin:2.7.6")
+	implementation("jakarta.platform:jakarta.jakartaee-api:10.0.0")
 
 	testImplementation(gradleTestKit())
-	testImplementation(platform("org.junit:junit-bom:5.7.1"))
-	testImplementation("org.junit.jupiter:junit-jupiter")
-	testImplementation("com.beust:klaxon:5.5")
-	testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.2")
-	testImplementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2")
+	testImplementation("org.junit.jupiter:junit-jupiter:5.9.1")
+	testImplementation("com.beust:klaxon:5.6")
+	testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.14.1")
+	testImplementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.1")
 
-	detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.16.0")
+	detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.22.0")
 }
 
 gradlePlugin {
@@ -78,23 +78,16 @@ pluginBundle {
 	tags = listOf("springdoc", "openapi", "swagger")
 }
 
-val jvmVersion: JavaLanguageVersion = JavaLanguageVersion.of(8)
-
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-	kotlinOptions {
-		jvmTarget = "1.${jvmVersion.toString()}"
-	}
-}
 
-tasks.withType<Test>().configureEach {
-	useJUnitPlatform()
-	maxParallelForks = (Runtime.getRuntime().availableProcessors() / 2).takeIf { it > 0 } ?: 1
+tasks{
+	val java: String by project
+	withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach { kotlinOptions { jvmTarget = java } }
+	withType<io.gitlab.arturbosch.detekt.Detekt> { jvmTarget = java }
+	withType<Test>().configureEach { useJUnitPlatform() }
+//	withType<Jar> { duplicatesStrategy = DuplicatesStrategy.EXCLUDE }
 }
 
 detekt {
 	config = files("config/detekt/detekt.yml")
 	parallel = true
 }
-tasks.withType<io.gitlab.arturbosch.detekt.Detekt>().configureEach {
-	jvmTarget = "1.${jvmVersion.toString()}"
-}

gradle.properties

@@ -1,3 +1,4 @@
+java=11
 kotlin.code.style=official
 org.gradle.caching=true
 org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists