Exclude all unnecessary dependencies from openapi-generator module.

altro3 · altro3 · commit 63d6126a149c · 2024-09-18T20:30:03.000+07:00
Update openapi-generator dependencies versions.
Improve tests execution performance

OpenAPI Explorer 2.2.728
Rapidoc 9.3.5
diff --git a/build-logic/src/main/groovy/io.micronaut.build.internal.openapi-base.gradle b/build-logic/src/main/groovy/io.micronaut.build.internal.openapi-base.gradle
@@ -3,8 +3,8 @@ repositories {
 }
 
 tasks.withType(Test).configureEach {
+    useJUnitPlatform()
     testLogging {
-        showStandardStreams = true
         exceptionFormat = 'full'
     }
 }
diff --git a/build-logic/src/main/groovy/io.micronaut.build.internal.openapi-java-generator-test-suite.gradle b/build-logic/src/main/groovy/io.micronaut.build.internal.openapi-java-generator-test-suite.gradle
@@ -1,7 +1,8 @@
 import io.micronaut.build.internal.openapi.OpenApiGeneratorTask
 
 plugins {
-    id 'io.micronaut.minimal.application'
+    id("io.micronaut.build.internal.openapi-base")
+    id("io.micronaut.minimal.application")
 }
 
 repositories {
diff --git a/build-logic/src/main/groovy/io.micronaut.build.internal.openapi-kotlin-kapt-generator-test-suite.gradle b/build-logic/src/main/groovy/io.micronaut.build.internal.openapi-kotlin-kapt-generator-test-suite.gradle
@@ -1,7 +1,7 @@
 import io.micronaut.build.internal.openapi.OpenApiGeneratorTask
 
 plugins {
-    id 'io.micronaut.minimal.application'
+    id("io.micronaut.minimal.application")
 }
 
 repositories {
diff --git a/build-logic/src/main/groovy/io.micronaut.build.internal.openapi-kotlin-ksp-generator-test-suite.gradle b/build-logic/src/main/groovy/io.micronaut.build.internal.openapi-kotlin-ksp-generator-test-suite.gradle
@@ -1,7 +1,7 @@
 import io.micronaut.build.internal.openapi.OpenApiGeneratorTask
 
 plugins {
-    id 'io.micronaut.minimal.application'
+    id("io.micronaut.minimal.application")
 }
 
 repositories {
diff --git a/build-logic/src/main/groovy/io.micronaut.build.internal.openapi-module.gradle b/build-logic/src/main/groovy/io.micronaut.build.internal.openapi-module.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id 'io.micronaut.build.internal.openapi-base'
-    id 'io.micronaut.build.internal.module'
+    id("io.micronaut.build.internal.openapi-base")
+    id("io.micronaut.build.internal.module")
 }
 
 repositories {
diff --git a/build-logic/src/main/groovy/io.micronaut.build.internal.openapi-simple-module.gradle b/build-logic/src/main/groovy/io.micronaut.build.internal.openapi-simple-module.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id 'io.micronaut.build.internal.openapi-base'
-    id 'io.micronaut.build.internal.base-module'
-    id 'java-test-fixtures'
+    id("io.micronaut.build.internal.openapi-base")
+    id("io.micronaut.build.internal.base-module")
+    id("java-test-fixtures")
 }
 
 components.java.withVariantsFromConfiguration(configurations.testFixturesApiElements) { skip() }
diff --git a/build-logic/src/main/groovy/io.micronaut.build.internal.openapi-test-java.gradle b/build-logic/src/main/groovy/io.micronaut.build.internal.openapi-test-java.gradle
@@ -9,6 +9,3 @@ dependencies {
     testRuntimeOnly(mnTest.junit.jupiter.engine)
     testRuntimeOnly(mnLogging.logback.classic)
 }
-tasks.test {
-    useJUnitPlatform()
-}
diff --git a/docs-examples/example-groovy/build.gradle b/docs-examples/example-groovy/build.gradle
@@ -24,13 +24,12 @@ test {
     jvmArgs '-Duser.country=US'
     jvmArgs '-Duser.language=en'
     testLogging {
-        showStandardStreams = true
         exceptionFormat = 'full'
     }
     failFast = true
 }
 
-tasks.withType(GroovyCompile) {
+tasks.withType(GroovyCompile).configureEach {
     groovyOptions.forkOptions.jvmArgs.add('-Dgroovy.parameters=true')
 }
 
diff --git a/docs-examples/example-java/build.gradle b/docs-examples/example-java/build.gradle
@@ -26,12 +26,10 @@ compileJava.options.compilerArgs += '-parameters'
 compileTestJava.options.compilerArgs += '-parameters'
 
 test {
-    useJUnitPlatform()
-
     jvmArgs '-Duser.country=US'
     jvmArgs '-Duser.language=en'
+    useJUnitPlatform()
     testLogging {
-        showStandardStreams = true
         exceptionFormat = 'full'
     }
     failFast = true
diff --git a/docs-examples/example-kotlin/build.gradle b/docs-examples/example-kotlin/build.gradle
@@ -32,12 +32,10 @@ ksp {
 }
 
 test {
-    useJUnitPlatform()
-
     jvmArgs '-Duser.country=US'
     jvmArgs '-Duser.language=en'
+    useJUnitPlatform()
     testLogging {
-        showStandardStreams = true
         exceptionFormat = 'full'
     }
     failFast = true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -16,8 +16,13 @@ openapi-generator = "7.8.0"
 swagger-parser = "1.0.71"
 swagger-parser-v3 = "2.1.22"
 javaparser = "3.26.2"
+commons-lang3 = "3.17.0"
 commons-codec = "1.17.1"
+commons-io = "2.16.1"
+commons-text = "1.12.0"
 guava = "33.3.0-jre"
+jmustache = "1.15"
+commonmark = "0.23.0"
 
 micronaut = "4.6.5"
 micronaut-platform = "4.6.2"
@@ -78,8 +83,13 @@ jdt-annotation = { module = "org.eclipse.jdt:org.eclipse.jdt.annotation", versio
 android-annotation = { module = "androidx.annotation:annotation", version.ref = "android-annotation" }
 javaparser = { module = "com.github.javaparser:javaparser-symbol-solver-core", version.ref = "javaparser" }
 commons-codec = { module = "commons-codec:commons-codec", version.ref = "commons-codec" }
+commons-io = { module = "commons-io:commons-io", version.ref = "commons-io" }
+commons-lang3 = { module = "org.apache.commons:commons-lang3", version.ref = "commons-lang3" }
+commons-text = { module = "org.apache.commons:commons-text", version.ref = "commons-text" }
 guava = { module = "com.google.guava:guava", version.ref = "guava" }
+commonmark = { module = "org.commonmark:commonmark", version.ref = "commonmark" }
 
 openapi-generator = { module = "org.openapitools:openapi-generator", version.ref = "openapi-generator" }
 swagger-parser = { module = "io.swagger:swagger-parser", version.ref = "swagger-parser" }
 swagger-parser-v3 = { module = "io.swagger.parser.v3:swagger-parser-v3", version.ref = "swagger-parser-v3" }
+jmustache = { module = "com.samskivert:jmustache", version.ref = "jmustache" }
diff --git a/openapi-generator/build.gradle b/openapi-generator/build.gradle
@@ -3,19 +3,19 @@ plugins {
 }
 
 dependencies {
-    constraints {
-        api(libs.swagger.parser) {
-            because("OpenAPI generator depends on older release which isn't compatible with SnakeYAML")
-        }
-        api(libs.swagger.parser.v3) {
-            because("OpenAPI generator depends on older release which isn't compatible with SnakeYAML")
-        }
-    }
-    api(libs.openapi.generator) {
-        exclude group: "org.projectlombok"
-    }
+    api libs.openapi.generator
+    api libs.swagger.parser
+    api libs.swagger.parser.v3
+    api libs.commons.lang3
+    api libs.commons.text
     api libs.commons.codec
+    api libs.commons.io
     api libs.managed.evo.inflector
+    api libs.jmustache
+    api libs.commonmark
+    api libs.guava
+    api mnLogging.slf4j.ext
+    api mn.snakeyaml
 
     testImplementation mnTest.micronaut.test.junit5
     testImplementation mnTest.junit.jupiter.params
@@ -28,3 +28,29 @@ dependencies {
 
     testRuntimeOnly mnTest.junit.jupiter.engine
 }
+
+configurations.configureEach {
+    exclude group: "com.google.code.findbugs", module: "jsr305"
+    exclude group: "javax.validation", module: "validation-api"
+    exclude group: "org.slf4j", module: "slf4j-simple"
+    exclude group: "org.projectlombok"
+    exclude group: "com.google.guava", module: "listenablefuture"
+    exclude group: "com.google.guava", module: "failureaccess"
+    exclude group: "com.google.errorprone", module: "error_prone_annotations"
+    exclude group: "com.google.j2objc", module: "j2objc-annotations"
+    exclude group: "org.checkerframework", module: "checker-qual"
+    exclude group: "com.github.jknack"
+    exclude group: "org.apache.maven.resolver"
+    exclude group: "com.github.mifmif", module: "generex"
+    exclude group: "com.github.curious-odd-man", module: "rgxgen"
+    exclude group: "net.java.dev.jna", module: "jna"
+    exclude group: "commons-cli", module: "commons-cli"
+    exclude group: "com.github.joschi.jackson", module: "jackson-datatype-threetenbp"
+    exclude group: "com.fasterxml.jackson.datatype", module: "jackson-datatype-guava"
+    exclude group: "com.fasterxml.jackson.datatype", module: "jackson-datatype-joda"
+}
+
+test {
+    maxParallelForks = Runtime.runtime.availableProcessors()
+    maxHeapSize = "2048m"
+}
diff --git a/openapi/build.gradle b/openapi/build.gradle
@@ -7,7 +7,12 @@ dependencies {
     compileOnly(mn.micronaut.core.processor)
     compileOnly(projects.micronautOpenapiAdoc)
 
-    implementation(mn.micronaut.http)
+    implementation(mn.micronaut.http) {
+        exclude group: "io.micronaut", module: "micronaut-core-reactive"
+        exclude group: "io.micronaut", module: "micronaut-context"
+        exclude group: "io.micronaut", module: "micronaut-context-propagation"
+        exclude group: "io.projectreactor", module: "reactor-core"
+    }
 
     api(projects.micronautOpenapiAnnotations)
     api(projects.micronautOpenapiCommon)
@@ -46,11 +51,10 @@ dependencies {
 }
 
 configurations.configureEach {
-    all*.exclude group: "ch.qos.logback"
+    exclude group: "ch.qos.logback"
 }
 
 test {
-    useJUnitPlatform()
-
-    maxHeapSize = "1024m"
+    maxParallelForks = Runtime.runtime.availableProcessors()
+    maxHeapSize = "2048m"
 }
diff --git a/openapi/src/main/resources/templates/openapi-explorer/res/openapi-explorer.min.js b/openapi/src/main/resources/templates/openapi-explorer/res/openapi-explorer.min.js
diff --git a/openapi/src/main/resources/templates/rapidoc/res/rapidoc-min.js b/openapi/src/main/resources/templates/rapidoc/res/rapidoc-min.js
diff --git a/openapi/src/main/resources/templates/swagger-ui/index.html b/openapi/src/main/resources/templates/swagger-ui/index.html
@@ -17,14 +17,12 @@
         const cookie = extract(document.cookie);
         const contextPath = cookie === '' ? extract(window.location.search.substring(1)) : cookie;
         const head = document.getElementsByTagName('head')[0]
-        // link(contextPath + "{{swagger-ui.js.url.prefix}}index.css", head, "text/css", "stylesheet")
+
         link(contextPath + "{{swagger-ui.js.url.prefix}}swagger-ui.css", head, "text/css", "stylesheet")
         link(contextPath + "{{swagger-ui.js.url.prefix}}favicon-16x16.png", head, "image/png", "icon", "16x16")
         link(contextPath + "{{swagger-ui.js.url.prefix}}favicon-32x32.png", head, "image/png", "icon", "32x32")
         {{swagger-ui.theme}}
         {{rapipdf.script}}
-
-
         window.onload = function() {
             const swaggerUiBundle = script(contextPath + "{{swagger-ui.js.url.prefix}}swagger-ui-bundle.js", head)
             script(contextPath + "{{swagger-ui.js.url.prefix}}swagger-ui-standalone-preset.js", head)

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ repositories {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`tasks.withType(Test).configureEach {`
	`6`	`+ useJUnitPlatform()`
`6`	`7`	`testLogging {`
`7`		`- showStandardStreams = true`
`8`	`8`	`exceptionFormat = 'full'`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`import io.micronaut.build.internal.openapi.OpenApiGeneratorTask`
`2`	`2`
`3`	`3`	`plugins {`
`4`		`- id 'io.micronaut.minimal.application'`
	`4`	`+ id("io.micronaut.build.internal.openapi-base")`
	`5`	`+ id("io.micronaut.minimal.application")`
`5`	`6`	`}`
`6`	`7`
`7`	`8`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import io.micronaut.build.internal.openapi.OpenApiGeneratorTask`
`2`	`2`
`3`	`3`	`plugins {`
`4`		`- id 'io.micronaut.minimal.application'`
	`4`	`+ id("io.micronaut.minimal.application")`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`		`- id 'io.micronaut.build.internal.openapi-base'`
`3`		`- id 'io.micronaut.build.internal.module'`
	`2`	`+ id("io.micronaut.build.internal.openapi-base")`
	`3`	`+ id("io.micronaut.build.internal.module")`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,3 @@ dependencies {`
`9`	`9`	`testRuntimeOnly(mnTest.junit.jupiter.engine)`
`10`	`10`	`testRuntimeOnly(mnLogging.logback.classic)`
`11`	`11`	`}`
`12`		`-tasks.test {`
`13`		`- useJUnitPlatform()`
`14`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -24,13 +24,12 @@ test {`
`24`	`24`	`jvmArgs '-Duser.country=US'`
`25`	`25`	`jvmArgs '-Duser.language=en'`
`26`	`26`	`testLogging {`
`27`		`- showStandardStreams = true`
`28`	`27`	`exceptionFormat = 'full'`
`29`	`28`	`}`
`30`	`29`	`failFast = true`
`31`	`30`	`}`
`32`	`31`
`33`		`-tasks.withType(GroovyCompile) {`
	`32`	`+tasks.withType(GroovyCompile).configureEach {`
`34`	`33`	`groovyOptions.forkOptions.jvmArgs.add('-Dgroovy.parameters=true')`
`35`	`34`	`}`
`36`	`35`
Original file line number	Diff line number	Diff line change
`@@ -32,12 +32,10 @@ ksp {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`test {`
`35`		`- useJUnitPlatform()`
`36`		`-`
`37`	`35`	`jvmArgs '-Duser.country=US'`
`38`	`36`	`jvmArgs '-Duser.language=en'`
	`37`	`+ useJUnitPlatform()`
`39`	`38`	`testLogging {`
`40`		`- showStandardStreams = true`
`41`	`39`	`exceptionFormat = 'full'`
`42`	`40`	`}`
`43`	`41`	`failFast = true`