Skip to content

Commit 48f5416

Browse files
authored
Renamed openapi/openapi-ui to integrations/openapi-ui (helidon-io#7761)
1 parent 605b9f2 commit 48f5416

15 files changed

Lines changed: 36 additions & 20 deletions

File tree

bom/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -911,8 +911,8 @@
911911
<version>${helidon.version}</version>
912912
</dependency>
913913
<dependency>
914-
<groupId>io.helidon.openapi</groupId>
915-
<artifactId>helidon-openapi-ui</artifactId>
914+
<groupId>io.helidon.integrations.openapi-ui</groupId>
915+
<artifactId>helidon-integrations-openapi-ui</artifactId>
916916
<version>${helidon.version}</version>
917917
</dependency>
918918
<dependency>

dependencies/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -762,6 +762,11 @@
762762
<artifactId>smallrye-open-api-jaxrs</artifactId>
763763
<version>${version.lib.smallrye-openapi}</version>
764764
</dependency>
765+
<dependency>
766+
<groupId>io.smallrye</groupId>
767+
<artifactId>smallrye-open-api-ui</artifactId>
768+
<version>${version.lib.smallrye-openapi}</version>
769+
</dependency>
765770

766771
<!-- Microstream related -->
767772
<dependency>

docs/config/io_helidon_openapi_ui_OpenApiUi.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
///////////////////////////////////////////////////////////////////////////////
1818
1919
ifndef::rootdir[:rootdir: {docdir}/..]
20-
:description: Configuration of io.helidon.openapi.ui.OpenApiUi
21-
:keywords: helidon, config, io.helidon.openapi.ui.OpenApiUi
22-
:basic-table-intro: The table below lists the configuration keys that configure io.helidon.openapi.ui.OpenApiUi
20+
:description: Configuration of io.helidon.integrations.openapi.ui.OpenApiUi
21+
:keywords: helidon, config, io.helidon.integrations.openapi.ui.OpenApiUi
22+
:basic-table-intro: The table below lists the configuration keys that configure io.helidon.integrations.openapi.ui.OpenApiUi
2323
include::{rootdir}/includes/attributes.adoc[]
2424
2525
= OpenApiUi (openapi.ui) Configuration
2626
2727
// tag::config[]
2828
2929
30-
Type: link:{javadoc-base-url}/io.helidon.openapi.ui/io/helidon/openapi/ui/OpenApiUi.html[io.helidon.openapi.ui.OpenApiUi]
30+
Type: link:{javadoc-base-url}/io.helidon.openapi.ui/io/helidon/openapi/ui/OpenApiUi.html[io.helidon.integrations.openapi.ui.OpenApiUi]
3131
3232
3333

docs/includes/openapi/openapi-ui.adoc

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,16 @@ ifdef::mp-flavor[ <scope>runtime</scope>]
6565
</dependency>
6666
----
6767
68+
And add a runtime dependency on the SmallRye UI.
69+
70+
[source,xml,subs=+macros]
71+
----
72+
<dependency>
73+
<groupId>io.smallrye</groupId>
74+
<artifactId>smallrye-open-api-ui</artifactId>
75+
<scope>runtime</scope>
76+
</dependency>
77+
----
6878
// end::dependencies[]
6979
7080
// tag::usage[]
@@ -197,4 +207,4 @@ Any options you configure override the values Helidon assigns, possibly interfer
197207
xref:{openapi-page}[Helidon OpenAPI {flavor-uc} documentation]
198208
199209
link:{smallrye-openapi-ui-base-url}[SmallRye OpenAPI UI GitHub site]
200-
// end::additional-info[]
210+
// end::additional-info[]
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@
1919
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2020
<modelVersion>4.0.0</modelVersion>
2121
<parent>
22-
<groupId>io.helidon.openapi</groupId>
23-
<artifactId>helidon-openapi-project</artifactId>
22+
<groupId>io.helidon.integrations</groupId>
23+
<artifactId>helidon-integrations-project</artifactId>
2424
<version>4.0.0-SNAPSHOT</version>
2525
</parent>
2626

27-
<artifactId>helidon-openapi-ui</artifactId>
28-
<name>Helidon OpenAPI</name>
27+
<groupId>io.helidon.integrations.openapi-ui</groupId>
28+
<artifactId>helidon-integrations-openapi-ui</artifactId>
29+
<name>Helidon OpenAPI UI Integration</name>
2930

3031
<description>
3132
Helidon OpenAPI UI implementation
@@ -49,7 +50,7 @@
4950
<dependency>
5051
<groupId>io.smallrye</groupId>
5152
<artifactId>smallrye-open-api-ui</artifactId>
52-
<version>${version.lib.smallrye-openapi}</version>
53+
<scope>provided</scope>
5354
</dependency>
5455
<dependency>
5556
<groupId>io.helidon.webserver</groupId>

openapi/openapi-ui/src/main/java/io/helidon/openapi/ui/OpenApiUi.java renamed to integrations/openapi-ui/src/main/java/io/helidon/integrations/openapi/ui/OpenApiUi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.helidon.openapi.ui;
17+
package io.helidon.integrations.openapi.ui;
1818

1919
import java.io.IOException;
2020
import java.io.UncheckedIOException;

openapi/openapi-ui/src/main/java/io/helidon/openapi/ui/OpenApiUiConfigBlueprint.java renamed to integrations/openapi-ui/src/main/java/io/helidon/integrations/openapi/ui/OpenApiUiConfigBlueprint.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.helidon.openapi.ui;
17+
package io.helidon.integrations.openapi.ui;
1818

1919
import java.util.Map;
2020
import java.util.Optional;

openapi/openapi-ui/src/main/java/io/helidon/openapi/ui/OpenApiUiProvider.java renamed to integrations/openapi-ui/src/main/java/io/helidon/integrations/openapi/ui/OpenApiUiProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.helidon.openapi.ui;
16+
package io.helidon.integrations.openapi.ui;
1717

1818
import io.helidon.common.config.Config;
1919
import io.helidon.openapi.spi.OpenApiServiceProvider;

openapi/openapi-ui/src/main/java/io/helidon/openapi/ui/package-info.java renamed to integrations/openapi-ui/src/main/java/io/helidon/integrations/openapi/ui/package-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
/**
1818
* Helidon OpenAPI UI support.
1919
*/
20-
package io.helidon.openapi.ui;
20+
package io.helidon.integrations.openapi.ui;

openapi/openapi-ui/src/main/java/module-info.java renamed to integrations/openapi-ui/src/main/java/module-info.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@
1515
*/
1616
import io.helidon.common.features.api.Feature;
1717
import io.helidon.common.features.api.HelidonFlavor;
18+
import io.helidon.integrations.openapi.ui.OpenApiUiProvider;
1819

1920
@Feature(value = "OpenAPI UI",
2021
description = "OpenAPI UI support",
2122
in = HelidonFlavor.SE
2223
)
23-
module io.helidon.openapi.ui {
24+
module io.helidon.integrations.openapi.ui {
2425
requires io.helidon.common.features.api;
2526
requires io.helidon.common.media.type;
2627
requires io.helidon.openapi;
@@ -31,5 +32,5 @@
3132
requires smallrye.open.api.ui;
3233

3334
provides io.helidon.openapi.spi.OpenApiServiceProvider with
34-
io.helidon.openapi.ui.OpenApiUiProvider;
35+
OpenApiUiProvider;
3536
}

0 commit comments

Comments
 (0)