diff --git a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedJMSResource.java b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedJMSResource.java
index 7d5d3f0397..525657bb41 100644
--- a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedJMSResource.java
+++ b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedJMSResource.java
@@ -213,7 +213,7 @@ public class EmbeddedJMSResource extends ExternalResource {
 
    /**
     * Start the embedded EmbeddedJMSResource.
-    * <p/>
+    * <p>
     * The server will normally be started by JUnit using the before() method.  This method allows the server to
     * be started manually to support advanced testing scenarios.
     */
@@ -228,7 +228,7 @@ public class EmbeddedJMSResource extends ExternalResource {
 
    /**
     * Stop the embedded ActiveMQ broker, blocking until the broker has stopped.
-    * <p/>
+    * <p>
     * The broker will normally be stopped by JUnit using the after() method.  This method allows the broker to
     * be stopped manually to support advanced testing scenarios.
     */
@@ -250,7 +250,7 @@ public class EmbeddedJMSResource extends ExternalResource {
 
    /**
     * Start the embedded ActiveMQ Broker
-    * <p/>
+    * <p>
     * Invoked by JUnit to setup the resource
     */
    @Override
@@ -264,7 +264,7 @@ public class EmbeddedJMSResource extends ExternalResource {
 
    /**
     * Stop the embedded ActiveMQ Broker
-    * <p/>
+    * <p>
     * Invoked by JUnit to tear down the resource
     */
    @Override
@@ -278,7 +278,7 @@ public class EmbeddedJMSResource extends ExternalResource {
 
    /**
     * Get the EmbeddedJMS server.
-    * <p/>
+    * <p>
     * This may be required for advanced configuration of the EmbeddedJMS server.
     *
     * @return
@@ -323,7 +323,7 @@ public class EmbeddedJMSResource extends ExternalResource {
 
    /**
     * Get the Queue corresponding to a JMS Destination.
-    * <p/>
+    * <p>
     * The full name of the JMS destination including the prefix should be provided - i.e. queue://myQueue
     * or topic://myTopic.  If the destination type prefix is not included in the destination name, a prefix
     * of "queue://" is assumed.
@@ -359,7 +359,7 @@ public class EmbeddedJMSResource extends ExternalResource {
 
    /**
     * Get the Queues corresponding to a JMS Topic.
-    * <p/>
+    * <p>
     * The full name of the JMS Topic including the prefix should be provided - i.e. topic://myTopic.  If the destination type prefix
     * is not included in the destination name, a prefix of "topic://" is assumed.
     *
@@ -391,7 +391,7 @@ public class EmbeddedJMSResource extends ExternalResource {
 
    /**
     * Get the number of messages in a specific JMS Destination.
-    * <p/>
+    * <p>
     * The full name of the JMS destination including the prefix should be provided - i.e. queue://myQueue
     * or topic://myTopic.  If the destination type prefix is not included in the destination name, a prefix
     * of "queue://" is assumed.
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/TextFileCertificateLoginModule.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/TextFileCertificateLoginModule.java
index 478bbf748f..ca103cd156 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/TextFileCertificateLoginModule.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/TextFileCertificateLoginModule.java
@@ -27,8 +27,8 @@ import java.util.Set;
 /**
  * A LoginModule allowing for SSL certificate based authentication based on
  * Distinguished Names (DN) stored in text files. The DNs are parsed using a
- * Properties class where each line is <user_name>=<user_DN>. This class also
- * uses a group definition file where each line is <role_name>=<user_name_1>,<user_name_2>,etc.
+ * Properties class where each line is &lt;user_name&gt;=&lt;user_DN&gt;. This class also
+ * uses a group definition file where each line is &lt;role_name&gt;=&lt;user_name_1&gt;,&lt;user_name_2&gt;,etc.
  * The user and role files' locations must be specified in the
  * org.apache.activemq.jaas.textfiledn.user and
  * org.apache.activemq.jaas.textfiledn.role properties respectively. NOTE: This