diff --git a/api/src/main/java/module-info.java b/api/src/main/java/module-info.java index e107c72c..cf6617b9 100644 --- a/api/src/main/java/module-info.java +++ b/api/src/main/java/module-info.java @@ -17,6 +17,7 @@ * A set of Java interfaces, annotations, and programming models which allow Java developers to natively produce OpenAPI * documents from Jakarta RESTful Web Services applications. */ +@SuppressWarnings("module") // silence warning about unstable name `osgi.annotation` module org.eclipse.microprofile.openapi { exports org.eclipse.microprofile.openapi; @@ -47,6 +48,8 @@ exports org.eclipse.microprofile.openapi.models.tags; exports org.eclipse.microprofile.openapi.spi; + uses org.eclipse.microprofile.openapi.spi.OASFactoryResolver; + // Required for compilation, not used at runtime requires static osgi.annotation; diff --git a/spi/pom.xml b/spi/pom.xml index 8ab4eeaa..3d7f7a15 100644 --- a/spi/pom.xml +++ b/spi/pom.xml @@ -25,13 +25,7 @@ microprofile-openapi-spi MicroProfile OpenAPI SPI - - MicroProfile OpenAPI :: SPI - - This module is deprecated and will be removed in a future release of MicroProfile - OpenAPI. The functionality offered by this module is available in the microprofile-openapi-api - module which should be used instead. - + MicroProfile OpenAPI :: SPI @@ -43,4 +37,6 @@ microprofile-openapi-api + + diff --git a/spi/src/main/java/org/eclipse/microprofile/openapi/spi/OASFactoryResolver.java b/spi/src/main/java/org/eclipse/microprofile/openapi/spi/OASFactoryResolver.java index c67414f3..bef662e5 100644 --- a/spi/src/main/java/org/eclipse/microprofile/openapi/spi/OASFactoryResolver.java +++ b/spi/src/main/java/org/eclipse/microprofile/openapi/spi/OASFactoryResolver.java @@ -31,11 +31,7 @@ * Service provider for OASFactoryResolver. The implementation registers itself via the {@link java.util.ServiceLoader} * mechanism or by manually setting their implementation using the setInstance method. * - * @deprecated the OASFactoryResolver available in module - * {@code org.eclipse.microprofile.openapi:microprofile-openapi-api} should be used instead of this version - * which will be removed in a future major release. */ -@Deprecated(forRemoval = true) public abstract class OASFactoryResolver { private static volatile OASFactoryResolver instance = null; diff --git a/spi/src/main/java/org/eclipse/microprofile/openapi/spi/package-info.java b/spi/src/main/java/org/eclipse/microprofile/openapi/spi/package-info.java index 2560ea61..01cc8df4 100644 --- a/spi/src/main/java/org/eclipse/microprofile/openapi/spi/package-info.java +++ b/spi/src/main/java/org/eclipse/microprofile/openapi/spi/package-info.java @@ -13,11 +13,7 @@ /** * Service provider interface which allows vendors to set their implementations of OASFactoryResolver. - *

- * The {@code org.eclipse.microprofile.openapi.spi} package available in module - * {@code org.eclipse.microprofile.openapi:microprofile-openapi-api} should be used instead of this version which will - * be removed in a future major release. */ -@Deprecated(forRemoval = true) + @org.osgi.annotation.versioning.Version("1.0") -package org.eclipse.microprofile.openapi.spi; +package org.eclipse.microprofile.openapi.spi; \ No newline at end of file