Merge pull request #23256 from smillidge/update-jsp-api
Update JSP and JSTL to final api and impl
diff --git a/appserver/admingui/cluster/src/main/help/en/help/aseeacohclust.html b/appserver/admingui/cluster/src/main/help/en/help/aseeacohclust.html
index 7f1a5e8..b5fe50e 100644
--- a/appserver/admingui/cluster/src/main/help/en/help/aseeacohclust.html
+++ b/appserver/admingui/cluster/src/main/help/en/help/aseeacohclust.html
@@ -1,6 +1,6 @@
<!--
- Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,7 +16,7 @@
-->
-<h1>GlassFish Server 3.1 Administration Console Clustering Online Help</h1>
+<h1>Eclipse GlassFish Server 6.0 Administration Console Clustering Online Help</h1>
-<small>Copyright © 2005, 2017, Oracle and/or its affiliates. All rights reserved. <a href="docinfo.html">Legal Notices</a></small>
+<small>Copyright © 2005, 2020, Oracle and/or its affiliates. All rights reserved. <a href="docinfo.html">Legal Notices</a></small>
diff --git a/appserver/admingui/cluster/src/main/help/en/help/docinfo.html b/appserver/admingui/cluster/src/main/help/en/help/docinfo.html
index d8f3007..a058cd6 100644
--- a/appserver/admingui/cluster/src/main/help/en/help/docinfo.html
+++ b/appserver/admingui/cluster/src/main/help/en/help/docinfo.html
@@ -1,6 +1,6 @@
<!--
- Copyright (c) 2005, 2019 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -16,18 +16,18 @@
-->
-<h4>GlassFish Server Open Source Edition 5.1</h4>
+<h4>Eclipse GlassFish Server 6.0</h4>
<p><a name="BEGIN" id="BEGIN"></a></p>
<p>Clustering Online Help</p>
<p></p>
-<p>August 2017</p>
+<p>October 2020</p>
<p>This document provides the reference and task online help topics for the cluster module of the GlassFish Server Administration Console.</p>
<p><a id="sthref1" name="sthref1"></a></p>
<hr />
-<p>GlassFish Server Open Source Edition 5.1 Clustering Online Help</p>
+<p>Eclipse GlassFish Server 6.0 Clustering Online Help</p>
-<p>Copyright © 2010, 2019 Oracle and/or its affiliates. All rights reserved.</p>
+<p>Copyright © 2010, 2020 Oracle and/or its affiliates. All rights reserved.</p>
<p>This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at http://www.eclipse.org/legal/epl-2.0.</p>
diff --git a/appserver/admingui/cluster/src/main/help/en/help/idx-1.html b/appserver/admingui/cluster/src/main/help/en/help/idx-1.html
index 5664f5c..d070fc6 100644
--- a/appserver/admingui/cluster/src/main/help/en/help/idx-1.html
+++ b/appserver/admingui/cluster/src/main/help/en/help/idx-1.html
@@ -1,6 +1,6 @@
<!--
- Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -191,4 +191,4 @@
</dl>
</div>
-<small>Copyright © 2005, 2017, Oracle and/or its affiliates. All rights reserved. <a href="docinfo.html">Legal Notices</a></small>
+<small>Copyright © 2005, 2020, Oracle and/or its affiliates. All rights reserved. <a href="docinfo.html">Legal Notices</a></small>
diff --git a/appserver/admingui/cluster/src/main/help/en/help/idx-2.html b/appserver/admingui/cluster/src/main/help/en/help/idx-2.html
index 5947e4f..df0ef3e 100644
--- a/appserver/admingui/cluster/src/main/help/en/help/idx-2.html
+++ b/appserver/admingui/cluster/src/main/help/en/help/idx-2.html
@@ -1,6 +1,6 @@
<!--
- Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -259,4 +259,4 @@
</dl>
</div>
-<small>Copyright © 2005, 2017, Oracle and/or its affiliates. All rights reserved. <a href="docinfo.html">Legal Notices</a></small>
+<small>Copyright © 2005, 2020, Oracle and/or its affiliates. All rights reserved. <a href="docinfo.html">Legal Notices</a></small>
diff --git a/appserver/admingui/cluster/src/main/help/en/help/idx-3.html b/appserver/admingui/cluster/src/main/help/en/help/idx-3.html
index 4d50ccd..7973ddc 100644
--- a/appserver/admingui/cluster/src/main/help/en/help/idx-3.html
+++ b/appserver/admingui/cluster/src/main/help/en/help/idx-3.html
@@ -1,6 +1,6 @@
<!--
- Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -55,4 +55,4 @@
</dl>
</div>
-<small>Copyright © 2005, 2017, Oracle and/or its affiliates. All rights reserved. <a href="docinfo.html">Legal Notices</a></small>
+<small>Copyright © 2005, 2020, Oracle and/or its affiliates. All rights reserved. <a href="docinfo.html">Legal Notices</a></small>
diff --git a/appserver/admingui/cluster/src/main/help/en/help/ref-availabilityservice.html b/appserver/admingui/cluster/src/main/help/en/help/ref-availabilityservice.html
index 245350f..d0c558d 100644
--- a/appserver/admingui/cluster/src/main/help/en/help/ref-availabilityservice.html
+++ b/appserver/admingui/cluster/src/main/help/en/help/ref-availabilityservice.html
@@ -1,6 +1,6 @@
<!--
- Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -73,4 +73,4 @@
-<small>Copyright © 2005, 2017, Oracle and/or its affiliates. All rights reserved. <a href="docinfo.html">Legal Notices</a></small>
+<small>Copyright © 2005, 2020, Oracle and/or its affiliates. All rights reserved. <a href="docinfo.html">Legal Notices</a></small>
diff --git a/appserver/admingui/cluster/src/main/help/en/help/ref-clusterapplications.html b/appserver/admingui/cluster/src/main/help/en/help/ref-clusterapplications.html
index 814ba9f..f8531de 100644
--- a/appserver/admingui/cluster/src/main/help/en/help/ref-clusterapplications.html
+++ b/appserver/admingui/cluster/src/main/help/en/help/ref-clusterapplications.html
@@ -1,6 +1,6 @@
<!--
- Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -35,7 +35,7 @@
<dt>Name</dt>
<dd>
<p>The application name.</p>
-<p>The name can include an optional version identifier, which follows the name and is separated from the name by a colon (<code>:</code>). For more information about module and application versions, see <a href="http://www.oracle.com/pls/topic/lookup?ctx=E26576_01&id=GSDPG00324"><i>Module and Application Versions</i> in <i>Oracle GlassFish Server Application Deployment Guide</i></a>.</p>
+<p>The name can include an optional version identifier, which follows the name and is separated from the name by a colon (<code>:</code>). For more information about module and application versions, see <a href="https://eclipse-ee4j.github.io/glassfish/docs/latest/application-deployment-guide/overview.html#GSDPG00324"><i>Module and Application Versions</i> in <i>Oracle GlassFish Server Application Deployment Guide</i></a>.</p>
</dd>
<dt>Enabled</dt>
<dd>
@@ -156,24 +156,24 @@
<h5>Equivalent asadmin Subcommands</h5>
<ul>
<li>
-<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=E26576_01&id=GSRFM00114"><code>deploy</code>(1)</a></p>
+<p><a href="https://eclipse-ee4j.github.io/glassfish/docs/latest/reference-manual/deploy.html#GSRFM00114"><code>deploy</code>(1)</a></p>
</li>
<li>
-<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=E26576_01&id=GSRFM00116"><code>disable</code>(1)</a></p>
+<p><a href="https://eclipse-ee4j.github.io/glassfish/docs/latest/reference-manual/disable.html#GSRFM00116"><code>disable</code>(1)</a></p>
</li>
<li>
-<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=E26576_01&id=GSRFM00118"><code>disable-http-lb-application</code>(1)</a></p>
+<p><a href="https://eclipse-ee4j.github.io/glassfish/docs/latest/reference-manual/disable-http-lb-application.html#GSRFM00118"><code>disable-http-lb-application</code>(1)</a></p>
</li>
<li>
-<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=E26576_01&id=GSRFM00124"><code>enable</code>(1)</a></p>
+<p><a href="https://eclipse-ee4j.github.io/glassfish/docs/latest/reference-manual/enable.html#GSRFM00124"><code>enable</code>(1)</a></p>
</li>
<li>
-<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=E26576_01&id=GSRFM00126"><code>enable-http-lb-application</code>(1)</a></p>
+<p><a href="https://eclipse-ee4j.github.io/glassfish/docs/latest/reference-manual/enable-http-lb-application.html#GSRFM00126"><code>enable-http-lb-application</code>(1)</a></p>
</li>
<li>
-<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=E26576_01&id=GSRFM00148"><code>list-applications</code>(1)</a></p>
+<p><a href="https://eclipse-ee4j.github.io/glassfish/docs/latest/reference-manual/list-applications.html#GSRFM00148"><code>list-applications</code>(1)</a></p>
</li>
</ul>
-<small>Copyright © 2005, 2017, Oracle and/or its affiliates. All rights reserved. <a href="docinfo.html">Legal Notices</a></small>
+<small>Copyright © 2005, 2020, Oracle and/or its affiliates. All rights reserved. <a href="docinfo.html">Legal Notices</a></small>
diff --git a/appserver/admingui/cluster/src/main/help/en/help/ref-clustergeneral.html b/appserver/admingui/cluster/src/main/help/en/help/ref-clustergeneral.html
index e5f60d1..2400d40 100644
--- a/appserver/admingui/cluster/src/main/help/en/help/ref-clustergeneral.html
+++ b/appserver/admingui/cluster/src/main/help/en/help/ref-clustergeneral.html
@@ -1,6 +1,6 @@
<!--
- Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -88,15 +88,15 @@
<h5>Equivalent asadmin Subcommands</h5>
<ul>
<li>
-<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=E26576_01&id=GSRFM00138"><code>generate-jvm-report</code>(1)</a></p>
+<p><a href="https://eclipse-ee4j.github.io/glassfish/docs/latest/reference-manual/generate-jvm-report.html#GSRFM00138"><code>generate-jvm-report</code>(1)</a></p>
</li>
<li>
-<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=E26576_01&id=GSRFM00211"><code>migrate-timers</code>(1)</a></p>
+<p><a href="https://eclipse-ee4j.github.io/glassfish/docs/latest/reference-manual/migrate-timers.html#GSRFM00211"><code>migrate-timers</code>(1)</a></p>
</li>
<li>
-<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=E26576_01&id=GSRFM00224"><code>rotate-log</code>(1)</a></p>
+<p><a href="https://eclipse-ee4j.github.io/glassfish/docs/latest/reference-manual/rotate-log.html#GSRFM00224"><code>rotate-log</code>(1)</a></p>
</li>
</ul>
-<small>Copyright © 2005, 2017, Oracle and/or its affiliates. All rights reserved. <a href="docinfo.html">Legal Notices</a></small>
+<small>Copyright © 2005, 2020, Oracle and/or its affiliates. All rights reserved. <a href="docinfo.html">Legal Notices</a></small>
diff --git a/appserver/admingui/cluster/src/main/help/en/help/ref-clusterinstanceconfigproperties.html b/appserver/admingui/cluster/src/main/help/en/help/ref-clusterinstanceconfigproperties.html
index 56ed733..8f2526c 100644
--- a/appserver/admingui/cluster/src/main/help/en/help/ref-clusterinstanceconfigproperties.html
+++ b/appserver/admingui/cluster/src/main/help/en/help/ref-clusterinstanceconfigproperties.html
@@ -1,6 +1,6 @@
<!--
- Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -64,15 +64,15 @@
<h5>Equivalent asadmin Subcommands</h5>
<ul>
<li>
-<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=E26576_01&id=GSRFM00059"><code>create-system-properties</code>(1)</a></p>
+<p><a href="https://eclipse-ee4j.github.io/glassfish/docs/latest/reference-manual/create-system-properties.html#GSRFM00059"><code>create-system-properties</code>(1)</a></p>
</li>
<li>
-<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=E26576_01&id=GSRFM00110"><code>delete-system-property</code>(1)</a></p>
+<p><a href="https://eclipse-ee4j.github.io/glassfish/docs/latest/reference-manual/delete-system-property.html#GSRFM00110"><code>delete-system-property</code>(1)</a></p>
</li>
<li>
-<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=E26576_01&id=GSRFM00203"><code>list-system-properties</code>(1)</a></p>
+<p><a href="https://eclipse-ee4j.github.io/glassfish/docs/latest/reference-manual/list-system-properties.html#GSRFM00203"><code>list-system-properties</code>(1)</a></p>
</li>
</ul>
-<small>Copyright © 2005, 2017, Oracle and/or its affiliates. All rights reserved. <a href="docinfo.html">Legal Notices</a></small>
+<small>Copyright © 2005, 2020, Oracle and/or its affiliates. All rights reserved. <a href="docinfo.html">Legal Notices</a></small>
diff --git a/appserver/admingui/cluster/src/main/help/en/help/ref-clusterinstanceedit.html b/appserver/admingui/cluster/src/main/help/en/help/ref-clusterinstanceedit.html
index c466bf5..8b4881b 100644
--- a/appserver/admingui/cluster/src/main/help/en/help/ref-clusterinstanceedit.html
+++ b/appserver/admingui/cluster/src/main/help/en/help/ref-clusterinstanceedit.html
@@ -1,6 +1,6 @@
<!--
- Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -119,18 +119,18 @@
<h5>Equivalent asadmin Subcommands</h5>
<ul>
<li>
-<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=E26576_01&id=GSRFM00138"><code>generate-jvm-report</code>(1)</a></p>
+<p><a href="https://eclipse-ee4j.github.io/glassfish/docs/latest/reference-manual/generate-jvm-report.html#GSRFM00138"><code>generate-jvm-report</code>(1)</a></p>
</li>
<li>
-<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=E26576_01&id=GSRFM00219"><code>restart-instance</code>(1)</a></p>
+<p><a href="https://eclipse-ee4j.github.io/glassfish/docs/latest/reference-manual/restart-instance.html#GSRFM00219"><code>restart-instance</code>(1)</a></p>
</li>
<li>
-<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=E26576_01&id=GSRFM00236"><code>start-instance</code>(1)</a></p>
+<p><a href="https://eclipse-ee4j.github.io/glassfish/docs/latest/reference-manual/start-instance.html#GSRFM00236"><code>start-instance</code>(1)</a></p>
</li>
<li>
-<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=E26576_01&id=GSRFM00241"><code>stop-instance</code>(1)</a></p>
+<p><a href="https://eclipse-ee4j.github.io/glassfish/docs/latest/reference-manual/stop-instance.html#GSRFM00241"><code>stop-instance</code>(1)</a></p>
</li>
</ul>
-<small>Copyright © 2005, 2017, Oracle and/or its affiliates. All rights reserved. <a href="docinfo.html">Legal Notices</a></small>
+<small>Copyright © 2005, 2020, Oracle and/or its affiliates. All rights reserved. <a href="docinfo.html">Legal Notices</a></small>
diff --git a/appserver/admingui/cluster/src/main/help/en/help/ref-clusterinstancenew.html b/appserver/admingui/cluster/src/main/help/en/help/ref-clusterinstancenew.html
index d9efaf5..31d6fad 100644
--- a/appserver/admingui/cluster/src/main/help/en/help/ref-clusterinstancenew.html
+++ b/appserver/admingui/cluster/src/main/help/en/help/ref-clusterinstancenew.html
@@ -1,6 +1,6 @@
<!--
- Copyright (c) 2005, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -79,7 +79,7 @@
<p><a href="task-create-clustered-instance.html">To Add a GlassFish Server Instance to a Cluster</a></p>
<a id="sthref274" name="sthref274"></a>
<h5>Equivalent asadmin Subcommands</h5>
-<p><a href="http://www.oracle.com/pls/topic/lookup?ctx=E26576_01&id=GSRFM00033"><code>create-instance</code>(1)</a></p>
+<p><a href="https://eclipse-ee4j.github.io/glassfish/docs/latest/reference-manual/create-instance.html#GSRFM00033"><code>create-instance</code>(1)</a></p>
-<small>Copyright © 2005, 2017, Oracle and/or its affiliates. All rights reserved. <a href="docinfo.html">Legal Notices</a></small>
+<small>Copyright © 2005, 2020, Oracle and/or its affiliates. All rights reserved. <a href="docinfo.html">Legal Notices</a></small>
diff --git a/appserver/pom.xml b/appserver/pom.xml
index 4c8e922..a067bd0 100644
--- a/appserver/pom.xml
+++ b/appserver/pom.xml
@@ -110,7 +110,7 @@
<jakarta.interceptor-api.version>2.0.0</jakarta.interceptor-api.version>
<!-- Jakarta EE Security + Authentication/Authorization -->
- <jakarta.security.enterprise-api.version>2.0.0-RC2</jakarta.security.enterprise-api.version>
+ <jakarta.security.enterprise-api.version>2.0.0</jakarta.security.enterprise-api.version>
<jakarta.authorization-api.version>2.0.0</jakarta.authorization-api.version>
<jakarta.authentication-api.version>2.0.0</jakarta.authentication-api.version>
<soteria.version>2.0.0-M3</soteria.version>
