This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch jbUpgradeHttpClientTo4514
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit b4c715fd847c4f3d5d060ce40aa856d495181e72
Author: JamesBognar <james.bog...@salesforce.com>
AuthorDate: Tue Dec 27 10:33:07 2022 -0500
Fix javadocs
---
juneau-doc/docs/ReleaseNotes/6.2.0.html | 2 +-
juneau-doc/docs/ReleaseNotes/6.3.0.html | 8 ++++----
juneau-doc/docs/Topics/01.Overview/03.o.RestServer.html | 6 +++---
juneau-doc/docs/Topics/08.juneau-rest-server.html | 4 ++--
juneau-doc/docs/Topics/08.juneau-rest-server/01.jrs.Overview.html | 2 +-
.../02.jrs.AnnotatedClasses/01.jrs.PredefinedClasses.html | 4 ++--
.../Topics/08.juneau-rest-server/06.jrs.HandlingFormPosts.html | 2 +-
.../docs/Topics/08.juneau-rest-server/19.jrs.HttpStatusCodes.html | 2 +-
.../docs/Topics/08.juneau-rest-server/22.jrs.RestContext.html | 2 +-
.../docs/Topics/08.juneau-rest-server/29.jrs.OtherNotes.html | 4 ++--
.../docs/Topics/11.juneau-rest-mock/01.jrm.MockRestClient.html | 2 +-
juneau-env.sh | 2 +-
12 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/juneau-doc/docs/ReleaseNotes/6.2.0.html
b/juneau-doc/docs/ReleaseNotes/6.2.0.html
index 33c3d36de..54da0ac65 100644
--- a/juneau-doc/docs/ReleaseNotes/6.2.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.2.0.html
@@ -123,7 +123,7 @@
<br><br>
The majority of code has been split up into two
separate classes:
<ul>
- <li><del>RestConfig</del> - A modifiable
configuration of a resource. Subclasses from {@link
javax.servlet.ServletConfig}.
+ <li><del>RestConfig</del> - A modifiable
configuration of a resource. Subclasses from
<del>javax.servlet.ServletConfig</del>.
<li>{@link oajr.RestContext} - A read-only
configuration that's the result of a snapshot of the config.
</ul>
<br><br>
diff --git a/juneau-doc/docs/ReleaseNotes/6.3.0.html
b/juneau-doc/docs/ReleaseNotes/6.3.0.html
index d8164ad5b..842dd510d 100644
--- a/juneau-doc/docs/ReleaseNotes/6.3.0.html
+++ b/juneau-doc/docs/ReleaseNotes/6.3.0.html
@@ -202,9 +202,9 @@
<br>For reference, the previous supported types were:
<ul>
<li>{@link oajr.RestRequest} - The request
object.
- <li>{@link
javax.servlet.http.HttpServletRequest} - The superclass of <c>RestRequest</c>.
+
<li><del>javax.servlet.http.HttpServletRequest</del> - The superclass of
<c>RestRequest</c>.
<li>{@link oajr.RestResponse} - The response
object.
- <li>{@link
javax.servlet.http.HttpServletResponse} - The superclass of <c>RestResponse</c>.
+
<li><del>javax.servlet.http.HttpServletResponse</del> - The superclass of
<c>RestResponse</c>.
</ul>
The new supported types are:
<ul>
@@ -238,10 +238,10 @@
<li><del>Warning</del>
<li>{@link java.util.TimeZone}
<li>{@link java.io.InputStream}
- <li>{@link javax.servlet.ServletInputStream}
+ <li><del>javax.servlet.ServletInputStream</del>
<li>{@link java.io.Reader}
<li>{@link java.io.OutputStream}
- <li>{@link javax.servlet.ServletOutputStream}
+ <li><del>javax.servlet.ServletOutputStream</del>
<li>{@link java.io.Writer}
<li>{@link java.util.ResourceBundle} -
Client-localized resource bundle.
<li><del>MessageBundle</del> - A resource
bundle with additional features.
diff --git a/juneau-doc/docs/Topics/01.Overview/03.o.RestServer.html
b/juneau-doc/docs/Topics/01.Overview/03.o.RestServer.html
index 3d3f407b2..e7a9f93ba 100644
--- a/juneau-doc/docs/Topics/01.Overview/03.o.RestServer.html
+++ b/juneau-doc/docs/Topics/01.Overview/03.o.RestServer.html
@@ -20,7 +20,7 @@
<p>
A REST resource is simply a Java class annotated with {@link
oajr.annotation.Rest}.
The most common case is a class that extends {@link
oajr.servlet.BasicRestServlet}, which itself is simply an
- extension of {@link javax.servlet.http.HttpServlet} which
allows it to be deployed as a servlet.
+ extension of {@link jakarta.servlet.http.HttpServlet} which
allows it to be deployed as a servlet.
</p>
<p class='bjava'>
| <jc>// Sample REST resource that prints out a simple
"Hello world!" message.</jc>
@@ -404,7 +404,7 @@
</ul>
<li>A wide range of possible argument types including:
<ul>
- <li>Standard {@link
javax.servlet.http.HttpServletRequest} / {@link
javax.servlet.http.HttpServletResponse} objects.
+ <li>Standard {@link
jakarta.servlet.http.HttpServletRequest} / {@link
jakarta.servlet.http.HttpServletResponse} objects.
<li>Extended {@link oajr.RestRequest} / {@link
oajr.RestResponse} objects.
<li>Parsed HTTP parts with either the arguments or
beans annotated with {@link oaj.http.annotation.Path @Path} / {@link
oaj.http.annotation.Header @Header} / {@link oaj.http.annotation.Query @Query}
/ {@link oaj.http.annotation.FormData @FormData}.
<li>Parsed HTTP body with either the argument or bean
annotated with {@link oaj.http.annotation.Content @Content}.
@@ -414,7 +414,7 @@
<li>Response beans annotated with {@link
oaj.http.annotation.Response @Response}.
<li>Standard HTTP headers such as {@link
oaj.http.header.Accept} and {@link oaj.http.header.ContentType} provided in
{@link oaj.http.header} package.
<li>Auto-generated {@link oaj.dto.swagger.Swagger}.
- <li>Various other standard objects such as {@link
java.security.Principal}, {@link javax.servlet.http.Cookie}, {@link
javax.servlet.http.HttpSession}, and {@link java.util.ResourceBundle}.
+ <li>Various other standard objects such as {@link
java.security.Principal}, {@link jakarta.servlet.http.Cookie}, {@link
jakarta.servlet.http.HttpSession}, and {@link java.util.ResourceBundle}.
<li>Spring beans or other injectable beans.
<li>Extensible API for defining custom argument types.
</ul>
diff --git a/juneau-doc/docs/Topics/08.juneau-rest-server.html
b/juneau-doc/docs/Topics/08.juneau-rest-server.html
index 7d1c0a76b..6f6b4d41b 100644
--- a/juneau-doc/docs/Topics/08.juneau-rest-server.html
+++ b/juneau-doc/docs/Topics/08.juneau-rest-server.html
@@ -52,9 +52,9 @@
<p>
The API builds upon the existing JEE Servlet API.
The root class, {@link oajr.servlet.RestServlet} is nothing but
a specialized
- {@link javax.servlet.http.HttpServlet}, and the {@link
oajr.RestRequest} and
+ {@link jakarta.servlet.http.HttpServlet}, and the {@link
oajr.RestRequest} and
{@link oajr.RestResponse} classes are nothing more than
specialized
- {@link javax.servlet.http.HttpServletRequest} and {@link
javax.servlet.http.HttpServletResponse} objects.
+ {@link jakarta.servlet.http.HttpServletRequest} and {@link
jakarta.servlet.http.HttpServletResponse} objects.
This allows maximum flexibility for the developer since you can
let Juneau handle operations such as
serialization, or you can revert to the existing servlet APIs
to do low-level processing of requests yourself.
It also means you need nothing more than a Servlet container
such as Jetty to use the REST framework.
diff --git a/juneau-doc/docs/Topics/08.juneau-rest-server/01.jrs.Overview.html
b/juneau-doc/docs/Topics/08.juneau-rest-server/01.jrs.Overview.html
index efbc5c3d7..6864d2daa 100644
--- a/juneau-doc/docs/Topics/08.juneau-rest-server/01.jrs.Overview.html
+++ b/juneau-doc/docs/Topics/08.juneau-rest-server/01.jrs.Overview.html
@@ -19,7 +19,7 @@
<p>
A REST resource is simply a Java class annotated with {@link
oajr.annotation.Rest @Rest}.
The most common case is a class that extends {@link
oajr.servlet.BasicRestServlet}, which itself is simply an
- extension of {@link javax.servlet.http.HttpServlet} which
allows it to be deployed as a servlet.
+ extension of {@link jakarta.servlet.http.HttpServlet} which
allows it to be deployed as a servlet.
</p>
<p>
Juneau has two sample applications for demonstrating how to use
the REST API, one using Jetty and one using
diff --git
a/juneau-doc/docs/Topics/08.juneau-rest-server/02.jrs.AnnotatedClasses/01.jrs.PredefinedClasses.html
b/juneau-doc/docs/Topics/08.juneau-rest-server/02.jrs.AnnotatedClasses/01.jrs.PredefinedClasses.html
index 39d6692df..61c612426 100644
---
a/juneau-doc/docs/Topics/08.juneau-rest-server/02.jrs.AnnotatedClasses/01.jrs.PredefinedClasses.html
+++
b/juneau-doc/docs/Topics/08.juneau-rest-server/02.jrs.AnnotatedClasses/01.jrs.PredefinedClasses.html
@@ -45,7 +45,7 @@
functionality and to handle different use-cases. Users will
typically extend from one of these <c>Basic*</c> classes:
</p>
<ul class='javatree'>
- <li class='jac'>{@link javax.servlet.http.HttpServlet}
+ <li class='jac'>{@link jakarta.servlet.http.HttpServlet}
<ul>
<li class='jac'>{@link oajr.servlet.RestServlet}
<ul>
@@ -168,7 +168,7 @@
</p>
<p>
The <c>*Object*</c> classes provide the same functionality as
the servlet
- classes but do not extend from {@link
javax.servlet.http.HttpServlet}.
+ classes but do not extend from {@link
jakarta.servlet.http.HttpServlet}.
This becomes important in Spring Boot environments where you
may want to
define child resources as Spring Beans but don't want Spring
Boot to auto-detect
them as servlets to be deployed as top-level resources. This
is less important
diff --git
a/juneau-doc/docs/Topics/08.juneau-rest-server/06.jrs.HandlingFormPosts.html
b/juneau-doc/docs/Topics/08.juneau-rest-server/06.jrs.HandlingFormPosts.html
index a6f4c8001..42263bbca 100644
--- a/juneau-doc/docs/Topics/08.juneau-rest-server/06.jrs.HandlingFormPosts.html
+++ b/juneau-doc/docs/Topics/08.juneau-rest-server/06.jrs.HandlingFormPosts.html
@@ -68,7 +68,7 @@
</p>
<div class='warn'>
If you're using form input beans, DO NOT use the
<l>@FormData</l> attribute or
- {@link
javax.servlet.http.HttpServletRequest#getParameter(String)} method since this
will cause the
+ {@link
jakarta.servlet.http.HttpServletRequest#getParameter(String)} method since this
will cause the
underlying JEE servlet to parse the HTTP body as a form post.
<br>Your input bean will end up being null since there won't be
any content left after the servlet
has parsed the body of the request.
diff --git
a/juneau-doc/docs/Topics/08.juneau-rest-server/19.jrs.HttpStatusCodes.html
b/juneau-doc/docs/Topics/08.juneau-rest-server/19.jrs.HttpStatusCodes.html
index 2bac86dab..560fa215d 100644
--- a/juneau-doc/docs/Topics/08.juneau-rest-server/19.jrs.HttpStatusCodes.html
+++ b/juneau-doc/docs/Topics/08.juneau-rest-server/19.jrs.HttpStatusCodes.html
@@ -22,7 +22,7 @@
</p>
<p>
Other status codes can be generated by throwing a {@link
oaj.http.response.BasicHttpException} with a
- specific HTTP status code, or calling {@link
javax.servlet.http.HttpServletResponse#setStatus(int)}.
+ specific HTTP status code, or calling {@link
jakarta.servlet.http.HttpServletResponse#setStatus(int)}.
</p>
<p>
Non-OK (200) status codes are automatically triggered by the
following conditions:
diff --git
a/juneau-doc/docs/Topics/08.juneau-rest-server/22.jrs.RestContext.html
b/juneau-doc/docs/Topics/08.juneau-rest-server/22.jrs.RestContext.html
index c1a66ddcd..b3fe354e7 100644
--- a/juneau-doc/docs/Topics/08.juneau-rest-server/22.jrs.RestContext.html
+++ b/juneau-doc/docs/Topics/08.juneau-rest-server/22.jrs.RestContext.html
@@ -28,7 +28,7 @@
<p>
The {@link oajr.RestContext.Builder} class extends {@link
oaj.BeanContext.Builder}
allowing you to programmatically set any properties defined on
that builder class.
- It also implements {@link javax.servlet.ServletConfig}
+ It also implements {@link jakarta.servlet.ServletConfig}
</p>
<p>
To access this object, simply pass it in as a constructor
argument or in an INIT hook:
diff --git
a/juneau-doc/docs/Topics/08.juneau-rest-server/29.jrs.OtherNotes.html
b/juneau-doc/docs/Topics/08.juneau-rest-server/29.jrs.OtherNotes.html
index 90ec1b1c9..7fec40286 100644
--- a/juneau-doc/docs/Topics/08.juneau-rest-server/29.jrs.OtherNotes.html
+++ b/juneau-doc/docs/Topics/08.juneau-rest-server/29.jrs.OtherNotes.html
@@ -18,8 +18,8 @@
<div class='topic'>
<ul class='notes'>
<li class='note'>
- Subclasses can use either {@link
javax.servlet.http.HttpServlet#init(ServletConfig)}
- or {@link javax.servlet.http.HttpServlet#init()} for
initialization just like any other servlet.
+ Subclasses can use either {@link
jakarta.servlet.http.HttpServlet#init(ServletConfig)}
+ or {@link jakarta.servlet.http.HttpServlet#init()} for
initialization just like any other servlet.
<li class='note'>
The <l>X-Response-Headers</l> header can be used to
pass through header values into the response.
The value should be a URL-encoded map of key-value
pairs.
diff --git
a/juneau-doc/docs/Topics/11.juneau-rest-mock/01.jrm.MockRestClient.html
b/juneau-doc/docs/Topics/11.juneau-rest-mock/01.jrm.MockRestClient.html
index 302c95919..1e39c5db1 100644
--- a/juneau-doc/docs/Topics/11.juneau-rest-mock/01.jrm.MockRestClient.html
+++ b/juneau-doc/docs/Topics/11.juneau-rest-mock/01.jrm.MockRestClient.html
@@ -147,7 +147,7 @@
<hr>
<p>
The {@link oajr.mock.MockRestRequest} object has convenience
methods provided to allow you to set properties
- directly on the underlying {@link
javax.servlet.http.HttpServletRequest} object. The following example shows how
+ directly on the underlying {@link
jakarta.servlet.http.HttpServletRequest} object. The following example shows
how
this can be used to directly set roles on the request object to
perform security testing.
</p>
<h5 class='figure'>Example:</h5>
diff --git a/juneau-env.sh b/juneau-env.sh
index 9def82841..923e2b85f 100755
--- a/juneau-env.sh
+++ b/juneau-env.sh
@@ -14,7 +14,7 @@
. ~/.profile
set -e
export JUNEAU_VERSION=9.0.0
-export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-14.jdk/Contents/Home
+export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-18.jdk/Contents/Home
export PATH=$JAVA_HOME/bin:$PATH
export PATH=/opt/homebrew/bin:$PATH
export GPG_TTY=$(tty)
