Fixes #3507 - Change assertion JavaDoc tags to use jakarta.assertion …

…format (#3516)
piranhacloud · Aug 12, 2023 · 8ff1206 · 8ff1206
1 parent 63807dd
commit 8ff1206
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 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
@@ -35,7 +35,7 @@
 /**
  * The default JspManager.
  *
- * @assertion Servlet:JAVADOC:690
+ * @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/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
@@ -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
@@ -36,7 +36,7 @@
 /**
  * The WaSP manager delivered by the Jasper integration.
  *
- * @assertion Servlet:JAVADOC:690
+ * @jakarta.assertion Servlet:JAVADOC:690
  * @author Manfred Riem ([email protected])
  */
 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
@@ -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
@@ -147,8 +147,8 @@
         <maven-replacer-plugin.version>1.5.3</maven-replacer-plugin.version>
         <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
         <maven-shade-plugin.version>3.5.0</maven-shade-plugin.version>
-        <!-- Kept at 4.0.0-M3 because 4.0.0-M[4-8] do not work -->
-        <maven-site-plugin.version>4.0.0-M9</maven-site-plugin.version>
+        <!-- Kept at 4.0.0-M3 because 4.0.0-M[4-9] do not work -->
+        <maven-site-plugin.version>4.0.0-M3</maven-site-plugin.version>
         <!-- Kept at 3.2.1 as 3.3.0 does not work -->
         <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
         <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
@@ -923,7 +923,7 @@
                             <docfilessubdirs>true</docfilessubdirs>
                             <tags>
                                 <tag>
-                                    <name>assertion</name>
+                                    <name>jakarta.assertion</name>
                                     <placement>a</placement>
                                     <head>Assertion: </head>
                                 </tag>