Backports 3.13 (#2007)

* Bump com.gradle.plugin-publish in /tools/gradle-plugin (#1980) Bumps com.gradle.plugin-publish from 1.2.2 to 1.3.0. --- updated-dependencies: - dependency-name: com.gradle.plugin-publish dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump io.smallrye:smallrye-build-parent from 45 to 46 (#1981) Bumps [io.smallrye:smallrye-build-parent](https://github.com/smallrye/smallrye-parent) from 45 to 46. - [Release notes](https://github.com/smallrye/smallrye-parent/releases) - [Commits](https://github.com/smallrye/smallrye-parent/commits) --- updated-dependencies: - dependency-name: io.smallrye:smallrye-build-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump io.smallrye:smallrye-parent from 45 to 46 (#1982) Bumps [io.smallrye:smallrye-parent](https://github.com/smallrye/smallrye-parent) from 45 to 46. - [Release notes](https://github.com/smallrye/smallrye-parent/releases) - [Commits](https://github.com/smallrye/smallrye-parent/commits) --- updated-dependencies: - dependency-name: io.smallrye:smallrye-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.springframework:spring-webmvc in /extension-spring (#1985) Bumps [org.springframework:spring-webmvc](https://github.com/spring-projects/spring-framework) from 5.3.39 to 6.1.13. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v5.3.39...v6.1.13) --- updated-dependencies: - dependency-name: org.springframework:spring-webmvc dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump the quarkus group across 1 directory with 4 updates (#1986) Bumps the quarkus group with 4 updates in the / directory: io.quarkus.resteasy.reactive:resteasy-reactive-common, io.quarkus:quarkus-reactive-routes, [io.quarkus:quarkus-bom](https://github.com/quarkusio/quarkus) and io.quarkus:quarkus-maven-plugin. Updates `io.quarkus.resteasy.reactive:resteasy-reactive-common` from 3.14.2 to 3.14.4 Updates `io.quarkus:quarkus-reactive-routes` from 3.14.2 to 3.14.4 Updates `io.quarkus:quarkus-reactive-routes` from 3.14.2 to 3.14.4 Updates `io.quarkus:quarkus-bom` from 3.14.2 to 3.14.4 - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](quarkusio/quarkus@3.14.2...3.14.4) Updates `io.quarkus:quarkus-maven-plugin` from 3.14.2 to 3.14.4 Updates `io.quarkus:quarkus-maven-plugin` from 3.14.2 to 3.14.4 --- updated-dependencies: - dependency-name: io.quarkus.resteasy.reactive:resteasy-reactive-common dependency-type: direct:development update-type: version-update:semver-patch dependency-group: quarkus - dependency-name: io.quarkus:quarkus-reactive-routes dependency-type: direct:development update-type: version-update:semver-patch dependency-group: quarkus - dependency-name: io.quarkus:quarkus-reactive-routes dependency-type: direct:development update-type: version-update:semver-patch dependency-group: quarkus - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-patch dependency-group: quarkus - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: quarkus - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: quarkus ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump the quarkus group with 4 updates (#1988) Bumps the quarkus group with 4 updates: io.quarkus.resteasy.reactive:resteasy-reactive-common, io.quarkus:quarkus-reactive-routes, [io.quarkus:quarkus-bom](https://github.com/quarkusio/quarkus) and io.quarkus:quarkus-maven-plugin. Updates `io.quarkus.resteasy.reactive:resteasy-reactive-common` from 3.14.4 to 3.15.0 Updates `io.quarkus:quarkus-reactive-routes` from 3.14.4 to 3.15.0 Updates `io.quarkus:quarkus-reactive-routes` from 3.14.4 to 3.15.0 Updates `io.quarkus:quarkus-bom` from 3.14.4 to 3.15.0 - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](quarkusio/quarkus@3.14.4...3.15.0) Updates `io.quarkus:quarkus-maven-plugin` from 3.14.4 to 3.15.0 Updates `io.quarkus:quarkus-maven-plugin` from 3.14.4 to 3.15.0 --- updated-dependencies: - dependency-name: io.quarkus.resteasy.reactive:resteasy-reactive-common dependency-type: direct:development update-type: version-update:semver-minor dependency-group: quarkus - dependency-name: io.quarkus:quarkus-reactive-routes dependency-type: direct:development update-type: version-update:semver-minor dependency-group: quarkus - dependency-name: io.quarkus:quarkus-reactive-routes dependency-type: direct:development update-type: version-update:semver-minor dependency-group: quarkus - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-minor dependency-group: quarkus - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: quarkus - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: quarkus ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix: Check enum interfaces for `@JsonValue` (#1992) Signed-off-by: Michael Edgar <[email protected]> * Improve logging when type args do not match params, type parse trim (#1993) Signed-off-by: Michael Edgar <[email protected]> * Find `@RequestBody` annotations by argument index instead of type (#1994) Signed-off-by: Michael Edgar <[email protected]> * Bump com.github.eirslett:frontend-maven-plugin from 1.15.0 to 1.15.1 (#1998) Bumps [com.github.eirslett:frontend-maven-plugin](https://github.com/eirslett/frontend-maven-plugin) from 1.15.0 to 1.15.1. - [Changelog](https://github.com/eirslett/frontend-maven-plugin/blob/master/CHANGELOG.md) - [Commits](eirslett/frontend-maven-plugin@frontend-plugins-1.15.0...frontend-plugins-1.15.1) --- updated-dependencies: - dependency-name: com.github.eirslett:frontend-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump the quarkus group with 4 updates (#2001) Bumps the quarkus group with 4 updates: io.quarkus.resteasy.reactive:resteasy-reactive-common, io.quarkus:quarkus-reactive-routes, [io.quarkus:quarkus-bom](https://github.com/quarkusio/quarkus) and io.quarkus:quarkus-maven-plugin. Updates `io.quarkus.resteasy.reactive:resteasy-reactive-common` from 3.15.0 to 3.15.1 Updates `io.quarkus:quarkus-reactive-routes` from 3.15.0 to 3.15.1 Updates `io.quarkus:quarkus-reactive-routes` from 3.15.0 to 3.15.1 Updates `io.quarkus:quarkus-bom` from 3.15.0 to 3.15.1 - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](quarkusio/quarkus@3.15.0...3.15.1) Updates `io.quarkus:quarkus-maven-plugin` from 3.15.0 to 3.15.1 Updates `io.quarkus:quarkus-maven-plugin` from 3.15.0 to 3.15.1 --- updated-dependencies: - dependency-name: io.quarkus.resteasy.reactive:resteasy-reactive-common dependency-type: direct:development update-type: version-update:semver-patch dependency-group: quarkus - dependency-name: io.quarkus:quarkus-reactive-routes dependency-type: direct:development update-type: version-update:semver-patch dependency-group: quarkus - dependency-name: io.quarkus:quarkus-reactive-routes dependency-type: direct:development update-type: version-update:semver-patch dependency-group: quarkus - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-patch dependency-group: quarkus - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: quarkus - dependency-name: io.quarkus:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: quarkus ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump com.fasterxml.jackson:jackson-bom from 2.17.2 to 2.18.0 (#2005) Bumps [com.fasterxml.jackson:jackson-bom](https://github.com/FasterXML/jackson-bom) from 2.17.2 to 2.18.0. - [Commits](FasterXML/jackson-bom@jackson-bom-2.17.2...jackson-bom-2.18.0) --- updated-dependencies: - dependency-name: com.fasterxml.jackson:jackson-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Index Java runtime classes in Maven and Gradle plugins (#2002) Signed-off-by: Michael Edgar <[email protected]> * Fix tests for with MP OpenAPI 3.1.2 Signed-off-by: Michael Edgar <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Michael Edgar <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
smallrye · Sep 30, 2024 · a353ed6 · a353ed6
1 parent 37f14c5
commit a353ed6
Show file tree

Hide file tree

Showing 22 changed files with 289 additions and 56 deletions.
diff --git a/core/src/main/java/io/smallrye/openapi/runtime/io/parameters/RequestBodyIO.java b/core/src/main/java/io/smallrye/openapi/runtime/io/parameters/RequestBodyIO.java
@@ -5,6 +5,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
 import org.eclipse.microprofile.openapi.models.media.Content;
@@ -49,9 +50,8 @@ public RequestBodyIO(IOContext<V, A, O, AB, OB> context, ContentIO<V, A, O, AB,
 
     Stream<AnnotationInstance> getAnnotations(MethodInfo method, DotName annotation) {
         Stream<AnnotationInstance> methodAnnos = Stream.of(scannerContext().annotations().getAnnotation(method, annotation));
-        Stream<AnnotationInstance> paramAnnos = method.parameterTypes()
-                .stream()
-                .map(p -> scannerContext().annotations().getMethodParameterAnnotation(method, p, annotation));
+        Stream<AnnotationInstance> paramAnnos = IntStream.range(0, method.parametersCount())
+                .mapToObj(p -> scannerContext().annotations().getMethodParameterAnnotation(method, p, annotation));
 
         return Stream.concat(methodAnnos, paramAnnos)
                 .filter(Objects::nonNull);

diff --git a/core/src/main/java/io/smallrye/openapi/runtime/scanner/dataobject/DataObjectLogging.java b/core/src/main/java/io/smallrye/openapi/runtime/scanner/dataobject/DataObjectLogging.java
@@ -1,13 +1,10 @@
 package io.smallrye.openapi.runtime.scanner.dataobject;
 
-import java.util.List;
-
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.ClassInfo;
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.ParameterizedType;
 import org.jboss.jandex.Type;
-import org.jboss.jandex.TypeVariable;
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
 import org.jboss.logging.annotations.LogMessage;
@@ -83,9 +80,9 @@ interface DataObjectLogging extends BasicLogger {
     void classNotAvailable(Type type);
 
     @LogMessage(level = Logger.Level.ERROR)
-    @Message(id = 31016, value = "Unanticipated mismatch between type arguments and type variables \n" +
-            "Args: %s\n Vars:%s")
-    void classNotAvailable(List<TypeVariable> typeVariables, List<Type> arguments);
+    @Message(id = 31016, value = "Unanticipated mismatch between type arguments and type variables declared on class\n" +
+            "Class: %s\nType: %s")
+    void classNotAvailable(String classDeclaration, String typeSignature);
 
     @LogMessage(level = Logger.Level.WARN)
     @Message(id = 31017, value = "Failed to read enumeration values from enum %s method %s with `@JsonValue`: %s")

diff --git a/core/src/main/java/io/smallrye/openapi/runtime/scanner/dataobject/EnumProcessor.java b/core/src/main/java/io/smallrye/openapi/runtime/scanner/dataobject/EnumProcessor.java
@@ -7,12 +7,12 @@
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationTarget;
@@ -32,12 +32,18 @@ private EnumProcessor() {
     }
 
     public static List<Object> enumConstants(AnnotationScannerContext context, Type enumType) {
-        ClassInfo enumKlazz = context.getIndex().getClassByName(TypeUtil.getName(enumType));
+        AugmentedIndexView index = context.getAugmentedIndex();
+        ClassInfo enumKlazz = index.getClassByName(TypeUtil.getName(enumType));
         Function<FieldInfo, String> nameTranslator = nameTranslator(context, enumKlazz);
 
-        return enumKlazz.annotationsMap()
-                .getOrDefault(JSON_VALUE, Collections.emptyList())
+        return index.inheritanceChain(enumKlazz, enumType)
+                .keySet()
                 .stream()
+                .flatMap(clazz -> Stream.concat(
+                        Stream.of(clazz),
+                        clazz.interfaceTypes().stream().map(index::getClass).filter(Objects::nonNull)))
+                .filter(clazz -> clazz.hasAnnotation(JSON_VALUE))
+                .flatMap(clazz -> clazz.annotationsMap().get(JSON_VALUE).stream())
                 // @JsonValue#value (default = true) allows for the functionality to be disabled
                 .filter(atJsonValue -> context.annotations().value(atJsonValue, PROP_VALUE, true))
                 .map(AnnotationInstance::target)

diff --git a/core/src/main/java/io/smallrye/openapi/runtime/scanner/dataobject/TypeResolver.java b/core/src/main/java/io/smallrye/openapi/runtime/scanner/dataobject/TypeResolver.java
@@ -1147,7 +1147,9 @@ private static Map<String, Type> buildParamTypeResolutionMap(ClassInfo klazz, Pa
         List<Type> arguments = parameterizedType.arguments();
 
         if (arguments.size() != typeVariables.size()) {
-            DataObjectLogging.logger.classNotAvailable(typeVariables, arguments);
+            String vars = typeVariables.stream().map(TypeVariable::toString).collect(Collectors.joining(", "));
+            DataObjectLogging.logger.classNotAvailable(klazz.name() + "<" + vars + ">", parameterizedType.toString());
+            return Collections.emptyMap();
         }
 
         Map<String, Type> resolutionMap = new LinkedHashMap<>();

diff --git a/core/src/main/java/io/smallrye/openapi/runtime/util/TypeParser.java b/core/src/main/java/io/smallrye/openapi/runtime/util/TypeParser.java
@@ -172,6 +172,9 @@ private int advanceNot(char c) {
     }
 
     private DotName parseName() {
+        while (Character.isWhitespace(signature.charAt(pos))) {
+            pos++;
+        }
         int start = pos;
         int end = advanceNameEnd();
         return DotName.createSimple(signature.substring(start, end));

diff --git a/core/src/test/java/io/smallrye/openapi/runtime/io/schema/SchemaFactoryTest.java b/core/src/test/java/io/smallrye/openapi/runtime/io/schema/SchemaFactoryTest.java
@@ -117,6 +117,38 @@ void testEnumToSchemaTypeWithEmptyEnum() {
         assertEquals(Arrays.asList("VAL1", "VAL2"), result.getEnumeration());
     }
 
+    interface EnumValue4 {
+        @com.fasterxml.jackson.annotation.JsonValue
+        // type derived as int with format int64 due to JsonValue return type
+        boolean getValue();
+    }
+
+    @org.eclipse.microprofile.openapi.annotations.media.Schema
+    public static enum ExampleEnum4 implements EnumValue4 {
+        TRUE(true),
+        FALSE(false);
+
+        final boolean value;
+
+        ExampleEnum4(boolean value) {
+            this.value = value;
+        }
+
+        public boolean getValue() {
+            return value;
+        }
+    }
+
+    @Test
+    void testEnumToSchemaTypeWithInheritance() {
+        Index index = indexOf(ExampleEnum4.class, EnumValue4.class);
+        AnnotationScannerContext context = new AnnotationScannerContext(index, ClassLoaderUtil.getDefaultClassLoader(),
+                emptyConfig());
+        Schema result = SchemaFactory.enumToSchema(context, Type.create(ExampleEnum4.class));
+        assertEquals(Schema.SchemaType.BOOLEAN, result.getType());
+        assertEquals(Arrays.asList(true, false), result.getEnumeration());
+    }
+
     @Test
     void testParseSchemaType() {
         for (SchemaType type : SchemaType.values()) {

diff --git a/extension-jaxrs/src/test/java/io/smallrye/openapi/runtime/scanner/RequestBodyScanTests.java b/extension-jaxrs/src/test/java/io/smallrye/openapi/runtime/scanner/RequestBodyScanTests.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.util.HashMap;
 
+import org.eclipse.microprofile.openapi.annotations.parameters.Parameter;
 import org.eclipse.microprofile.openapi.annotations.parameters.RequestBody;
 import org.eclipse.microprofile.openapi.models.OpenAPI;
 import org.jboss.jandex.Index;
@@ -104,4 +105,22 @@ public void addBar(@jakarta.validation.constraints.NotEmpty String foo) {
         }
         test("params.request-body-constraints.json", Resource.class);
     }
+
+    @Test
+    void testResponseAnnotationUsed() throws IOException, JSONException {
+        @jakarta.ws.rs.Path("foo")
+        class FooApi {
+            @jakarta.ws.rs.PUT
+            @jakarta.ws.rs.Path("{name}/bar")
+            @jakarta.ws.rs.Consumes("text/plain")
+            @jakarta.ws.rs.Produces("application/json")
+            public jakarta.ws.rs.core.Response putDescription(
+                    @Parameter(description = "The name", required = true) @jakarta.ws.rs.PathParam("name") String name,
+                    @RequestBody(description = "The description", required = true) String description) {
+                return null;
+            }
+        }
+
+        assertJsonEquals("params.request-body-annotation-on-arg.json", FooApi.class);
+    }
 }
diff --git a/.../resources/io/smallrye/openapi/runtime/scanner/params.request-body-annotation-on-arg.json b/.../resources/io/smallrye/openapi/runtime/scanner/params.request-body-annotation-on-arg.json
@@ -0,0 +1,34 @@
+{
+  "openapi" : "3.0.3",
+  "paths" : {
+    "/foo/{name}/bar" : {
+      "put" : {
+        "parameters" : [ {
+          "name" : "name",
+          "in" : "path",
+          "description" : "The name",
+          "required" : true,
+          "schema" : {
+            "type" : "string"
+          }
+        } ],
+        "requestBody" : {
+          "description" : "The description",
+          "content" : {
+            "text/plain" : {
+              "schema" : {
+                "type" : "string"
+              }
+            }
+          },
+          "required" : true
+        },
+        "responses" : {
+          "200" : {
+            "description" : "OK"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/extension-spring/pom.xml b/extension-spring/pom.xml
@@ -13,7 +13,7 @@
     <name>SmallRye: OpenAPI extension - Spring </name>
 
     <properties>
-        <version.spring>5.3.39</version.spring>
+        <version.spring>6.1.13</version.spring>
     </properties>
 
     <dependencyManagement>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-parent</artifactId>
-        <version>45</version>
+        <version>46</version>
     </parent>
 
     <artifactId>smallrye-open-api-parent</artifactId>
@@ -18,7 +18,7 @@
 
     <properties>
         <version.buildhelper.plugin>3.6.0</version.buildhelper.plugin>
-        <jackson-bom.version>2.17.2</jackson-bom.version>
+        <jackson-bom.version>2.18.0</jackson-bom.version>
         <version.eclipse.microprofile.config>3.0.3</version.eclipse.microprofile.config>
         <version.io.smallrye.jandex>3.2.2</version.io.smallrye.jandex>
         <version.io.smallrye.smallrye-config>3.9.1</version.io.smallrye.smallrye-config>
@@ -27,8 +27,8 @@
         <version.org.hamcrest.java-hamcrest>2.0.0.0</version.org.hamcrest.java-hamcrest>
         <version.org.skyscreamer>1.5.3</version.org.skyscreamer>
         <version.maven-resources-plugin>3.3.1</version.maven-resources-plugin>
-        <version.com.github.eirslett.frontend-maven-plugin>1.15.0</version.com.github.eirslett.frontend-maven-plugin>
-        <version.quarkus>3.14.2</version.quarkus>
+        <version.com.github.eirslett.frontend-maven-plugin>1.15.1</version.com.github.eirslett.frontend-maven-plugin>
+        <version.quarkus>3.15.1</version.quarkus>
         <version.testng>7.10.2</version.testng>
         <version.arquillian.jetty>2.0.0.Final</version.arquillian.jetty>
         <version.jetty>11.0.24</version.jetty>

diff --git a/testsuite/data/pom.xml b/testsuite/data/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.smallrye</groupId>
         <artifactId>smallrye-build-parent</artifactId>
-        <version>45</version>
+        <version>46</version>
         <relativePath />
     </parent>
 
@@ -20,7 +20,7 @@
         <maven.compiler.release>${java.version}</maven.compiler.release>
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
-        <quarkus.platform.version>3.14.2</quarkus.platform.version>
+        <quarkus.platform.version>3.15.1</quarkus.platform.version>
         <quarkus.package.type>uber-jar</quarkus.package.type>
         <quarkus.package.add-runner-suffix>false</quarkus.package.add-runner-suffix>
     </properties>

diff --git a/tools/gradle-plugin/build.gradle b/tools/gradle-plugin/build.gradle
@@ -1,19 +1,15 @@
 plugins {
     id 'java-gradle-plugin'
-    id("com.gradle.plugin-publish") version "1.2.2"
+    id("com.gradle.plugin-publish") version "1.3.0"
     id("com.github.vlsi.jandex") version "1.90"
 }
 
 group = "io.smallrye"
 
-if (JavaVersion.current().isJava9Compatible()) {
-    compileJava.options.compilerArgs.addAll(['--release', '8'])
-}
-
 compileJava {
     options.encoding = 'UTF-8'
-    sourceCompatibility = '1.8'
-    targetCompatibility = '1.8'
+    sourceCompatibility = '11'
+    targetCompatibility = '11'
 }
 
 compileTestJava {

diff --git a/tools/gradle-plugin/src/main/java/io/smallrye/openapi/gradleplugin/Configs.java b/tools/gradle-plugin/src/main/java/io/smallrye/openapi/gradleplugin/Configs.java
@@ -63,6 +63,7 @@ class Configs implements SmallryeOpenApiProperties {
     final MapProperty<String, String> scanResourceClasses;
     final Property<String> outputFileTypeFilter;
     final Property<String> encoding;
+    final ListProperty<String> includeStandardJavaModules;
 
     Configs(ObjectFactory objects) {
         configProperties = objects.fileProperty();
@@ -97,6 +98,7 @@ class Configs implements SmallryeOpenApiProperties {
         scanResourceClasses = objects.mapProperty(String.class, String.class);
         outputFileTypeFilter = objects.property(String.class).convention("ALL");
         encoding = objects.property(String.class).convention(StandardCharsets.UTF_8.name());
+        includeStandardJavaModules = objects.listProperty(String.class);
     }
 
     Configs(ObjectFactory objects, SmallryeOpenApiExtension ext) {
@@ -134,6 +136,7 @@ class Configs implements SmallryeOpenApiProperties {
         scanResourceClasses = objects.mapProperty(String.class, String.class).convention(ext.getScanResourceClasses());
         outputFileTypeFilter = objects.property(String.class).convention(ext.getOutputFileTypeFilter());
         encoding = objects.property(String.class).convention(ext.getEncoding());
+        includeStandardJavaModules = objects.listProperty(String.class).convention(ext.getIncludeStandardJavaModules());
     }
 
     Config asMicroprofileConfig() {
@@ -341,4 +344,7 @@ public Property<String> getEncoding() {
         return encoding;
     }
 
+    public ListProperty<String> getIncludeStandardJavaModules() {
+        return includeStandardJavaModules;
+    }
 }