Fixes #3827 - Remove jakarta.assertion JavaDoc tag (#3828)

piranhacloud · Jul 29, 2024 · 4a61b6e · 4a61b6e
1 parent c5dbafb
commit 4a61b6e
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 23 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
@@ -35,7 +35,6 @@
 /**
  * The default JspManager.
  *
- * @jakarta.assertion Servlet:JAVADOC:690
  * @author Manfred Riem ([email protected])
  */
 public class DefaultJspManager implements JspManager {

diff --git a/core/impl/src/test/java/cloud/piranha/core/impl/RequestDispatcherTest.java b/core/impl/src/test/java/cloud/piranha/core/impl/RequestDispatcherTest.java
@@ -63,12 +63,12 @@ class RequestDispatcherTest {
     /**
      * Test forward method with a named RequestDispatcher.
      *
-     * @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
+     * <p>
+     *  This test validates Servlet:SPEC:181, Servlet:SPEC:181.1, 
+     *  Servlet:SPEC:181.2, Servlet:SPEC:181.3, Servlet:SPEC:181.4 and
+     *  Servlet:SPEC:181.5
+     * </p>
+     * 
      * @throws Exception when a serious error occurs.
      */
     @Test
@@ -122,7 +122,10 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
     /**
      * Test forward method on a named RequestDispatcher.
      *
-     * @jakarta.assertion Servlet:SPEC:79
+     * <p>
+     *  This test validates Servlet:SPEC:79
+     * </p>
+     * 
      * @throws Exception when a serious error occurs.
      */
     @Test
@@ -160,7 +163,10 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
     /**
      * Test forward method on a named RequestDispatcher.
      *
-     * @jakarta.assertion Servlet:SPEC:80
+     * <p>
+     *  This test validates Servlet:SPEC:80
+     * </p>
+     * 
      * @throws Exception when a serious error occurs.
      */
     @Test
@@ -236,7 +242,10 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
     /**
      * Test include method on a named RequestDispatcher.
      *
-     * @jakarta.assertion Servlet:SPEC:192.1
+     * <p>
+     *  This test validates Servlet:SPEC:192.1
+     * </p>
+     * 
      * @throws Exception when a serious error occurs.
      */
     @Test
@@ -654,8 +663,10 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
      * Test include method using named RequestDispatcher and validate it throws
      * an IllegalStateException when the response is already committed.
      *
-     * @jakarta.assertion Servlet:SPEC:192.3
-     * @jakarta.assertion Servlet:SPEC:192.4
+     * <p>
+     *  This test validates Servlet:SPEC:192.3 and Servlet:SPEC:192.4
+     * </p>
+     * 
      * @throws Exception when a serious error occurs.
      */
     @Test
@@ -697,7 +708,10 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
      * size to validate the response was committed after buffer overflow
      * happened.
      *
-     * @jakarta.assertion Servlet:SPEC:192.2
+     * <p>
+     *  This test validates Servlet:SPEC:192.2
+     * </p>
+     * 
      * @throws Exception when a serious error occurs.
      */
     @Test

diff --git a/extension/eclipse-wasp/src/main/java/cloud/piranha/extension/wasp/WaspJspManager.java b/extension/eclipse-wasp/src/main/java/cloud/piranha/extension/wasp/WaspJspManager.java
@@ -35,8 +35,7 @@
 
 /**
  * The WaSP manager delivered by the Jasper integration.
- *
- * @jakarta.assertion Servlet:JAVADOC:690
+ * 
  * @author Manfred Riem ([email protected])
  */
 public class WaspJspManager implements JspManager {

diff --git a/extension/eclipse-wasp/src/test/java/cloud/piranha/extension/wasp/JspDescriptorTest.java b/extension/eclipse-wasp/src/test/java/cloud/piranha/extension/wasp/JspDescriptorTest.java
@@ -44,7 +44,10 @@ class JspDescriptorTest {
     /**
      * Test getJspDescriptor method.
      *
-     * @jakarta.assertion Servlet:JAVADOC:690
+     * <p>
+     *  This test validates Servlet:JAVADOC:690.
+     * </p>
+     * 
      * @throws Exception when a serious error occurs.
      */
     @Test

diff --git a/pom.xml b/pom.xml
@@ -582,13 +582,6 @@
                         <configuration>
                             <additionalOptions>-html5</additionalOptions>
                             <docfilessubdirs>true</docfilessubdirs>
-                            <tags>
-                                <tag>
-                                    <name>jakarta.assertion</name>
-                                    <placement>a</placement>
-                                    <head>Assertion: </head>
-                                </tag>
-                            </tags>
                         </configuration>
                     </execution>
                 </executions>