From 3db33cc2892452f6762081dbd2e8c1aea47f2a47 Mon Sep 17 00:00:00 2001
From: Joe DiPol <joe.dipol@oracle.com>
Date: Mon, 30 Aug 2021 08:06:28 -0700
Subject: [PATCH] Javadoc update: external links and package-list/element-list
 updates (#3333)

* Javadoc: update some external links and package-lists
---
 etc/javadoc/jackson-core/package-list         |  1 +
 etc/javadoc/jackson-databind/package-list     |  2 +
 .../{package-list => element-list}            |  0
 etc/javadoc/javax-transaction/package-list    |  3 +-
 .../jaxrs/{package-list => element-list}      |  0
 etc/javadoc/jersey/package-list               | 76 +++++++++----------
 etc/javadoc/narayana/package-list             |  1 +
 .../prometheus/{package-list => element-list} |  0
 .../zipkin/{package-list => element-list}     |  0
 pom.xml                                       | 20 ++---
 10 files changed, 51 insertions(+), 52 deletions(-)
 rename etc/javadoc/jakarta-jsonb/{package-list => element-list} (100%)
 rename etc/javadoc/jaxrs/{package-list => element-list} (100%)
 rename etc/javadoc/prometheus/{package-list => element-list} (100%)
 rename etc/javadoc/zipkin/{package-list => element-list} (100%)

diff --git a/etc/javadoc/jackson-core/package-list b/etc/javadoc/jackson-core/package-list
index 363e382cd1f..86a8930babc 100644
--- a/etc/javadoc/jackson-core/package-list
+++ b/etc/javadoc/jackson-core/package-list
@@ -1,6 +1,7 @@
 com.fasterxml.jackson.core
 com.fasterxml.jackson.core.async
 com.fasterxml.jackson.core.base
+com.fasterxml.jackson.core.exc
 com.fasterxml.jackson.core.filter
 com.fasterxml.jackson.core.format
 com.fasterxml.jackson.core.io
diff --git a/etc/javadoc/jackson-databind/package-list b/etc/javadoc/jackson-databind/package-list
index 8a2cd8be56f..a80c0c399fa 100644
--- a/etc/javadoc/jackson-databind/package-list
+++ b/etc/javadoc/jackson-databind/package-list
@@ -7,6 +7,8 @@ com.fasterxml.jackson.databind.deser.std
 com.fasterxml.jackson.databind.exc
 com.fasterxml.jackson.databind.ext
 com.fasterxml.jackson.databind.introspect
+com.fasterxml.jackson.databind.jdk14
+com.fasterxml.jackson.databind.json
 com.fasterxml.jackson.databind.jsonFormatVisitors
 com.fasterxml.jackson.databind.jsonschema
 com.fasterxml.jackson.databind.jsontype
diff --git a/etc/javadoc/jakarta-jsonb/package-list b/etc/javadoc/jakarta-jsonb/element-list
similarity index 100%
rename from etc/javadoc/jakarta-jsonb/package-list
rename to etc/javadoc/jakarta-jsonb/element-list
diff --git a/etc/javadoc/javax-transaction/package-list b/etc/javadoc/javax-transaction/package-list
index d5e646839e4..90eaa56cff3 100644
--- a/etc/javadoc/javax-transaction/package-list
+++ b/etc/javadoc/javax-transaction/package-list
@@ -1,2 +1 @@
-javax.transaction
-javax.transaction.xa
+javax.transaction
diff --git a/etc/javadoc/jaxrs/package-list b/etc/javadoc/jaxrs/element-list
similarity index 100%
rename from etc/javadoc/jaxrs/package-list
rename to etc/javadoc/jaxrs/element-list
diff --git a/etc/javadoc/jersey/package-list b/etc/javadoc/jersey/package-list
index 563333cc1fc..81e3fd6aec4 100644
--- a/etc/javadoc/jersey/package-list
+++ b/etc/javadoc/jersey/package-list
@@ -5,93 +5,87 @@ org.glassfish.jersey.apache.connector
 org.glassfish.jersey.client
 org.glassfish.jersey.client.authentication
 org.glassfish.jersey.client.filter
-org.glassfish.jersey.client.oauth1
-org.glassfish.jersey.client.oauth2
-org.glassfish.jersey.client.proxy
-org.glassfish.jersey.client.rx.guava
-org.glassfish.jersey.client.rx.rxjava
-org.glassfish.jersey.client.rx.rxjava2
+org.glassfish.jersey.client.http
+org.glassfish.jersey.client.inject
+org.glassfish.jersey.client.internal
 org.glassfish.jersey.client.spi
-org.glassfish.jersey.ext.cdi1x.hk2ban
+org.glassfish.jersey.ext.cdi1x.internal
 org.glassfish.jersey.ext.cdi1x.spi
 org.glassfish.jersey.grizzly.connector
 org.glassfish.jersey.grizzly2.httpserver
+org.glassfish.jersey.grizzly2.httpserver.internal
 org.glassfish.jersey.grizzly2.servlet
 org.glassfish.jersey.inject.cdi.se
 org.glassfish.jersey.inject.cdi.se.bean
 org.glassfish.jersey.inject.cdi.se.injector
 org.glassfish.jersey.inject.hk2
+org.glassfish.jersey.internal
 org.glassfish.jersey.jackson
+org.glassfish.jersey.jackson.internal
 org.glassfish.jersey.jackson1
+org.glassfish.jersey.jaxb
+org.glassfish.jersey.jaxb.internal
 org.glassfish.jersey.jdk.connector
+org.glassfish.jersey.jdk.connector.internal
 org.glassfish.jersey.jdkhttp
+org.glassfish.jersey.jdkhttp.internal
 org.glassfish.jersey.jettison
-org.glassfish.jersey.jetty
+org.glassfish.jersey.jettison.internal
 org.glassfish.jersey.jetty.connector
-org.glassfish.jersey.jetty.servlet
 org.glassfish.jersey.jsonb
+org.glassfish.jersey.jsonb.internal
 org.glassfish.jersey.jsonp
+org.glassfish.jersey.jsonp.internal
 org.glassfish.jersey.kryo
+org.glassfish.jersey.kryo.internal
 org.glassfish.jersey.linking
 org.glassfish.jersey.linking.contributing
 org.glassfish.jersey.linking.mapping
 org.glassfish.jersey.logging
-org.glassfish.jersey.media.htmljson
 org.glassfish.jersey.media.multipart
 org.glassfish.jersey.media.multipart.file
+org.glassfish.jersey.media.multipart.internal
 org.glassfish.jersey.media.sse
+org.glassfish.jersey.media.sse.internal
 org.glassfish.jersey.message
-org.glassfish.jersey.message.filtering
-org.glassfish.jersey.message.filtering.spi
+org.glassfish.jersey.message.internal
+org.glassfish.jersey.microprofile.config
+org.glassfish.jersey.microprofile.restclient
 org.glassfish.jersey.model
+org.glassfish.jersey.model.internal
+org.glassfish.jersey.moxy.internal
 org.glassfish.jersey.moxy.json
+org.glassfish.jersey.moxy.json.internal
 org.glassfish.jersey.moxy.xml
 org.glassfish.jersey.netty.connector
-org.glassfish.jersey.netty.httpserver
+org.glassfish.jersey.netty.connector.internal
 org.glassfish.jersey.oauth1.signature
+org.glassfish.jersey.oauth1.signature.internal
 org.glassfish.jersey.opentracing
 org.glassfish.jersey.process
+org.glassfish.jersey.process.internal
 org.glassfish.jersey.server
 org.glassfish.jersey.server.filter
-org.glassfish.jersey.server.gae
+org.glassfish.jersey.server.filter.internal
+org.glassfish.jersey.server.internal
 org.glassfish.jersey.server.model
+org.glassfish.jersey.server.model.internal
 org.glassfish.jersey.server.monitoring
-org.glassfish.jersey.server.mvc
-org.glassfish.jersey.server.mvc.beanvalidation
-org.glassfish.jersey.server.mvc.freemarker
-org.glassfish.jersey.server.mvc.jsp
-org.glassfish.jersey.server.mvc.mustache
-org.glassfish.jersey.server.mvc.spi
-org.glassfish.jersey.server.oauth1
 org.glassfish.jersey.server.spi
-org.glassfish.jersey.server.spring
-org.glassfish.jersey.server.spring.scope
-org.glassfish.jersey.server.validation
+org.glassfish.jersey.server.spi.internal
 org.glassfish.jersey.server.wadl
 org.glassfish.jersey.server.wadl.config
+org.glassfish.jersey.server.wadl.internal
 org.glassfish.jersey.server.wadl.processor
 org.glassfish.jersey.servlet
 org.glassfish.jersey.servlet.async
 org.glassfish.jersey.servlet.init
-org.glassfish.jersey.servlet.portability
+org.glassfish.jersey.servlet.init.internal
+org.glassfish.jersey.servlet.internal
 org.glassfish.jersey.servlet.spi
 org.glassfish.jersey.simple
+org.glassfish.jersey.simple.internal
 org.glassfish.jersey.spi
-org.glassfish.jersey.test
-org.glassfish.jersey.test.external
-org.glassfish.jersey.test.grizzly
-org.glassfish.jersey.test.inmemory
-org.glassfish.jersey.test.jdkhttp
-org.glassfish.jersey.test.jetty
-org.glassfish.jersey.test.maven.rule
-org.glassfish.jersey.test.maven.runner
-org.glassfish.jersey.test.memleak.common
-org.glassfish.jersey.test.netty
-org.glassfish.jersey.test.simple
-org.glassfish.jersey.test.spi
-org.glassfish.jersey.test.util.client
-org.glassfish.jersey.test.util.runner
-org.glassfish.jersey.test.util.server
 org.glassfish.jersey.uri
+org.glassfish.jersey.uri.internal
 org.glassfish.jersey.wadl.doclet
-org.glassfish.jersey.weld.se
diff --git a/etc/javadoc/narayana/package-list b/etc/javadoc/narayana/package-list
index e2b4c3ab5f2..ede69386f4f 100644
--- a/etc/javadoc/narayana/package-list
+++ b/etc/javadoc/narayana/package-list
@@ -28,6 +28,7 @@ com.arjuna.ats.jdbc.common
 com.arjuna.ats.jdbc.logging
 com.arjuna.ats.jta
 com.arjuna.ats.jta.cdi
+com.arjuna.ats.jta.cdi.async
 com.arjuna.ats.jta.cdi.transactional
 com.arjuna.ats.jta.common
 com.arjuna.ats.jta.exceptions
diff --git a/etc/javadoc/prometheus/package-list b/etc/javadoc/prometheus/element-list
similarity index 100%
rename from etc/javadoc/prometheus/package-list
rename to etc/javadoc/prometheus/element-list
diff --git a/etc/javadoc/zipkin/package-list b/etc/javadoc/zipkin/element-list
similarity index 100%
rename from etc/javadoc/zipkin/package-list
rename to etc/javadoc/zipkin/element-list
diff --git a/pom.xml b/pom.xml
index 83792b34395..d3e0fcba9c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,12 +123,14 @@
 
         <version.helidon-cli>2.2.0</version.helidon-cli>
 
-        <javadoc.link.jackson-annotations>https://fasterxml.github.io/jackson-annotations/javadoc/2.9/</javadoc.link.jackson-annotations>
-        <javadoc.link.jackson-core>https://fasterxml.github.io/jackson-core/javadoc/2.9/</javadoc.link.jackson-core>
-        <javadoc.link.jackson-databind>https://fasterxml.github.io/jackson-databind/javadoc/2.9/</javadoc.link.jackson-databind>
+        <!-- Links to external javadocs. If you see a hardcoded version it means the javadocs for the version we use is not available. -->
+        <javadoc.jackson.version>2.12</javadoc.jackson.version>
+        <javadoc.link.jackson-annotations>https://fasterxml.github.io/jackson-annotations/javadoc/${javadoc.jackson.version}/</javadoc.link.jackson-annotations>
+        <javadoc.link.jackson-core>https://fasterxml.github.io/jackson-core/javadoc/${javadoc.jackson.version}/</javadoc.link.jackson-core>
+        <javadoc.link.jackson-databind>https://fasterxml.github.io/jackson-databind/javadoc/${javadoc.jackson.version}/</javadoc.link.jackson-databind>
         <javadoc.link.jaxrs>https://eclipse-ee4j.github.io/jaxrs-api/apidocs/${version.lib.jaxrs-api}</javadoc.link.jaxrs>
         <javadoc.link.netty>https://static.javadoc.io/io.netty/netty-transport/${version.lib.netty}</javadoc.link.netty>
-        <javadoc.link.cdi>http://docs.jboss.org/cdi/api/${version.lib.cdi-api}</javadoc.link.cdi>
+        <javadoc.link.cdi>http://docs.jboss.org/cdi/api/2.0</javadoc.link.cdi>
         <javadoc.link.javax-inject>http://javax-inject.github.io/javax-inject/api/</javadoc.link.javax-inject>
         <javadoc.link.reactive-streams>http://www.reactive-streams.org/reactive-streams-${version.lib.reactivestreams}-javadoc</javadoc.link.reactive-streams>
         <javadoc.link.jersey>https://eclipse-ee4j.github.io/jersey.github.io/apidocs/${version.lib.jersey}/jersey</javadoc.link.jersey>
@@ -136,14 +138,14 @@
         <javadoc.link.netty-transport>https://static.javadoc.io/io.netty/netty-transport/${version.lib.netty}</javadoc.link.netty-transport>
         <javadoc.link.opentracing>https://static.javadoc.io/io.opentracing/opentracing-api/${version.lib.opentracing}</javadoc.link.opentracing>
         <javadoc.link.prometheus>https://static.javadoc.io/io.prometheus/simpleclient/${version.lib.prometheus}</javadoc.link.prometheus>
-        <javadoc.link.zipkin>https://static.javadoc.io/io.zipkin.reporter2/zipkin-reporter/${version.lib.zipkin}</javadoc.link.zipkin>
+        <javadoc.link.zipkin>https://static.javadoc.io/io.zipkin.reporter2/zipkin-reporter/2.12.3</javadoc.link.zipkin>
         <javadoc.link.jakarta-jsonb>https://static.javadoc.io/jakarta.json.bind/jakarta.json.bind-api/${version.lib.jsonb-api}</javadoc.link.jakarta-jsonb>
         <javadoc.link.jakarta-persistence>https://static.javadoc.io/jakarta.persistence/jakarta.persistence-api/${version.lib.persistence-api}</javadoc.link.jakarta-persistence>
-        <javadoc.link.jakarta-jsonp>https://static.javadoc.io/jakarta.json/jakarta.json-api/1.1.6</javadoc.link.jakarta-jsonp>
+        <javadoc.link.jakarta-jsonp>https://static.javadoc.io/jakarta.json/jakarta.json-api/${version.lib.jsonp-api}</javadoc.link.jakarta-jsonp>
         <javadoc.link.javax-jsonb>https://static.javadoc.io/javax.json.bind/javax.json.bind-api/1.0</javadoc.link.javax-jsonb>
-        <javadoc.link.javax-jaxb>https://static.javadoc.io/javax.xml.bind/jaxb-api/${version.lib.jaxb-api}</javadoc.link.javax-jaxb>
-        <javadoc.link.javax-persistence>https://static.javadoc.io/javax.persistence/javax.persistence-api/${version.lib.persistence-api}</javadoc.link.javax-persistence>
-        <javadoc.link.javax-transaction>https://static.javadoc.io/javax.transaction/javax.transaction-api/${version.lib.transaction-api}</javadoc.link.javax-transaction>
+        <javadoc.link.javax-jaxb>https://static.javadoc.io/javax.xml.bind/jaxb-api/2.3.1</javadoc.link.javax-jaxb>
+        <javadoc.link.javax-persistence>https://static.javadoc.io/javax.persistence/javax.persistence-api/2.2</javadoc.link.javax-persistence>
+        <javadoc.link.javax-transaction>https://static.javadoc.io/javax.transaction/javax.transaction-api/1.3</javadoc.link.javax-transaction>
         <javadoc.link.microprofile-config>https://static.javadoc.io/org.eclipse.microprofile.config/microprofile-config-api/${version.lib.microprofile-config}</javadoc.link.microprofile-config>
         <javadoc.link.microprofile-health>https://static.javadoc.io/org.eclipse.microprofile.health/microprofile-health-api/${version.lib.microprofile-health}</javadoc.link.microprofile-health>
         <javadoc.link.microprofile-metrics>https://static.javadoc.io/org.eclipse.microprofile.metrics/microprofile-metrics-api/${version.lib.microprofile-metrics-api}</javadoc.link.microprofile-metrics>