Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

4.x: Renamed openapi/openapi-ui back to integrations/openapi-ui #7761

Merged
merged 1 commit into from
Oct 10, 2023
Merged

4.x: Renamed openapi/openapi-ui back to integrations/openapi-ui #7761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -911,8 +911,8 @@
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.openapi</groupId>
<artifactId>helidon-openapi-ui</artifactId>
<groupId>io.helidon.integrations.openapi-ui</groupId>
<artifactId>helidon-integrations-openapi-ui</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
Expand Down
5 changes: 5 additions & 0 deletions dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,6 +762,11 @@
<artifactId>smallrye-open-api-jaxrs</artifactId>
<version>${version.lib.smallrye-openapi}</version>
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-open-api-ui</artifactId>
<version>${version.lib.smallrye-openapi}</version>
</dependency>

<!-- Microstream related -->
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions docs/config/io_helidon_openapi_ui_OpenApiUi.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@
///////////////////////////////////////////////////////////////////////////////

ifndef::rootdir[:rootdir: {docdir}/..]
:description: Configuration of io.helidon.openapi.ui.OpenApiUi
:keywords: helidon, config, io.helidon.openapi.ui.OpenApiUi
:basic-table-intro: The table below lists the configuration keys that configure io.helidon.openapi.ui.OpenApiUi
:description: Configuration of io.helidon.integrations.openapi.ui.OpenApiUi
:keywords: helidon, config, io.helidon.integrations.openapi.ui.OpenApiUi
:basic-table-intro: The table below lists the configuration keys that configure io.helidon.integrations.openapi.ui.OpenApiUi
include::{rootdir}/includes/attributes.adoc[]

= OpenApiUi (openapi.ui) Configuration

// tag::config[]


Type: link:{javadoc-base-url}/io.helidon.openapi.ui/io/helidon/openapi/ui/OpenApiUi.html[io.helidon.openapi.ui.OpenApiUi]
Type: link:{javadoc-base-url}/io.helidon.openapi.ui/io/helidon/openapi/ui/OpenApiUi.html[io.helidon.integrations.openapi.ui.OpenApiUi]



Expand Down
12 changes: 11 additions & 1 deletion docs/includes/openapi/openapi-ui.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,16 @@ ifdef::mp-flavor[ <scope>runtime</scope>]
</dependency>
----

And add a runtime dependency on the SmallRye UI.

[source,xml,subs=+macros]
----
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-open-api-ui</artifactId>
<scope>runtime</scope>
</dependency>
----
// end::dependencies[]

// tag::usage[]
Expand Down Expand Up @@ -197,4 +207,4 @@ Any options you configure override the values Helidon assigns, possibly interfer
xref:{openapi-page}[Helidon OpenAPI {flavor-uc} documentation]

link:{smallrye-openapi-ui-base-url}[SmallRye OpenAPI UI GitHub site]
// end::additional-info[]
// end::additional-info[]
11 changes: 6 additions & 5 deletions openapi/openapi-ui/pom.xml → integrations/openapi-ui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.helidon.openapi</groupId>
<artifactId>helidon-openapi-project</artifactId>
<groupId>io.helidon.integrations</groupId>
<artifactId>helidon-integrations-project</artifactId>
<version>4.0.0-SNAPSHOT</version>
</parent>

<artifactId>helidon-openapi-ui</artifactId>
<name>Helidon OpenAPI</name>
<groupId>io.helidon.integrations.openapi-ui</groupId>
<artifactId>helidon-integrations-openapi-ui</artifactId>
<name>Helidon OpenAPI UI Integration</name>

<description>
Helidon OpenAPI UI implementation
Expand All @@ -49,7 +50,7 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-open-api-ui</artifactId>
<version>${version.lib.smallrye-openapi}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.helidon.webserver</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...java/io/helidon/openapi/ui/OpenApiUi.java → ...on/integrations/openapi/ui/OpenApiUi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package io.helidon.openapi.ui;
package io.helidon.integrations.openapi.ui;

import java.io.IOException;
import java.io.UncheckedIOException;
Expand Down
2 changes: 1 addition & 1 deletion .../openapi/ui/OpenApiUiConfigBlueprint.java → .../openapi/ui/OpenApiUiConfigBlueprint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package io.helidon.openapi.ui;
package io.helidon.integrations.openapi.ui;

import java.util.Map;
import java.util.Optional;
Expand Down
2 changes: 1 addition & 1 deletion ...helidon/openapi/ui/OpenApiUiProvider.java → ...rations/openapi/ui/OpenApiUiProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.helidon.openapi.ui;
package io.helidon.integrations.openapi.ui;

import io.helidon.common.config.Config;
import io.helidon.openapi.spi.OpenApiServiceProvider;
Expand Down
2 changes: 1 addition & 1 deletion ...a/io/helidon/openapi/ui/package-info.java → ...integrations/openapi/ui/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
/**
* Helidon OpenAPI UI support.
*/
package io.helidon.openapi.ui;
package io.helidon.integrations.openapi.ui;
5 changes: 3 additions & 2 deletions ...openapi-ui/src/main/java/module-info.java → ...openapi-ui/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@
*/
import io.helidon.common.features.api.Feature;
import io.helidon.common.features.api.HelidonFlavor;
import io.helidon.integrations.openapi.ui.OpenApiUiProvider;

@Feature(value = "OpenAPI UI",
description = "OpenAPI UI support",
in = HelidonFlavor.SE
)
module io.helidon.openapi.ui {
module io.helidon.integrations.openapi.ui {
requires io.helidon.common.features.api;
requires io.helidon.common.media.type;
requires io.helidon.openapi;
Expand All @@ -31,5 +32,5 @@
requires smallrye.open.api.ui;

provides io.helidon.openapi.spi.OpenApiServiceProvider with
io.helidon.openapi.ui.OpenApiUiProvider;
OpenApiUiProvider;
}
0 .../resources/helidon-openapi-ui/favicon.ico → .../resources/helidon-openapi-ui/favicon.ico
View file
Open in desktop
File renamed without changes.
0 ...ain/resources/helidon-openapi-ui/logo.svg → ...ain/resources/helidon-openapi-ui/logo.svg
View file
Open in desktop
File renamed without changes
2 changes: 1 addition & 1 deletion .../io/helidon/openapi/ui/OpenApiUiTest.java → ...ntegrations/openapi/ui/OpenApiUiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.helidon.openapi.ui;
package io.helidon.integrations.openapi.ui;

import java.util.Map;

Expand Down
0 ...penapi-ui/src/test/resources/greeting.yml → ...penapi-ui/src/test/resources/greeting.yml
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion openapi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@

<modules>
<module>openapi</module>
<module>openapi-ui</module>
</modules>

<profiles>
Expand Down