From 8ff12066d644160d36028386d85e5cf94456a2ef Mon Sep 17 00:00:00 2001 From: Manfred Riem Date: Sat, 12 Aug 2023 10:09:13 -0500 Subject: [PATCH] Fixes #3507 - Change assertion JavaDoc tags to use jakarta.assertion format (#3516) --- .../piranha/core/impl/DefaultJspManager.java | 2 +- .../core/impl/DefaultWebApplicationTest.java | 2 +- .../core/tests/RequestDispatcherTest.java | 24 +++++++++---------- .../extension/wasp/WaspJspManager.java | 2 +- .../extension/wasp/JspDescriptorTest.java | 2 +- pom.xml | 6 ++--- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/core/impl/src/main/java/cloud/piranha/core/impl/DefaultJspManager.java b/core/impl/src/main/java/cloud/piranha/core/impl/DefaultJspManager.java index a684c7f45a..60949d01b0 100644 --- a/core/impl/src/main/java/cloud/piranha/core/impl/DefaultJspManager.java +++ b/core/impl/src/main/java/cloud/piranha/core/impl/DefaultJspManager.java @@ -35,7 +35,7 @@ /** * The default JspManager. * - * @assertion Servlet:JAVADOC:690 + * @jakarta.assertion Servlet:JAVADOC:690 * @author Manfred Riem (mriem@manorrock.com) */ public class DefaultJspManager implements JspManager { diff --git a/core/impl/src/test/java/cloud/piranha/core/impl/DefaultWebApplicationTest.java b/core/impl/src/test/java/cloud/piranha/core/impl/DefaultWebApplicationTest.java index 42c63c892f..fdc013ce7a 100644 --- a/core/impl/src/test/java/cloud/piranha/core/impl/DefaultWebApplicationTest.java +++ b/core/impl/src/test/java/cloud/piranha/core/impl/DefaultWebApplicationTest.java @@ -1041,7 +1041,7 @@ void testGetInitializers() { /** * Test getJspConfigDescriptor method. * - * @assertion Servlet:JAVADOC:690 + * @jaarta.assertion Servlet:JAVADOC:690 */ @Test void testGetJspConfigDescriptor() { diff --git a/core/tests/src/main/java/cloud/piranha/core/tests/RequestDispatcherTest.java b/core/tests/src/main/java/cloud/piranha/core/tests/RequestDispatcherTest.java index 79f93849c0..334eac3b5e 100644 --- a/core/tests/src/main/java/cloud/piranha/core/tests/RequestDispatcherTest.java +++ b/core/tests/src/main/java/cloud/piranha/core/tests/RequestDispatcherTest.java @@ -88,12 +88,12 @@ public RequestDispatcherTest() { /** * Test forward method on a named RequestDispatcher. * - * @assertion Servlet:SPEC:181 - * @assertion Servlet:SPEC:181.1 - * @assertion Servlet:SPEC:181.2 - * @assertion Servlet:SPEC:181.3 - * @assertion Servlet:SPEC:181.4 - * @assertion Servlet:SPEC:181.5 + * @jakarta.assertion Servlet:SPEC:181 + * @jakarta.assertion Servlet:SPEC:181.1 + * @jakarta.assertion Servlet:SPEC:181.2 + * @jakarta.assertion Servlet:SPEC:181.3 + * @jakarta.assertion Servlet:SPEC:181.4 + * @jakarta.assertion Servlet:SPEC:181.5 * @throws Exception when a serious error occurs. */ @Test @@ -142,7 +142,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t /** * Test forward method on a named RequestDispatcher. * - * @assertion Servlet:SPEC:79 + * @jakarta.assertion Servlet:SPEC:79 * @throws Exception when a serious error occurs. */ @Test @@ -174,7 +174,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t /** * Test forward method on a named RequestDispatcher. * - * @assertion Servlet:SPEC:80 + * @jakarta.assertion Servlet:SPEC:80 * @throws Exception when a serious error occurs. */ @Test @@ -237,7 +237,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t /** * Test include method on a named RequestDispatcher. * - * @assertion Servlet:SPEC:192.1 + * @jakarta.assertion Servlet:SPEC:192.1 * @throws Exception when a serious error occurs. */ @Test @@ -275,7 +275,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t /** * Test include method on a named RequestDispatcher. * - * @assertion Servlet:SPEC:192.2 + * @jakarta.assertion Servlet:SPEC:192.2 * @throws Exception when a serious error occurs. */ @Test @@ -315,8 +315,8 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t /** * Test include method on a named RequestDispatcher. * - * @assertion Servlet:SPEC:192.3 - * @assertion Servlet:SPEC:192.4 + * @jakarta.assertion Servlet:SPEC:192.3 + * @jakarta.assertion Servlet:SPEC:192.4 * @throws Exception when a serious error occurs. */ @Test diff --git a/extension/wasp/src/main/java/cloud/piranha/extension/wasp/WaspJspManager.java b/extension/wasp/src/main/java/cloud/piranha/extension/wasp/WaspJspManager.java index 94af714968..3d4332f0e1 100644 --- a/extension/wasp/src/main/java/cloud/piranha/extension/wasp/WaspJspManager.java +++ b/extension/wasp/src/main/java/cloud/piranha/extension/wasp/WaspJspManager.java @@ -36,7 +36,7 @@ /** * The WaSP manager delivered by the Jasper integration. * - * @assertion Servlet:JAVADOC:690 + * @jakarta.assertion Servlet:JAVADOC:690 * @author Manfred Riem (mriem@manorrock.com) */ public class WaspJspManager implements JspManager { diff --git a/extension/wasp/src/test/java/cloud/piranha/extension/wasp/JspDescriptorTest.java b/extension/wasp/src/test/java/cloud/piranha/extension/wasp/JspDescriptorTest.java index 42ab311b0b..deb437e4a4 100644 --- a/extension/wasp/src/test/java/cloud/piranha/extension/wasp/JspDescriptorTest.java +++ b/extension/wasp/src/test/java/cloud/piranha/extension/wasp/JspDescriptorTest.java @@ -44,7 +44,7 @@ class JspDescriptorTest { /** * Test getJspDescriptor method. * - * @assertion Servlet:JAVADOC:690 + * @jakarta.assertion Servlet:JAVADOC:690 * @throws Exception when a serious error occurs. */ @Test diff --git a/pom.xml b/pom.xml index c50697b905..996261e1ab 100644 --- a/pom.xml +++ b/pom.xml @@ -147,8 +147,8 @@ 1.5.3 3.3.1 3.5.0 - - 4.0.0-M9 + + 4.0.0-M3 3.2.1 3.1.2 @@ -923,7 +923,7 @@ true - assertion + jakarta.assertion a Assertion: