Skip to content

Commit a4aef4f

Browse files
tjquinnotjquinno
authored
MP OpenAPI 3.1 support for 4.x (helidon-io#6954)
1 parent 992699c commit a4aef4f

166 files changed

Lines changed: 3010 additions & 4643 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎applications/mp/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<description>Parent pom for Helidon MP applications</description>
3333

3434
<properties>
35-
<version.plugin.jandex>1.0.6</version.plugin.jandex>
35+
<version.plugin.jandex>3.1.2</version.plugin.jandex>
3636
<version.plugin.jaxb2>0.14.0</version.plugin.jaxb2>
3737
<version.plugin.eclipselink>2.7.5.1</version.plugin.eclipselink>
3838
<version.plugin.hibernate.enhance>6.1.7.Final</version.plugin.hibernate.enhance>
@@ -43,7 +43,7 @@
4343
<pluginManagement>
4444
<plugins>
4545
<plugin>
46-
<groupId>org.jboss.jandex</groupId>
46+
<groupId>io.smallrye</groupId>
4747
<artifactId>jandex-maven-plugin</artifactId>
4848
<version>${version.plugin.jandex}</version>
4949
<executions>

‎archetypes/helidon/src/main/archetype/mp/common/common-mp.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2021 Oracle and/or its affiliates.
4+
Copyright (c) 2021, 2023 Oracle and/or its affiliates.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
2828
<value key="parent-artifactId">helidon-mp</value>
2929
<list key="dependencies">
3030
<map>
31-
<value key="groupId">org.jboss</value>
31+
<value key="groupId">io.smallrye</value>
3232
<value key="artifactId">jandex</value>
3333
<value key="scope">runtime</value>
3434
</map>
@@ -55,7 +55,7 @@
5555
</list>
5656
<list key="maven-plugins">
5757
<value><![CDATA[ <plugin>
58-
<groupId>org.jboss.jandex</groupId>
58+
<groupId>io.smallrye</groupId>
5959
<artifactId>jandex-maven-plugin</artifactId>
6060
<executions>
6161
<execution>

‎archetypes/helidon/src/main/archetype/mp/oci/files/client/pom.xml.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<build>
4343
<plugins>
4444
<plugin>
45-
<groupId>org.jboss.jandex</groupId>
45+
<groupId>io.smallrye</groupId>
4646
<artifactId>jandex-maven-plugin</artifactId>
4747
<executions>
4848
<execution>

‎archetypes/helidon/src/main/archetype/mp/oci/files/pom.xml.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<properties>
1717
<version.lib.jackson.databind.nullable>0.2.3</version.lib.jackson.databind.nullable>
18-
<version.plugin.jandex>1.1.0</version.plugin.jandex>
18+
<version.plugin.jandex>3.1.2</version.plugin.jandex>
1919
<version.plugin.openapi>6.2.1</version.plugin.openapi>
2020
</properties>
2121

@@ -33,7 +33,7 @@
3333
<pluginManagement>
3434
<plugins>
3535
<plugin>
36-
<groupId>org.jboss.jandex</groupId>
36+
<groupId>io.smallrye</groupId>
3737
<artifactId>jandex-maven-plugin</artifactId>
3838
<version>${version.plugin.jandex}</version>
3939
<executions>

‎archetypes/helidon/src/main/archetype/mp/oci/oci-mp.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ ocimetrics:
193193
<value key="scope">runtime</value>
194194
</map>
195195
<map>
196-
<value key="groupId">org.jboss</value>
196+
<value key="groupId">io.smallrye</value>
197197
<value key="artifactId">jandex</value>
198198
<value key="scope">runtime</value>
199199
</map>
@@ -220,7 +220,7 @@ ocimetrics:
220220
</list>
221221
<list key="maven-plugins">
222222
<value template="mustache"><![CDATA[ <plugin>
223-
<groupId>org.jboss.jandex</groupId>
223+
<groupId>io.smallrye</groupId>
224224
<artifactId>jandex-maven-plugin</artifactId>
225225
<executions>
226226
<execution>

‎dependencies/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<version.lib.jakarta.validation-api>3.0.0</version.lib.jakarta.validation-api>
8383
<version.lib.jakarta.websockets-api>2.1.0</version.lib.jakarta.websockets-api>
8484
<version.lib.jakarta.xml.bind-api>4.0.0</version.lib.jakarta.xml.bind-api>
85-
<version.lib.jandex>2.4.3.Final</version.lib.jandex>
85+
<version.lib.jandex>3.1.2</version.lib.jandex>
8686
<version.lib.jaxb-core>3.0.2</version.lib.jaxb-core>
8787
<version.lib.jaxb-impl>3.0.2</version.lib.jaxb-impl>
8888
<version.lib.jboss.classfilewriter>1.2.5.Final</version.lib.jboss.classfilewriter>
@@ -111,7 +111,7 @@
111111
<version.lib.microprofile-health>4.0</version.lib.microprofile-health>
112112
<version.lib.microprofile-jwt>2.1</version.lib.microprofile-jwt>
113113
<version.lib.microprofile-metrics-api>4.0</version.lib.microprofile-metrics-api>
114-
<version.lib.microprofile-openapi-api>3.0</version.lib.microprofile-openapi-api>
114+
<version.lib.microprofile-openapi-api>3.1</version.lib.microprofile-openapi-api>
115115
<version.lib.microprofile-reactive-messaging-api>3.0</version.lib.microprofile-reactive-messaging-api>
116116
<version.lib.microprofile-reactive-streams-operators-api>3.0</version.lib.microprofile-reactive-streams-operators-api>
117117
<version.lib.microprofile-reactive-streams-operators-core>3.0</version.lib.microprofile-reactive-streams-operators-core>
@@ -144,7 +144,7 @@
144144
<version.lib.postgresql>42.4.3</version.lib.postgresql>
145145
<version.lib.prometheus>0.9.0</version.lib.prometheus>
146146
<version.lib.slf4j>2.0.0</version.lib.slf4j>
147-
<version.lib.smallrye-openapi>2.1.16</version.lib.smallrye-openapi>
147+
<version.lib.smallrye-openapi>3.3.4</version.lib.smallrye-openapi>
148148
<version.lib.snakeyaml>2.0</version.lib.snakeyaml>
149149
<version.lib.typesafe-config>1.4.2</version.lib.typesafe-config>
150150
<version.lib.tyrus>2.0.4</version.lib.tyrus>
@@ -759,7 +759,7 @@
759759
<version>${version.lib.microprofile-lra-api}</version>
760760
</dependency>
761761
<dependency>
762-
<groupId>org.jboss</groupId>
762+
<groupId>io.smallrye</groupId>
763763
<artifactId>jandex</artifactId>
764764
<version>${version.lib.jandex}</version>
765765
</dependency>

‎docs/config/config_reference.adoc‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,14 @@ The following section lists all configurable types in Helidon.
5656
- xref:{rootdir}/config/io_helidon_common_pki_KeyConfig_KeystoreBuilder.adoc[KeystoreBuilder (common.pki.KeyConfig)]
5757
- xref:{rootdir}/config/io_helidon_common_configurable_LruCache.adoc[LruCache (common.configurable)]
5858
- xref:{rootdir}/config/io_helidon_reactive_media_common_MediaContext.adoc[MediaContext (media.common)]
59-
- xref:{rootdir}/config/io_helidon_microprofile_openapi_MPOpenAPISupport.adoc[MPOpenAPISupport (microprofile.openapi)]
6059
- xref:{rootdir}/config/io_helidon_metrics_api_MetricsSettings.adoc[MetricsSettings (metrics.api)]
6160
- xref:{rootdir}/config/io_helidon_metrics_serviceapi_MetricsSupport.adoc[MetricsSupport (metrics.serviceapi)]
6261
- xref:{rootdir}/config/io_helidon_integrations_micrometer_MicrometerSupport.adoc[MicrometerSupport (integrations.micrometer)]
6362
- xref:{rootdir}/config/io_helidon_config_mp_MpConfigBuilder.adoc[MpConfigBuilder (config.mp)]
6463
- xref:{rootdir}/config/io_helidon_security_providers_oidc_common_OidcConfig.adoc[OidcConfig (security.providers.oidc.common)]
6564
- xref:{rootdir}/config/io_helidon_security_providers_oidc_OidcProvider.adoc[OidcProvider (security.providers.oidc)]
66-
- xref:{rootdir}/config/io_helidon_openapi_OpenAPISupport.adoc[OpenAPISupport (openapi)]
67-
- xref:{rootdir}/config/io_helidon_openapi_OpenApiUi.adoc[OpenApiUi (openapi)]
65+
// - xref:{rootdir}/config/io_helidon_openapi_OpenAPISupport.adoc[OpenAPISupport (openapi)]
66+
// - xref:{rootdir}/config/io_helidon_openapi_OpenApiUi.adoc[OpenApiUi (openapi)]
6867
- xref:{rootdir}/config/io_helidon_security_providers_common_OutboundConfig.adoc[OutboundConfig (security.providers.common)]
6968
- xref:{rootdir}/config/io_helidon_security_providers_common_OutboundTarget.adoc[OutboundTarget (security.providers.common)]
7069
- xref:{rootdir}/config/io_helidon_common_pki_KeyConfig_PemBuilder.adoc[PemBuilder (common.pki.KeyConfig)]
@@ -75,7 +74,6 @@ The following section lists all configurable types in Helidon.
7574
- xref:{rootdir}/config/io_helidon_common_configurable_Resource.adoc[Resource (common.configurable)]
7675
- xref:{rootdir}/config/io_helidon_servicecommon_rest_RestServiceSettings.adoc[RestServiceSettings (servicecommon.rest)]
7776
- xref:{rootdir}/config/io_helidon_reactive_faulttolerance_Retry.adoc[Retry (faulttolerance)]
78-
- xref:{rootdir}/config/io_helidon_openapi_SEOpenAPISupport.adoc[SEOpenAPISupport (openapi)]
7977
- xref:{rootdir}/config/io_helidon_common_configurable_ScheduledThreadPoolSupplier.adoc[ScheduledThreadPoolSupplier (common.configurable)]
8078
- xref:{rootdir}/config/io_helidon_security_Security.adoc[Security (security)]
8179
- xref:{rootdir}/config/io_helidon_security_SecurityTime.adoc[SecurityTime (security)]

‎docs/config/io_helidon_microprofile_openapi_MPOpenAPISupport.adoc‎

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎docs/includes/attributes.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ endif::[]
7575
:version-lib-oracle-jdbc: 21
7676
:version-lib-oracle-ucp: {version-lib-oracle-jdbc}
7777
:version-plugin-jib: 0.10.1
78-
:version-plugin-jandex: 1.0.6
78+
:version-plugin-jandex: 3.1.2
7979
:version-lib-micrometer: 1.6.6
8080
:version-lib-smallrye-open-api: 2.1.16
8181

0 commit comments

Comments
 (0)