From 99cf681d522b9f0f1860acbf1badcd88e2bbca1f Mon Sep 17 00:00:00 2001 From: Joe Di Pol Date: Thu, 9 Dec 2021 12:10:45 -0800 Subject: [PATCH 1/2] Update javadocs. Specifically external links for Jakarta EE and MicroProfile --- etc/javadoc/jakarta-cdi/package-list | 11 ++ etc/javadoc/jakarta-inject/package-list | 1 + .../element-list} | 0 etc/javadoc/jakarta-jaxrs/package-list | 6 + etc/javadoc/jakarta-jsonb/element-list | 6 - .../package-list | 0 .../package-list | 2 +- etc/javadoc/javax-persistence/package-list | 4 - etc/javadoc/jersey/package-list | 1 + .../package-list | 2 + etc/javadoc/microprofile-graphql/package-list | 1 + etc/javadoc/microprofile-jwt/package-list | 3 + etc/javadoc/microprofile-lra-api/package-list | 3 + .../microprofile-openapi-api/package-list | 27 +++++ .../package-list | 2 + .../package-list | 2 + .../microprofile-rest-client/package-list | 5 + etc/javadoc/microprofile-tracing/package-list | 1 + .../microprofile/cdi/package-info.java | 2 +- .../cdi/src/main/java/module-info.java | 2 +- .../microprofile/config/package-info.java | 4 +- .../config/src/main/java/module-info.java | 2 + .../faulttolerance/package-info.java | 4 +- .../src/main/java/module-info.java | 2 + .../microprofile/health/package-info.java | 4 +- .../health/src/main/java/module-info.java | 2 + .../microprofile/jwt/auth/package-info.java | 5 +- .../jwt-auth/src/main/java/module-info.java | 3 + .../microprofile/metrics/package-info.java | 2 + .../metrics/src/main/java/module-info.java | 2 + .../microprofile/openapi/package-info.java | 4 +- .../openapi/src/main/java/module-info.java | 5 + .../microprofile/reactive/package-info.java | 2 + .../src/main/java/module-info.java | 2 + .../microprofile/restclient/package-info.java | 2 + .../src/main/java/module-info.java | 2 + .../microprofile/tracing/package-info.java | 2 + .../tracing/src/main/java/module-info.java | 2 + pom.xml | 111 ++++++++++++------ .../webserver/jersey/package-info.java | 2 +- .../jersey/src/main/java/module-info.java | 3 + 41 files changed, 190 insertions(+), 58 deletions(-) create mode 100644 etc/javadoc/jakarta-cdi/package-list create mode 100644 etc/javadoc/jakarta-inject/package-list rename etc/javadoc/{javax-jaxb/package-list => jakarta-jaxb/element-list} (100%) create mode 100644 etc/javadoc/jakarta-jaxrs/package-list delete mode 100644 etc/javadoc/jakarta-jsonb/element-list rename etc/javadoc/{javax-jsonb => jakarta-jsonb}/package-list (100%) rename etc/javadoc/{javax-transaction => jakarta-transaction}/package-list (94%) delete mode 100644 etc/javadoc/javax-persistence/package-list create mode 100644 etc/javadoc/microprofile-fault-tolerance-api/package-list create mode 100644 etc/javadoc/microprofile-graphql/package-list create mode 100644 etc/javadoc/microprofile-jwt/package-list create mode 100644 etc/javadoc/microprofile-lra-api/package-list create mode 100644 etc/javadoc/microprofile-openapi-api/package-list create mode 100644 etc/javadoc/microprofile-reactive-messaging-api/package-list create mode 100644 etc/javadoc/microprofile-reactive-streams-operators-api/package-list create mode 100644 etc/javadoc/microprofile-rest-client/package-list create mode 100644 etc/javadoc/microprofile-tracing/package-list diff --git a/etc/javadoc/jakarta-cdi/package-list b/etc/javadoc/jakarta-cdi/package-list new file mode 100644 index 00000000000..0d6a43703a5 --- /dev/null +++ b/etc/javadoc/jakarta-cdi/package-list @@ -0,0 +1,11 @@ +javax.decorator +javax.enterprise.context +javax.enterprise.context.control +javax.enterprise.context.spi +javax.enterprise.event +javax.enterprise.inject +javax.enterprise.inject.literal +javax.enterprise.inject.se +javax.enterprise.inject.spi +javax.enterprise.inject.spi.configurator +javax.enterprise.util diff --git a/etc/javadoc/jakarta-inject/package-list b/etc/javadoc/jakarta-inject/package-list new file mode 100644 index 00000000000..98a4cdeb436 --- /dev/null +++ b/etc/javadoc/jakarta-inject/package-list @@ -0,0 +1 @@ +javax.inject diff --git a/etc/javadoc/javax-jaxb/package-list b/etc/javadoc/jakarta-jaxb/element-list similarity index 100% rename from etc/javadoc/javax-jaxb/package-list rename to etc/javadoc/jakarta-jaxb/element-list diff --git a/etc/javadoc/jakarta-jaxrs/package-list b/etc/javadoc/jakarta-jaxrs/package-list new file mode 100644 index 00000000000..0f5b575cd39 --- /dev/null +++ b/etc/javadoc/jakarta-jaxrs/package-list @@ -0,0 +1,6 @@ +javax.ws.rs +javax.ws.rs.client +javax.ws.rs.container +javax.ws.rs.core +javax.ws.rs.ext +javax.ws.rs.sse diff --git a/etc/javadoc/jakarta-jsonb/element-list b/etc/javadoc/jakarta-jsonb/element-list deleted file mode 100644 index 77c314cdedb..00000000000 --- a/etc/javadoc/jakarta-jsonb/element-list +++ /dev/null @@ -1,6 +0,0 @@ -javax.json.bind -javax.json.bind.adapter -javax.json.bind.annotation -javax.json.bind.config -javax.json.bind.serializer -javax.json.bind.spi diff --git a/etc/javadoc/javax-jsonb/package-list b/etc/javadoc/jakarta-jsonb/package-list similarity index 100% rename from etc/javadoc/javax-jsonb/package-list rename to etc/javadoc/jakarta-jsonb/package-list diff --git a/etc/javadoc/javax-transaction/package-list b/etc/javadoc/jakarta-transaction/package-list similarity index 94% rename from etc/javadoc/javax-transaction/package-list rename to etc/javadoc/jakarta-transaction/package-list index 90eaa56cff3..5d2d8a37f21 100644 --- a/etc/javadoc/javax-transaction/package-list +++ b/etc/javadoc/jakarta-transaction/package-list @@ -1 +1 @@ -javax.transaction +javax.transaction diff --git a/etc/javadoc/javax-persistence/package-list b/etc/javadoc/javax-persistence/package-list deleted file mode 100644 index c079348fd00..00000000000 --- a/etc/javadoc/javax-persistence/package-list +++ /dev/null @@ -1,4 +0,0 @@ -javax.persistence -javax.persistence.criteria -javax.persistence.metamodel -javax.persistence.spi diff --git a/etc/javadoc/jersey/package-list b/etc/javadoc/jersey/package-list index 81e3fd6aec4..ba677b795ed 100644 --- a/etc/javadoc/jersey/package-list +++ b/etc/javadoc/jersey/package-list @@ -51,6 +51,7 @@ org.glassfish.jersey.message org.glassfish.jersey.message.internal org.glassfish.jersey.microprofile.config org.glassfish.jersey.microprofile.restclient +org.glassfish.jersey.microprofile.restclient.internal org.glassfish.jersey.model org.glassfish.jersey.model.internal org.glassfish.jersey.moxy.internal diff --git a/etc/javadoc/microprofile-fault-tolerance-api/package-list b/etc/javadoc/microprofile-fault-tolerance-api/package-list new file mode 100644 index 00000000000..567ed5724b8 --- /dev/null +++ b/etc/javadoc/microprofile-fault-tolerance-api/package-list @@ -0,0 +1,2 @@ +org.eclipse.microprofile.faulttolerance +org.eclipse.microprofile.faulttolerance.exceptions diff --git a/etc/javadoc/microprofile-graphql/package-list b/etc/javadoc/microprofile-graphql/package-list new file mode 100644 index 00000000000..b7b07675547 --- /dev/null +++ b/etc/javadoc/microprofile-graphql/package-list @@ -0,0 +1 @@ +org.eclipse.microprofile.graphql diff --git a/etc/javadoc/microprofile-jwt/package-list b/etc/javadoc/microprofile-jwt/package-list new file mode 100644 index 00000000000..83655b642c2 --- /dev/null +++ b/etc/javadoc/microprofile-jwt/package-list @@ -0,0 +1,3 @@ +org.eclipse.microprofile.auth +org.eclipse.microprofile.jwt +org.eclipse.microprofile.jwt.config diff --git a/etc/javadoc/microprofile-lra-api/package-list b/etc/javadoc/microprofile-lra-api/package-list new file mode 100644 index 00000000000..6c49b07c3a7 --- /dev/null +++ b/etc/javadoc/microprofile-lra-api/package-list @@ -0,0 +1,3 @@ +org.eclipse.microprofile.lra +org.eclipse.microprofile.lra.annotation +org.eclipse.microprofile.lra.annotation.ws.rs diff --git a/etc/javadoc/microprofile-openapi-api/package-list b/etc/javadoc/microprofile-openapi-api/package-list new file mode 100644 index 00000000000..117fb9ee9d1 --- /dev/null +++ b/etc/javadoc/microprofile-openapi-api/package-list @@ -0,0 +1,27 @@ +org.eclipse.microprofile.openapi +org.eclipse.microprofile.openapi.annotations +org.eclipse.microprofile.openapi.annotations.callbacks +org.eclipse.microprofile.openapi.annotations.enums +org.eclipse.microprofile.openapi.annotations.extensions +org.eclipse.microprofile.openapi.annotations.headers +org.eclipse.microprofile.openapi.annotations.info +org.eclipse.microprofile.openapi.annotations.links +org.eclipse.microprofile.openapi.annotations.media +org.eclipse.microprofile.openapi.annotations.parameters +org.eclipse.microprofile.openapi.annotations.responses +org.eclipse.microprofile.openapi.annotations.security +org.eclipse.microprofile.openapi.annotations.servers +org.eclipse.microprofile.openapi.annotations.tags +org.eclipse.microprofile.openapi.models +org.eclipse.microprofile.openapi.models.callbacks +org.eclipse.microprofile.openapi.models.examples +org.eclipse.microprofile.openapi.models.headers +org.eclipse.microprofile.openapi.models.info +org.eclipse.microprofile.openapi.models.links +org.eclipse.microprofile.openapi.models.media +org.eclipse.microprofile.openapi.models.parameters +org.eclipse.microprofile.openapi.models.responses +org.eclipse.microprofile.openapi.models.security +org.eclipse.microprofile.openapi.models.servers +org.eclipse.microprofile.openapi.models.tags +org.eclipse.microprofile.openapi.spi diff --git a/etc/javadoc/microprofile-reactive-messaging-api/package-list b/etc/javadoc/microprofile-reactive-messaging-api/package-list new file mode 100644 index 00000000000..1575f80967c --- /dev/null +++ b/etc/javadoc/microprofile-reactive-messaging-api/package-list @@ -0,0 +1,2 @@ +org.eclipse.microprofile.reactive.messaging +org.eclipse.microprofile.reactive.messaging.spi diff --git a/etc/javadoc/microprofile-reactive-streams-operators-api/package-list b/etc/javadoc/microprofile-reactive-streams-operators-api/package-list new file mode 100644 index 00000000000..d2f64429aa5 --- /dev/null +++ b/etc/javadoc/microprofile-reactive-streams-operators-api/package-list @@ -0,0 +1,2 @@ +org.eclipse.microprofile.reactive.streams.operators +org.eclipse.microprofile.reactive.streams.operators.spi diff --git a/etc/javadoc/microprofile-rest-client/package-list b/etc/javadoc/microprofile-rest-client/package-list new file mode 100644 index 00000000000..de547598ee5 --- /dev/null +++ b/etc/javadoc/microprofile-rest-client/package-list @@ -0,0 +1,5 @@ +org.eclipse.microprofile.rest.client +org.eclipse.microprofile.rest.client.annotation +org.eclipse.microprofile.rest.client.ext +org.eclipse.microprofile.rest.client.inject +org.eclipse.microprofile.rest.client.spi diff --git a/etc/javadoc/microprofile-tracing/package-list b/etc/javadoc/microprofile-tracing/package-list new file mode 100644 index 00000000000..d3f7daf046c --- /dev/null +++ b/etc/javadoc/microprofile-tracing/package-list @@ -0,0 +1 @@ +org.eclipse.microprofile.opentracing diff --git a/microprofile/cdi/src/main/java/io/helidon/microprofile/cdi/package-info.java b/microprofile/cdi/src/main/java/io/helidon/microprofile/cdi/package-info.java index 14939f99621..7f82aa61615 100644 --- a/microprofile/cdi/src/main/java/io/helidon/microprofile/cdi/package-info.java +++ b/microprofile/cdi/src/main/java/io/helidon/microprofile/cdi/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2021 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/microprofile/cdi/src/main/java/module-info.java b/microprofile/cdi/src/main/java/module-info.java index e8b6721e142..f6023a1572d 100644 --- a/microprofile/cdi/src/main/java/module-info.java +++ b/microprofile/cdi/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2020 Oracle and/or its affiliates. + * Copyright (c) 2019, 2021 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/microprofile/config/src/main/java/io/helidon/microprofile/config/package-info.java b/microprofile/config/src/main/java/io/helidon/microprofile/config/package-info.java index 9c29b6f5e29..7e5c09413b6 100644 --- a/microprofile/config/src/main/java/io/helidon/microprofile/config/package-info.java +++ b/microprofile/config/src/main/java/io/helidon/microprofile/config/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2020 Oracle and/or its affiliates. + * Copyright (c) 2018, 2021 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,5 +16,7 @@ /** * Helidon implementation of microprofile config for CDI. + * + * @see org.eclipse.microprofile.config */ package io.helidon.microprofile.config; diff --git a/microprofile/config/src/main/java/module-info.java b/microprofile/config/src/main/java/module-info.java index 5d0006564b2..a6ba0d90b85 100644 --- a/microprofile/config/src/main/java/module-info.java +++ b/microprofile/config/src/main/java/module-info.java @@ -16,6 +16,8 @@ /** * CDI extension for microprofile config implementation. + * + * @see org.eclipse.microprofile.config */ module io.helidon.microprofile.config { requires java.logging; diff --git a/microprofile/fault-tolerance/src/main/java/io/helidon/microprofile/faulttolerance/package-info.java b/microprofile/fault-tolerance/src/main/java/io/helidon/microprofile/faulttolerance/package-info.java index 14c4d79c5ba..3b977347394 100644 --- a/microprofile/fault-tolerance/src/main/java/io/helidon/microprofile/faulttolerance/package-info.java +++ b/microprofile/fault-tolerance/src/main/java/io/helidon/microprofile/faulttolerance/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2021 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,5 +16,7 @@ /** * Helidon implementation of Microprofile fault tolerance. + * + * @see org.eclipse.microprofile.faulttolerance */ package io.helidon.microprofile.faulttolerance; diff --git a/microprofile/fault-tolerance/src/main/java/module-info.java b/microprofile/fault-tolerance/src/main/java/module-info.java index 64b11edd38f..0d386392856 100644 --- a/microprofile/fault-tolerance/src/main/java/module-info.java +++ b/microprofile/fault-tolerance/src/main/java/module-info.java @@ -16,6 +16,8 @@ /** * Microprofile fault tolerance implementation. + * + * @see org.eclipse.microprofile.faulttolerance */ module io.helidon.microprofile.faulttolerance { requires java.logging; diff --git a/microprofile/health/src/main/java/io/helidon/microprofile/health/package-info.java b/microprofile/health/src/main/java/io/helidon/microprofile/health/package-info.java index 9fa1dd7651b..ac979a92707 100644 --- a/microprofile/health/src/main/java/io/helidon/microprofile/health/package-info.java +++ b/microprofile/health/src/main/java/io/helidon/microprofile/health/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2021 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,5 +16,7 @@ /** * Implements the JAX-RS and CDI support for microprofile. + * + * @see org.eclipse.microprofile.health */ package io.helidon.microprofile.health; diff --git a/microprofile/health/src/main/java/module-info.java b/microprofile/health/src/main/java/module-info.java index 465155b7c60..f992f53140a 100644 --- a/microprofile/health/src/main/java/module-info.java +++ b/microprofile/health/src/main/java/module-info.java @@ -16,6 +16,8 @@ /** * Microprofile health module. + * + * @see org.eclipse.microprofile.health */ module io.helidon.microprofile.health { requires java.logging; diff --git a/microprofile/jwt-auth/src/main/java/io/helidon/microprofile/jwt/auth/package-info.java b/microprofile/jwt-auth/src/main/java/io/helidon/microprofile/jwt/auth/package-info.java index 79efc758b6f..696692b714d 100644 --- a/microprofile/jwt-auth/src/main/java/io/helidon/microprofile/jwt/auth/package-info.java +++ b/microprofile/jwt-auth/src/main/java/io/helidon/microprofile/jwt/auth/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2021 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,5 +16,8 @@ /** * Implementation of Microprofile JWT Auth specification. + * + * @see org.eclipse.microprofile.jwt + * @see org.eclipse.microprofile.auth */ package io.helidon.microprofile.jwt.auth; diff --git a/microprofile/jwt-auth/src/main/java/module-info.java b/microprofile/jwt-auth/src/main/java/module-info.java index c6d44904630..d0c428e1087 100644 --- a/microprofile/jwt-auth/src/main/java/module-info.java +++ b/microprofile/jwt-auth/src/main/java/module-info.java @@ -16,6 +16,9 @@ /** * Microprofile jwt module. + * + * @see org.eclipse.microprofile.jwt + * @see org.eclipse.microprofile.auth */ module io.helidon.microprofile.jwt.auth { requires java.logging; diff --git a/microprofile/metrics/src/main/java/io/helidon/microprofile/metrics/package-info.java b/microprofile/metrics/src/main/java/io/helidon/microprofile/metrics/package-info.java index 699aaf9fca8..87e08ac4af3 100644 --- a/microprofile/metrics/src/main/java/io/helidon/microprofile/metrics/package-info.java +++ b/microprofile/metrics/src/main/java/io/helidon/microprofile/metrics/package-info.java @@ -17,5 +17,7 @@ /** * Microprofile metrics specification implementation. * See https://github.com/eclipse/microprofile-metrics/ + * + * @see org.eclipse.microprofile.metrics */ package io.helidon.microprofile.metrics; diff --git a/microprofile/metrics/src/main/java/module-info.java b/microprofile/metrics/src/main/java/module-info.java index 413dd7cae4e..5b84203383b 100644 --- a/microprofile/metrics/src/main/java/module-info.java +++ b/microprofile/metrics/src/main/java/module-info.java @@ -16,6 +16,8 @@ /** * Microprofile metrics implementation. + * + * @see org.eclipse.microprofile.metrics */ module io.helidon.microprofile.metrics { requires java.logging; diff --git a/microprofile/openapi/src/main/java/io/helidon/microprofile/openapi/package-info.java b/microprofile/openapi/src/main/java/io/helidon/microprofile/openapi/package-info.java index a51cf11d46d..d9afee5ecc7 100644 --- a/microprofile/openapi/src/main/java/io/helidon/microprofile/openapi/package-info.java +++ b/microprofile/openapi/src/main/java/io/helidon/microprofile/openapi/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2021 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,5 +17,7 @@ /** * Support for OpenAPI in Helidon MP. + * + * @see org.eclipse.microprofile.openapi */ package io.helidon.microprofile.openapi; diff --git a/microprofile/openapi/src/main/java/module-info.java b/microprofile/openapi/src/main/java/module-info.java index c6ff199278b..89274fc147b 100644 --- a/microprofile/openapi/src/main/java/module-info.java +++ b/microprofile/openapi/src/main/java/module-info.java @@ -19,6 +19,11 @@ import io.helidon.microprofile.openapi.OpenApiCdiExtension; +/** + * CDI extension for MicroProfile OpenAPI implementation. + * + * @see org.eclipse.microprofile.openapi + */ module io.helidon.microprofile.openapi { requires java.logging; diff --git a/microprofile/reactive-streams/src/main/java/io/helidon/microprofile/reactive/package-info.java b/microprofile/reactive-streams/src/main/java/io/helidon/microprofile/reactive/package-info.java index f5f9dc9f0bc..d43f716f9a6 100644 --- a/microprofile/reactive-streams/src/main/java/io/helidon/microprofile/reactive/package-info.java +++ b/microprofile/reactive-streams/src/main/java/io/helidon/microprofile/reactive/package-info.java @@ -17,5 +17,7 @@ /** * Support for MicroProfile Reactive Streams Operators in Helidon MP. + * + * @see org.eclipse.microprofile.reactive.streams.operators */ package io.helidon.microprofile.reactive; diff --git a/microprofile/reactive-streams/src/main/java/module-info.java b/microprofile/reactive-streams/src/main/java/module-info.java index 8a24180c9fa..12c3bdf2bd8 100644 --- a/microprofile/reactive-streams/src/main/java/module-info.java +++ b/microprofile/reactive-streams/src/main/java/module-info.java @@ -16,6 +16,8 @@ /** * MicroProfile Reactive Streams Operators implementation. + * + * @see org.eclipse.microprofile.reactive.streams.operators */ module io.helidon.microprofile.reactive { requires java.logging; diff --git a/microprofile/rest-client/src/main/java/io/helidon/microprofile/restclient/package-info.java b/microprofile/rest-client/src/main/java/io/helidon/microprofile/restclient/package-info.java index a4b78bfdcb8..a37e0abe5d6 100644 --- a/microprofile/rest-client/src/main/java/io/helidon/microprofile/restclient/package-info.java +++ b/microprofile/rest-client/src/main/java/io/helidon/microprofile/restclient/package-info.java @@ -15,5 +15,7 @@ */ /** * Helidon specific extension to the rest client implementation from Jersey. + * + * @see org.eclipse.microprofile.rest.client */ package io.helidon.microprofile.restclient; diff --git a/microprofile/rest-client/src/main/java/module-info.java b/microprofile/rest-client/src/main/java/module-info.java index 33d53049025..9c6e6ee3e59 100644 --- a/microprofile/rest-client/src/main/java/module-info.java +++ b/microprofile/rest-client/src/main/java/module-info.java @@ -16,6 +16,8 @@ /** * MP Rest client. + * + * @see org.eclipse.microprofile.rest.client */ module io.helidon.microprofile.restclient { requires java.logging; diff --git a/microprofile/tracing/src/main/java/io/helidon/microprofile/tracing/package-info.java b/microprofile/tracing/src/main/java/io/helidon/microprofile/tracing/package-info.java index bab23bcef43..4e38f1365ed 100644 --- a/microprofile/tracing/src/main/java/io/helidon/microprofile/tracing/package-info.java +++ b/microprofile/tracing/src/main/java/io/helidon/microprofile/tracing/package-info.java @@ -17,5 +17,7 @@ * Microprofile extension for tracing. * Expected location of configuration is at key {@code tracing}, * see {@link io.helidon.tracing.TracerBuilder} for details about configuration. + * + * @see org.eclipse.microprofile.opentracing */ package io.helidon.microprofile.tracing; diff --git a/microprofile/tracing/src/main/java/module-info.java b/microprofile/tracing/src/main/java/module-info.java index 8602035cc70..6b250044c4e 100644 --- a/microprofile/tracing/src/main/java/module-info.java +++ b/microprofile/tracing/src/main/java/module-info.java @@ -16,6 +16,8 @@ /** * Eclipse Microprofile Tracing implementation for helidon microprofile. + * + * @see org.eclipse.microprofile.opentracing */ module io.helidon.microprofile.tracing { requires java.logging; diff --git a/pom.xml b/pom.xml index 0ae10a0222f..229f2c609a5 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ --> 1.4.0.Final 2.0.0.Final - 1.5.4.1 + 1.5.18 6.0 8.29 2.4.14 @@ -102,7 +102,7 @@ 0.8.5 1.1.0 3.0.2 - 3.3.0 + 3.3.1 0.14.0 1.16 1.5.0.Final @@ -124,6 +124,30 @@ 2.3.0 + + https://jakarta.ee/specifications/restful-ws/2.1/apidocs/ + https://jakarta.ee/specifications/cdi/2.0/apidocs/ + https://jakarta.ee/specifications/jsonb/1.0/apidocs/ + https://jakarta.ee/specifications/persistence/2.2/apidocs/ + https://jakarta.ee/specifications/jsonp/1.1/apidocs/ + https://jakarta.ee/specifications/dependency-injection/1.0/apidocs/ + https://jakarta.ee/specifications/xml-binding/2.3/apidocs/ + https://jakarta.ee/specifications/transactions/1.3/apidocs/ + + https://download.eclipse.org/microprofile/microprofile-config-${version.lib.microprofile-config}/apidocs/ + https://download.eclipse.org/microprofile/microprofile-health-${version.lib.microprofile-health}/apidocs/ + https://download.eclipse.org/microprofile/microprofile-metrics-${version.lib.microprofile-metrics-api}/apidocs/ + https://download.eclipse.org/microprofile/microprofile-fault-tolerance-${version.lib.microprofile-fault-tolerance-api}/apidocs/ + https://download.eclipse.org/microprofile/microprofile-graphql-${version.lib.microprofile-graphql}/apidocs/ + https://download.eclipse.org/microprofile/microprofile-jwt-auth-${version.lib.microprofile-jwt}/apidocs/ + https://download.eclipse.org/microprofile/microprofile-open-api-${version.lib.microprofile-openapi-api}/apidocs/ + https://download.eclipse.org/microprofile/microprofile-reactive-messaging-${version.lib.microprofile-reactive-messaging-api}/apidocs/ + https://download.eclipse.org/microprofile/microprofile-reactive-streams-operators-${version.lib.microprofile-reactive-streams-operators-api}/apidocs + https://download.eclipse.org/microprofile/microprofile-rest-client-${version.lib.microprofile-rest-client}/apidocs + https://download.eclipse.org/microprofile/microprofile-opentracing-${version.lib.microprofile-tracing}/apidocs/ + https://download.eclipse.org/microprofile/microprofile-lra-${version.lib.microprofile-lra-api}/apidocs/ + + 2.12 https://fasterxml.github.io/jackson-annotations/javadoc/${javadoc.jackson.version}/ https://fasterxml.github.io/jackson-core/javadoc/${javadoc.jackson.version}/ @@ -131,7 +155,6 @@ https://eclipse-ee4j.github.io/jaxrs-api/apidocs/${version.lib.jaxrs-api} https://static.javadoc.io/io.netty/netty-transport/${version.lib.netty} http://docs.jboss.org/cdi/api/2.0 - http://javax-inject.github.io/javax-inject/api/ http://www.reactive-streams.org/reactive-streams-${version.lib.reactivestreams}-javadoc https://eclipse-ee4j.github.io/jersey.github.io/apidocs/${version.lib.jersey}/jersey https://static.javadoc.io/com.typesafe/config/${version.lib.typesafe-config} @@ -139,16 +162,6 @@ https://static.javadoc.io/io.opentracing/opentracing-api/${version.lib.opentracing} https://static.javadoc.io/io.prometheus/simpleclient/${version.lib.prometheus} https://static.javadoc.io/io.zipkin.reporter2/zipkin-reporter/2.12.3 - https://static.javadoc.io/jakarta.json.bind/jakarta.json.bind-api/${version.lib.jsonb-api} - https://static.javadoc.io/jakarta.persistence/jakarta.persistence-api/${version.lib.persistence-api} - https://static.javadoc.io/jakarta.json/jakarta.json-api/${version.lib.jsonp-api} - https://static.javadoc.io/javax.json.bind/javax.json.bind-api/1.0 - https://static.javadoc.io/javax.xml.bind/jaxb-api/2.3.1 - https://static.javadoc.io/javax.persistence/javax.persistence-api/2.2 - https://static.javadoc.io/javax.transaction/javax.transaction-api/1.3 - https://static.javadoc.io/org.eclipse.microprofile.config/microprofile-config-api/${version.lib.microprofile-config} - https://static.javadoc.io/org.eclipse.microprofile.health/microprofile-health-api/${version.lib.microprofile-health} - https://static.javadoc.io/org.eclipse.microprofile.metrics/microprofile-metrics-api/${version.lib.microprofile-metrics-api} https://docs.jboss.org/weld/javadoc/3.0/weld-spi/ http://narayana.io/docs/api/ https://www.eclipse.org/eclipselink/api/2.7/ @@ -244,22 +257,10 @@ ${javadoc.link.jackson-databind} ${javadoc.packagelist.dir}/jackson-databind - - ${javadoc.link.jaxrs} - ${javadoc.packagelist.dir}/jaxrs - ${javadoc.link.netty} ${javadoc.packagelist.dir}/netty - - ${javadoc.link.cdi} - ${javadoc.packagelist.dir}/cdi - - - ${javadoc.link.javax-inject} - ${javadoc.packagelist.dir}/javax-inject - ${javadoc.link.reactive-streams} ${javadoc.packagelist.dir}/reactive-streams @@ -288,6 +289,14 @@ ${javadoc.link.zipkin} ${javadoc.packagelist.dir}/zipkin + + ${javadoc.link.jakarta-cdi} + ${javadoc.packagelist.dir}/jakarta-cdi + + + ${javadoc.link.jakarta-jaxrs} + ${javadoc.packagelist.dir}/jakarta-jaxrs + ${javadoc.link.jakarta-jsonb} ${javadoc.packagelist.dir}/jakarta-jsonb @@ -301,20 +310,8 @@ ${javadoc.packagelist.dir}/jakarta-jsonp - ${javadoc.link.javax-jsonb} - ${javadoc.packagelist.dir}/javax-jsonb - - - ${javadoc.link.javax-jaxb} - ${javadoc.packagelist.dir}/javax-jaxb - - - ${javadoc.link.javax-persistence} - ${javadoc.packagelist.dir}/javax-persistence - - - ${javadoc.link.javax-transaction} - ${javadoc.packagelist.dir}/javax-transaction + ${javadoc.link.jakarta-inject} + ${javadoc.packagelist.dir}/jakarta-inject ${javadoc.link.microprofile-config} @@ -328,6 +325,42 @@ ${javadoc.link.microprofile-metrics} ${javadoc.packagelist.dir}/microprofile-metrics + + ${javadoc.link.microprofile-fault-tolerance-api} + ${javadoc.packagelist.dir}/microprofile-fault-tolerance-api + + + ${javadoc.link.microprofile-graphql} + ${javadoc.packagelist.dir}/microprofile-graphql + + + ${javadoc.link.microprofile-jwt} + ${javadoc.packagelist.dir}/microprofile-jwt + + + ${javadoc.link.microprofile-lra-api} + ${javadoc.packagelist.dir}/microprofile-lra-api + + + ${javadoc.link.microprofile-openapi-api} + ${javadoc.packagelist.dir}/microprofile-openapi-api + + + ${javadoc.link.microprofile-reactive-messaging-api} + ${javadoc.packagelist.dir}/microprofile-reactive-messaging-api + + + ${javadoc.link.microprofile-reactive-streams-operators-api} + ${javadoc.packagelist.dir}/microprofile-reactive-streams-operators-api + + + ${javadoc.link.microprofile-rest-client} + ${javadoc.packagelist.dir}/microprofile-rest-client + + + ${javadoc.link.microprofile-tracing} + ${javadoc.packagelist.dir}/microprofile-tracing + ${javadoc.link.weld} ${javadoc.packagelist.dir}/weld diff --git a/webserver/jersey/src/main/java/io/helidon/webserver/jersey/package-info.java b/webserver/jersey/src/main/java/io/helidon/webserver/jersey/package-info.java index 6e1c39917d1..0c668fcc32a 100644 --- a/webserver/jersey/src/main/java/io/helidon/webserver/jersey/package-info.java +++ b/webserver/jersey/src/main/java/io/helidon/webserver/jersey/package-info.java @@ -15,7 +15,7 @@ */ /** - * This package contains JAX-RS (Jersey based) support for {@link io.helidon.webserver.WebServer WebServer}'s + * This package contains {@link javax.ws.rs JAX-RS} (Jersey based) support for {@link io.helidon.webserver.WebServer WebServer}'s * {@link io.helidon.webserver.Routing Routing}. *

* For more information see {@link io.helidon.webserver.jersey.JerseySupport JerseySupport} documentation. diff --git a/webserver/jersey/src/main/java/module-info.java b/webserver/jersey/src/main/java/module-info.java index d92355de82f..b5d88c64ffc 100644 --- a/webserver/jersey/src/main/java/module-info.java +++ b/webserver/jersey/src/main/java/module-info.java @@ -18,6 +18,9 @@ /** * Jersey integration. + * + * @see javax.ws.rs + * @see org.glassfish.jersey */ module io.helidon.webserver.jersey { requires transitive java.annotation; From 6a1ec05651b49096b3f619f50c56eb30e9fa531a Mon Sep 17 00:00:00 2001 From: Joe Di Pol Date: Thu, 9 Dec 2021 13:41:44 -0800 Subject: [PATCH 2/2] Fix copyright --- .../src/main/java/io/helidon/webserver/jersey/package-info.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webserver/jersey/src/main/java/io/helidon/webserver/jersey/package-info.java b/webserver/jersey/src/main/java/io/helidon/webserver/jersey/package-info.java index 0c668fcc32a..f4ac5ef7e7e 100644 --- a/webserver/jersey/src/main/java/io/helidon/webserver/jersey/package-info.java +++ b/webserver/jersey/src/main/java/io/helidon/webserver/jersey/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2021 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.