Backport updates from main/release 3.11.0 (#1868)

* Bump org.apache.maven.plugins:maven-plugin-plugin from 3.12.0 to 3.13.0 (#1825) Bumps [org.apache.maven.plugins:maven-plugin-plugin](https://github.com/apache/maven-plugin-tools) from 3.12.0 to 3.13.0. - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](apache/maven-plugin-tools@maven-plugin-tools-3.12.0...maven-plugin-tools-3.13.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-plugin-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump com.fasterxml.jackson:jackson-bom from 2.17.0 to 2.17.1 (#1827) Bumps [com.fasterxml.jackson:jackson-bom](https://github.com/FasterXML/jackson-bom) from 2.17.0 to 2.17.1. - [Commits](FasterXML/jackson-bom@jackson-bom-2.17.0...jackson-bom-2.17.1) --- updated-dependencies: - dependency-name: com.fasterxml.jackson:jackson-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.apache.maven.plugin-tools:maven-plugin-annotations (#1826) Bumps [org.apache.maven.plugin-tools:maven-plugin-annotations](https://github.com/apache/maven-plugin-tools) from 3.12.0 to 3.13.0. - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](apache/maven-plugin-tools@maven-plugin-tools-3.12.0...maven-plugin-tools-3.13.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.mvnpm:swagger-ui-dist from 5.17.2 to 5.17.5 (#1828) Bumps [org.mvnpm:swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 5.17.2 to 5.17.5. - [Release notes](https://github.com/swagger-api/swagger-ui/releases) - [Changelog](https://github.com/swagger-api/swagger-ui/blob/master/.releaserc) - [Commits](swagger-api/swagger-ui@v5.17.2...v5.17.5) --- updated-dependencies: - dependency-name: org.mvnpm:swagger-ui-dist dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump the kotlin group with 2 updates (#1830) Bumps the kotlin group with 2 updates: [org.jetbrains.kotlin:kotlin-stdlib](https://github.com/JetBrains/kotlin) and org.jetbrains.kotlin:kotlin-maven-plugin. Updates `org.jetbrains.kotlin:kotlin-stdlib` from 1.9.23 to 1.9.24 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.9.24/ChangeLog.md) - [Commits](JetBrains/kotlin@v1.9.23...v1.9.24) Updates `org.jetbrains.kotlin:kotlin-maven-plugin` from 1.9.23 to 1.9.24 --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:development update-type: version-update:semver-patch dependency-group: kotlin - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: kotlin ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump io.smallrye:jandex from 3.1.7 to 3.1.8 (#1832) Bumps [io.smallrye:jandex](https://github.com/smallrye/jandex) from 3.1.7 to 3.1.8. - [Release notes](https://github.com/smallrye/jandex/releases) - [Commits](smallrye/jandex@3.1.7...3.1.8) --- updated-dependencies: - dependency-name: io.smallrye:jandex dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.mvnpm:swagger-ui-dist from 5.17.5 to 5.17.6 (#1831) Bumps [org.mvnpm:swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 5.17.5 to 5.17.6. - [Release notes](https://github.com/swagger-api/swagger-ui/releases) - [Changelog](https://github.com/swagger-api/swagger-ui/blob/master/.releaserc) - [Commits](swagger-api/swagger-ui@v5.17.5...v5.17.6) --- updated-dependencies: - dependency-name: org.mvnpm:swagger-ui-dist dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.mvnpm:swagger-ui-dist from 5.17.6 to 5.17.7 (#1835) Bumps [org.mvnpm:swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 5.17.6 to 5.17.7. - [Release notes](https://github.com/swagger-api/swagger-ui/releases) - [Changelog](https://github.com/swagger-api/swagger-ui/blob/master/.releaserc) - [Commits](swagger-api/swagger-ui@v5.17.6...v5.17.7) --- updated-dependencies: - dependency-name: org.mvnpm:swagger-ui-dist dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Support of HttpServletRequest, HttpServletResponse and HttpSession types in SpringAnnotationScanner (#1829) * Implemented isFrameworkContextType() in SpringAnnotationScanner * Apply suggestions from code review on Use the newer jakarta classes Co-authored-by: Michael Edgar <michael@xlate.io> * Now Jakarta classes are managed too * Readded test scope to javax.servlet-api dep --------- Co-authored-by: Leonardo Moretti <leonardo.moretti@afea.eu> Co-authored-by: Michael Edgar <michael@xlate.io> * Bump javax.servlet:javax.servlet-api from 3.1.0 to 4.0.1 (#1837) Bumps [javax.servlet:javax.servlet-api](https://github.com/javaee/servlet-spec) from 3.1.0 to 4.0.1. - [Commits](javaee/servlet-spec@3.1.0...4.0.1) --- updated-dependencies: - dependency-name: javax.servlet:javax.servlet-api dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.mvnpm:swagger-ui-dist from 5.17.7 to 5.17.9 (#1838) Bumps [org.mvnpm:swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 5.17.7 to 5.17.9. - [Release notes](https://github.com/swagger-api/swagger-ui/releases) - [Changelog](https://github.com/swagger-api/swagger-ui/blob/master/.releaserc) - [Commits](swagger-api/swagger-ui@v5.17.7...v5.17.9) --- updated-dependencies: - dependency-name: org.mvnpm:swagger-ui-dist dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump the quarkus group with 4 updates (#1839) 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.10.0 to 3.10.1 Updates `io.quarkus:quarkus-reactive-routes` from 3.10.0 to 3.10.1 Updates `io.quarkus:quarkus-reactive-routes` from 3.10.0 to 3.10.1 Updates `io.quarkus:quarkus-bom` from 3.10.0 to 3.10.1 - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](quarkusio/quarkus@3.10.0...3.10.1) Updates `io.quarkus:quarkus-maven-plugin` from 3.10.0 to 3.10.1 Updates `io.quarkus:quarkus-maven-plugin` from 3.10.0 to 3.10.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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.mvnpm:swagger-ui-dist from 5.17.9 to 5.17.10 (#1840) Bumps [org.mvnpm:swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 5.17.9 to 5.17.10. - [Release notes](https://github.com/swagger-api/swagger-ui/releases) - [Changelog](https://github.com/swagger-api/swagger-ui/blob/master/.releaserc) - [Commits](swagger-api/swagger-ui@v5.17.9...v5.17.10) --- updated-dependencies: - dependency-name: org.mvnpm:swagger-ui-dist dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump io.smallrye:jandex from 3.1.8 to 3.2.0 (#1842) Bumps [io.smallrye:jandex](https://github.com/smallrye/jandex) from 3.1.8 to 3.2.0. - [Release notes](https://github.com/smallrye/jandex/releases) - [Commits](smallrye/jandex@3.1.8...3.2.0) --- updated-dependencies: - dependency-name: io.smallrye:jandex dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.eclipse.jetty:jetty-bom from 11.0.20 to 11.0.21 (#1844) Bumps [org.eclipse.jetty:jetty-bom](https://github.com/jetty/jetty.project) from 11.0.20 to 11.0.21. - [Release notes](https://github.com/jetty/jetty.project/releases) - [Commits](jetty/jetty.project@jetty-11.0.20...jetty-11.0.21) --- updated-dependencies: - dependency-name: org.eclipse.jetty:jetty-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.springframework:spring-webmvc from 5.3.34 to 5.3.35 (#1843) Bumps [org.springframework:spring-webmvc](https://github.com/spring-projects/spring-framework) from 5.3.34 to 5.3.35. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v5.3.34...v5.3.35) --- updated-dependencies: - dependency-name: org.springframework:spring-webmvc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * OASFactoryResolverImpl clinit registry lazy init (#1821) * Bump org.codehaus.mojo:build-helper-maven-plugin to 3.6.0 (#1845) updated-dependencies: - dependency-name: org.codehaus.mojo:build-helper-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump the kotlin group with 2 updates (#1846) updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:development update-type: version-update:semver-major dependency-group: kotlin - dependency-name: org.jetbrains.kotlin:kotlin-maven-plugin dependency-type: direct:production update-type: version-update:semver-major dependency-group: kotlin ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.mvnpm:swagger-ui-dist from 5.17.10 to 5.17.12 (#1848) updated-dependencies: - dependency-name: org.mvnpm:swagger-ui-dist dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.codehaus.mojo:exec-maven-plugin from 3.2.0 to 3.3.0 (#1847) updated-dependencies: - dependency-name: org.codehaus.mojo:exec-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.springframework:spring-webmvc from 5.3.35 to 5.3.36 (#1850) Bumps [org.springframework:spring-webmvc](https://github.com/spring-projects/spring-framework) from 5.3.35 to 5.3.36. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](spring-projects/spring-framework@v5.3.35...v5.3.36) --- updated-dependencies: - dependency-name: org.springframework:spring-webmvc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump the quarkus group with 4 updates (#1849) 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.10.1 to 3.11.0 Updates `io.quarkus:quarkus-reactive-routes` from 3.10.1 to 3.11.0 Updates `io.quarkus:quarkus-reactive-routes` from 3.10.1 to 3.11.0 Updates `io.quarkus:quarkus-bom` from 3.10.1 to 3.11.0 - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](quarkusio/quarkus@3.10.1...3.11.0) Updates `io.quarkus:quarkus-maven-plugin` from 3.10.1 to 3.11.0 Updates `io.quarkus:quarkus-maven-plugin` from 3.10.1 to 3.11.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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump io.smallrye.config:smallrye-config from 3.8.1 to 3.8.2 (#1851) Bumps [io.smallrye.config:smallrye-config](https://github.com/smallrye/smallrye-config) from 3.8.1 to 3.8.2. - [Release notes](https://github.com/smallrye/smallrye-config/releases) - [Commits](smallrye/smallrye-config@3.8.1...3.8.2) --- updated-dependencies: - dependency-name: io.smallrye.config:smallrye-config dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.apache.maven.plugins:maven-plugin-plugin from 3.13.0 to 3.13.1 (#1859) Bumps [org.apache.maven.plugins:maven-plugin-plugin](https://github.com/apache/maven-plugin-tools) from 3.13.0 to 3.13.1. - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](apache/maven-plugin-tools@maven-plugin-tools-3.13.0...maven-plugin-tools-3.13.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-plugin-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.apache.maven:maven-core from 3.9.6 to 3.9.7 (#1855) Bumps [org.apache.maven:maven-core](https://github.com/apache/maven) from 3.9.6 to 3.9.7. - [Release notes](https://github.com/apache/maven/releases) - [Commits](apache/maven@maven-3.9.6...maven-3.9.7) --- updated-dependencies: - dependency-name: org.apache.maven:maven-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.apache.maven:maven-plugin-api from 3.9.6 to 3.9.7 (#1856) Bumps [org.apache.maven:maven-plugin-api](https://github.com/apache/maven) from 3.9.6 to 3.9.7. - [Release notes](https://github.com/apache/maven/releases) - [Commits](apache/maven@maven-3.9.6...maven-3.9.7) --- updated-dependencies: - dependency-name: org.apache.maven:maven-plugin-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.mvnpm:swagger-ui-dist from 5.17.12 to 5.17.14 (#1857) Bumps [org.mvnpm:swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 5.17.12 to 5.17.14. - [Release notes](https://github.com/swagger-api/swagger-ui/releases) - [Changelog](https://github.com/swagger-api/swagger-ui/blob/master/.releaserc) - [Commits](swagger-api/swagger-ui@v5.17.12...v5.17.14) --- updated-dependencies: - dependency-name: org.mvnpm:swagger-ui-dist dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.apache.maven.plugin-tools:maven-plugin-annotations (#1860) Bumps [org.apache.maven.plugin-tools:maven-plugin-annotations](https://github.com/apache/maven-plugin-tools) from 3.13.0 to 3.13.1. - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](apache/maven-plugin-tools@maven-plugin-tools-3.13.0...maven-plugin-tools-3.13.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump org.assertj:assertj-core in /tools/gradle-plugin (#1853) Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.0. - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](assertj/assertj@assertj-build-3.25.3...assertj-build-3.26.0) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Remove encrypted configurations from release action (#1861) Signed-off-by: Michael Edgar <michael@xlate.io> * Bump io.smallrye:smallrye-parent from 43 to 44 (#1862) Bumps [io.smallrye:smallrye-parent](https://github.com/smallrye/smallrye-parent) from 43 to 44. - [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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump io.smallrye:smallrye-build-parent from 43 to 44 (#1863) Bumps [io.smallrye:smallrye-build-parent](https://github.com/smallrye/smallrye-parent) from 43 to 44. - [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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump the quarkus group with 4 updates (#1864) 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.11.0 to 3.11.1 Updates `io.quarkus:quarkus-reactive-routes` from 3.11.0 to 3.11.1 Updates `io.quarkus:quarkus-reactive-routes` from 3.11.0 to 3.11.1 Updates `io.quarkus:quarkus-bom` from 3.11.0 to 3.11.1 - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](quarkusio/quarkus@3.11.0...3.11.1) Updates `io.quarkus:quarkus-maven-plugin` from 3.11.0 to 3.11.1 Updates `io.quarkus:quarkus-maven-plugin` from 3.11.0 to 3.11.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] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Remove Maven cache from release (#1866) Conflicts with generated Maven settings.xml from actions/setup-java Signed-off-by: Michael Edgar <michael@xlate.io> --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Michael Edgar <michael@xlate.io> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: morettileo <47557718+morettileo@users.noreply.github.com> Co-authored-by: Leonardo Moretti <leonardo.moretti@afea.eu> Co-authored-by: Francesco Nigro <nigro.fra@gmail.com>
smallrye · Jun 6, 2024 · dc7843b · dc7843b
1 parent 1eb6dc7
commit dc7843b
Show file tree

Hide file tree

Showing 18 changed files with 374 additions and 68 deletions.
diff --git a/.github/release/maven-settings.xml.gpg b/.github/release/maven-settings.xml.gpg
diff --git a/.github/release/smallrye-sign.asc.gpg b/.github/release/smallrye-sign.asc.gpg
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -30,27 +30,26 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: 17
-
-      - name: maven cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
+          server-id: 'oss.sonatype'
+          server-username: 'MAVEN_DEPLOY_USERNAME'
+          server-password: 'MAVEN_DEPLOY_TOKEN'
+          gpg-private-key: ${{secrets.MAVEN_GPG_PRIVATE_KEY}}
+          gpg-passphrase: 'MAVEN_GPG_PASSPHRASE'
 
       - name: maven release ${{steps.metadata.outputs.current-version}}
+        env:
+          MAVEN_DEPLOY_USERNAME: ${{secrets.MAVEN_DEPLOY_USERNAME}}
+          MAVEN_DEPLOY_TOKEN: ${{secrets.MAVEN_DEPLOY_TOKEN}}
+          MAVEN_GPG_PASSPHRASE: ${{secrets.MAVEN_GPG_PASSPHRASE}}
         run: |
           java -version
-          gpg --quiet --batch --yes --decrypt --passphrase="${{secrets.SECRET_PASSPHRASE}}" --output smallrye-sign.asc .github/release/smallrye-sign.asc.gpg
-          gpg --quiet --batch --yes --decrypt --passphrase="${{secrets.SECRET_PASSPHRASE}}" --output maven-settings.xml .github/release/maven-settings.xml.gpg
-          gpg --fast-import --no-tty --batch --yes smallrye-sign.asc
           git config --global user.name "SmallRye CI"
           git config --global user.email "smallrye@googlegroups.com"
           git checkout -b release
-          mvn -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}} -s maven-settings.xml
+          mvn -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}}
           git checkout ${{github.base_ref}}
           git rebase release
-          mvn -B release:perform -Prelease -s maven-settings.xml
+          mvn -B release:perform -Prelease
           git push
           git push --tags
 

diff --git a/core/src/main/java/io/smallrye/openapi/spi/OASFactoryResolverImpl.java b/core/src/main/java/io/smallrye/openapi/spi/OASFactoryResolverImpl.java
@@ -78,43 +78,44 @@
  */
 public class OASFactoryResolverImpl extends OASFactoryResolver {
 
-    private static final Map<Class<? extends Constructible>, Supplier<? extends Constructible>> registry = new HashMap<>();
+    private static class OASFactoryResolverRegistry {
 
-    static <K extends Constructible, V extends K> void put(Class<K> key, Supplier<V> value) {
-        registry.put(key, value);
-    }
+        private static final Map<Class<? extends Constructible>, Supplier<? extends Constructible>> REGISTRY;
 
-    static {
-        put(APIResponse.class, APIResponseImpl::new);
-        put(APIResponses.class, APIResponsesImpl::new);
-        put(Callback.class, CallbackImpl::new);
-        put(Components.class, ComponentsImpl::new);
-        put(Contact.class, ContactImpl::new);
-        put(Content.class, ContentImpl::new);
-        put(Discriminator.class, DiscriminatorImpl::new);
-        put(Encoding.class, EncodingImpl::new);
-        put(Example.class, ExampleImpl::new);
-        put(ExternalDocumentation.class, ExternalDocumentationImpl::new);
-        put(Header.class, HeaderImpl::new);
-        put(Info.class, InfoImpl::new);
-        put(License.class, LicenseImpl::new);
-        put(Link.class, LinkImpl::new);
-        put(MediaType.class, MediaTypeImpl::new);
-        put(OAuthFlow.class, OAuthFlowImpl::new);
-        put(OAuthFlows.class, OAuthFlowsImpl::new);
-        put(OpenAPI.class, OpenAPIImpl::new);
-        put(Operation.class, OperationImpl::new);
-        put(Parameter.class, ParameterImpl::new);
-        put(PathItem.class, PathItemImpl::new);
-        put(Paths.class, PathsImpl::new);
-        put(RequestBody.class, RequestBodyImpl::new);
-        put(Schema.class, SchemaImpl::new);
-        put(SecurityRequirement.class, SecurityRequirementImpl::new);
-        put(SecurityScheme.class, SecuritySchemeImpl::new);
-        put(Server.class, ServerImpl::new);
-        put(ServerVariable.class, ServerVariableImpl::new);
-        put(Tag.class, TagImpl::new);
-        put(XML.class, XMLImpl::new);
+        static {
+            Map<Class<? extends Constructible>, Supplier<? extends Constructible>> registry = new HashMap<>(30);
+            registry.put(APIResponse.class, APIResponseImpl::new);
+            registry.put(APIResponses.class, APIResponsesImpl::new);
+            registry.put(Callback.class, CallbackImpl::new);
+            registry.put(Components.class, ComponentsImpl::new);
+            registry.put(Contact.class, ContactImpl::new);
+            registry.put(Content.class, ContentImpl::new);
+            registry.put(Discriminator.class, DiscriminatorImpl::new);
+            registry.put(Encoding.class, EncodingImpl::new);
+            registry.put(Example.class, ExampleImpl::new);
+            registry.put(ExternalDocumentation.class, ExternalDocumentationImpl::new);
+            registry.put(Header.class, HeaderImpl::new);
+            registry.put(Info.class, InfoImpl::new);
+            registry.put(License.class, LicenseImpl::new);
+            registry.put(Link.class, LinkImpl::new);
+            registry.put(MediaType.class, MediaTypeImpl::new);
+            registry.put(OAuthFlow.class, OAuthFlowImpl::new);
+            registry.put(OAuthFlows.class, OAuthFlowsImpl::new);
+            registry.put(OpenAPI.class, OpenAPIImpl::new);
+            registry.put(Operation.class, OperationImpl::new);
+            registry.put(Parameter.class, ParameterImpl::new);
+            registry.put(PathItem.class, PathItemImpl::new);
+            registry.put(Paths.class, PathsImpl::new);
+            registry.put(RequestBody.class, RequestBodyImpl::new);
+            registry.put(Schema.class, SchemaImpl::new);
+            registry.put(SecurityRequirement.class, SecurityRequirementImpl::new);
+            registry.put(SecurityScheme.class, SecuritySchemeImpl::new);
+            registry.put(Server.class, ServerImpl::new);
+            registry.put(ServerVariable.class, ServerVariableImpl::new);
+            registry.put(Tag.class, TagImpl::new);
+            registry.put(XML.class, XMLImpl::new);
+            REGISTRY = registry;
+        }
     }
 
     /**
@@ -124,7 +125,7 @@ static <K extends Constructible, V extends K> void put(Class<K> key, Supplier<V>
     @Override
     public <T extends Constructible> T createObject(Class<T> clazz) {
         Objects.requireNonNull(clazz, "clazz");
-        return (T) registry.getOrDefault(clazz, () -> this.unknownType(clazz)).get();
+        return (T) OASFactoryResolverRegistry.REGISTRY.getOrDefault(clazz, () -> this.unknownType(clazz)).get();
     }
 
     <T extends Constructible> T unknownType(Class<T> clazz) {

diff --git a/extension-jaxrs/pom.xml b/extension-jaxrs/pom.xml
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib</artifactId>
-            <version>1.9.23</version>
+            <version>2.0.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

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.34</version.spring>
+        <version.spring>5.3.36</version.spring>
     </properties>
 
     <dependencyManagement>
@@ -63,6 +63,17 @@
             <artifactId>spring-webmvc</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>4.0.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+		    <scope>test</scope>
+        </dependency>
 
         <!-- Depend on core tests -->
         <dependency>

diff --git a/extension-spring/src/main/java/io/smallrye/openapi/spring/SpringAnnotationScanner.java b/extension-spring/src/main/java/io/smallrye/openapi/spring/SpringAnnotationScanner.java
@@ -93,6 +93,11 @@ public boolean isMultipartInput(Type inputType) {
         return SpringConstants.MULTIPART_INPUTS.contains(inputType.name());
     }
 
+    @Override
+    public boolean isFrameworkContextType(Type type) {
+        return SpringConstants.CONTEXTS.contains(type.name());
+    }
+
     @Override
     public boolean containsScannerAnnotations(List<AnnotationInstance> instances,
             List<AnnotationScannerExtension> extensions) {

diff --git a/extension-spring/src/main/java/io/smallrye/openapi/spring/SpringConstants.java b/extension-spring/src/main/java/io/smallrye/openapi/spring/SpringConstants.java
@@ -4,6 +4,8 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.jboss.jandex.DotName;
 
@@ -34,6 +36,14 @@ public class SpringConstants {
     static final DotName HEADER_PARAM = DotName.createSimple("org.springframework.web.bind.annotation.RequestHeader");
     static final DotName MATRIX_PARAM = DotName.createSimple("org.springframework.web.bind.annotation.MatrixVariable");
 
+    static final Set<DotName> CONTEXTS = Stream.of("javax", "jakarta")
+            .map(prefix -> DotName.createComponentized(null, prefix))
+            .map(prefix -> DotName.createComponentized(prefix, "servlet"))
+            .map(prefix -> DotName.createComponentized(prefix, "http"))
+            .flatMap(prefix -> Stream.of("HttpServletRequest", "HttpServletResponse", "HttpSession")
+                    .map(simpleName -> DotName.createComponentized(prefix, simpleName)))
+            .collect(Collectors.toSet());
+
     public static final Set<DotName> MULTIPART_OUTPUTS = Collections
             .unmodifiableSet(new HashSet<>(Arrays.asList(MUTIPART_FILE)));
 

diff --git a/...spring/src/test/java/io/smallrye/openapi/runtime/scanner/SpringAnnotationScannerTest.java b/...spring/src/test/java/io/smallrye/openapi/runtime/scanner/SpringAnnotationScannerTest.java
@@ -17,6 +17,8 @@
 import test.io.smallrye.openapi.runtime.scanner.resources.GreetingPostControllerAlt;
 import test.io.smallrye.openapi.runtime.scanner.resources.GreetingPutController;
 import test.io.smallrye.openapi.runtime.scanner.resources.GreetingPutControllerAlt;
+import test.io.smallrye.openapi.runtime.scanner.resources.javax.GreetingPostControllerWithServletContext;
+import test.io.smallrye.openapi.runtime.scanner.resources.javax.GreetingPutControllerWithServletContext;
 
 /**
  * Basic Spring annotation scanning
@@ -114,6 +116,44 @@ void testBasicPostSpringDefinitionScanningAlt() throws IOException, JSONExceptio
         assertJsonEquals("resource.testBasicSpringPostDefinitionScanning.json", result);
     }
 
+    /**
+     * This test a basic, no OpenApi annotations, hello world service
+     *
+     * @throws IOException
+     * @throws JSONException
+     */
+    @Test
+    void testBasicPostSpringDefinitionScanningWithServletContextJakarta() throws IOException, JSONException {
+        Index i = indexOf(
+                test.io.smallrye.openapi.runtime.scanner.resources.jakarta.GreetingPostControllerWithServletContext.class,
+                Greeting.class);
+        OpenApiAnnotationScanner scanner = new OpenApiAnnotationScanner(emptyConfig(), i);
+
+        OpenAPI result = scanner.scan();
+
+        printToConsole(result);
+        assertJsonEquals("resource.testBasicSpringPostDefinitionScanning.json", result);
+    }
+
+    /**
+     * This test a basic, no OpenApi annotations, hello world service
+     *
+     * @throws IOException
+     * @throws JSONException
+     */
+    @Test
+    void testBasicPostSpringDefinitionScanningWithServletContextJavax() throws IOException, JSONException {
+        Index i = indexOf(
+                test.io.smallrye.openapi.runtime.scanner.resources.javax.GreetingPostControllerWithServletContext.class,
+                Greeting.class);
+        OpenApiAnnotationScanner scanner = new OpenApiAnnotationScanner(emptyConfig(), i);
+
+        OpenAPI result = scanner.scan();
+
+        printToConsole(result);
+        assertJsonEquals("resource.testBasicSpringPostDefinitionScanning.json", result);
+    }
+
     /**
      * This test a basic, no OpenApi annotations, hello world service
      *
@@ -148,6 +188,44 @@ void testBasicPutSpringDefinitionScanningAlt() throws IOException, JSONException
         assertJsonEquals("resource.testBasicSpringPutDefinitionScanning.json", result);
     }
 
+    /**
+     * This test a basic, no OpenApi annotations, hello world service
+     *
+     * @throws IOException
+     * @throws JSONException
+     */
+    @Test
+    void testBasicPutSpringDefinitionScanningWithServletContextJakarta() throws IOException, JSONException {
+        Index i = indexOf(
+                test.io.smallrye.openapi.runtime.scanner.resources.jakarta.GreetingPutControllerWithServletContext.class,
+                Greeting.class);
+        OpenApiAnnotationScanner scanner = new OpenApiAnnotationScanner(emptyConfig(), i);
+
+        OpenAPI result = scanner.scan();
+
+        printToConsole(result);
+        assertJsonEquals("resource.testBasicSpringPutDefinitionScanning.json", result);
+    }
+
+    /**
+     * This test a basic, no OpenApi annotations, hello world service
+     *
+     * @throws IOException
+     * @throws JSONException
+     */
+    @Test
+    void testBasicPutSpringDefinitionScanningWithServletContextJavax() throws IOException, JSONException {
+        Index i = indexOf(
+                test.io.smallrye.openapi.runtime.scanner.resources.javax.GreetingPutControllerWithServletContext.class,
+                Greeting.class);
+        OpenApiAnnotationScanner scanner = new OpenApiAnnotationScanner(emptyConfig(), i);
+
+        OpenAPI result = scanner.scan();
+
+        printToConsole(result);
+        assertJsonEquals("resource.testBasicSpringPutDefinitionScanning.json", result);
+    }
+
     /**
      * This test a basic, no OpenApi annotations, hello world service
      *

diff --git a/...e/openapi/runtime/scanner/resources/jakarta/GreetingPostControllerWithServletContext.java b/...e/openapi/runtime/scanner/resources/jakarta/GreetingPostControllerWithServletContext.java
@@ -0,0 +1,49 @@
+package test.io.smallrye.openapi.runtime.scanner.resources.jakarta;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+
+import org.eclipse.microprofile.openapi.annotations.media.Content;
+import org.eclipse.microprofile.openapi.annotations.media.Schema;
+import org.eclipse.microprofile.openapi.annotations.responses.APIResponse;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import test.io.smallrye.openapi.runtime.scanner.entities.Greeting;
+
+/**
+ * Spring.
+ * Some basic test, comparing with what we get in the JAX-RS version.
+ * See the GreetingPostResource in the JAX-RS test
+ *
+ * @author Phillip Kruger (phillip.kruger@redhat.com)
+ */
+@RestController
+@RequestMapping(value = "/greeting", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+public class GreetingPostControllerWithServletContext {
+
+    // 1) Basic path var test
+    @PostMapping("/greet")
+    public Greeting greet(HttpServletRequest request, HttpServletResponse response, @RequestBody Greeting greeting) {
+        return greeting;
+    }
+
+    // 2) ResponseEntity without a type specified
+    @PostMapping("/greetWithResponse")
+    @APIResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(ref = "#/components/schemas/Greeting")))
+    public ResponseEntity greetWithResponse(@RequestBody Greeting greeting, HttpServletRequest request,
+            HttpServletResponse response) {
+        return ResponseEntity.ok(greeting);
+    }
+
+    // 3) ResponseEntity with a type specified (No JaxRS comparison)
+    @PostMapping("/greetWithResponseTyped")
+    public ResponseEntity<Greeting> greetWithResponseTyped(HttpSession session, @RequestBody Greeting greeting) {
+        return ResponseEntity.ok(greeting);
+    }
+}