This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch OAK-11650
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/OAK-11650 by this push:
     new 4c42382231 OAK-11650: Fix Javadoc errors - </p>
4c42382231 is described below

commit 4c42382231600bccfa3230f12f5ebb79642dec6a
Author: Julian Reschke <[email protected]>
AuthorDate: Thu Apr 17 10:09:20 2025 +0100

    OAK-11650: Fix Javadoc errors - </p>
---
 .../external/basic/DefaultSyncConfig.java          |  4 ++--
 .../external/impl/jmx/SynchronizationMBean.java    |  2 +-
 .../suites/ScalabilityNodeRelationshipSuite.java   |  1 -
 .../jackrabbit/oak/benchmark/AbstractTest.java     | 12 +++--------
 .../commons/concurrent/NotifyingFutureTask.java    |  3 +--
 .../apache/jackrabbit/oak/commons/jmx/JmxUtil.java |  2 +-
 .../org/apache/jackrabbit/oak/spi/mount/Mount.java |  8 ++++----
 .../oak/spi/mount/MountInfoProvider.java           |  2 +-
 .../main/java/org/apache/jackrabbit/oak/Oak.java   |  4 ----
 .../oak/plugins/atomic/AtomicCounterEditor.java    | 10 +++-------
 .../atomic/AtomicCounterEditorProvider.java        |  6 ++----
 .../jackrabbit/oak/plugins/cow/COWNodeStore.java   |  8 ++++----
 .../oak/plugins/index/IndexEditorProvider.java     |  4 +---
 .../jackrabbit/oak/plugins/index/IndexUpdate.java  |  4 ----
 .../jackrabbit/oak/plugins/index/MetricsUtils.java |  3 +--
 .../strategy/UniqueEntryStoreStrategy.java         |  2 +-
 .../oak/plugins/nodetype/TypeEditor.java           |  4 ++--
 .../org/apache/jackrabbit/oak/query/Query.java     |  4 +---
 .../oak/query/ast/AstElementFactory.java           |  3 +--
 .../authorization/restriction/GlobsPattern.java    |  6 +++---
 .../authorization/restriction/PrefixPattern.java   |  2 +-
 .../user/autosave/AutoSaveEnabledManager.java      |  2 +-
 .../strategy/ContentMirrorStoreStrategyTest.java   |  1 -
 .../jackrabbit/oak/query/AbstractQueryTest.java    |  1 -
 .../security/JackrabbitAccessControlManager.java   | 12 +++++------
 .../security/authorization/PrincipalSetPolicy.java |  2 +-
 .../authorization/PrivilegeCollection.java         |  2 +-
 .../java/org/apache/jackrabbit/oak/jcr/Jcr.java    |  4 ++--
 .../oak/jcr/CompatibilityIssuesTest.java           |  4 ++--
 .../jackrabbit/oak/jcr/DocumentClusterIT.java      |  5 +----
 .../jackrabbit/oak/jcr/LargeOperationIT.java       |  6 +++---
 .../flatfile/pipelined/PipelinedUtils.java         |  2 +-
 .../plugins/index/IndexAggregation2CommonTest.java |  6 ------
 .../accesscontrol/AccessControlConstants.java      | 23 ++++++++++------------
 .../permission/PermissionProvider.java             |  2 --
 .../oak/spi/security/user/UserConstants.java       |  2 +-
 .../security/user/action/AccessControlAction.java  |  4 ++--
 .../security/user/action/AuthorizableAction.java   |  2 +-
 .../user/action/PasswordValidationAction.java      |  2 +-
 .../jackrabbit/oak/segment/ManyChildNodesIT.java   |  2 +-
 .../oak/segment/SegmentCompactionIT.java           |  4 ++--
 .../oak/segment/SegmentOverflowExceptionIT.java    |  2 +-
 .../file/LargeNumberOfPropertiesTestIT.java        |  4 ++--
 .../segment/file/SegmentReferenceLimitTestIT.java  |  4 ++--
 .../composite/checks/MountedNodeStoreChecker.java  |  5 ++---
 .../checks/UniqueIndexNodeStoreChecker.java        |  5 ++---
 .../NonDefaultMountWriteReportingObserver.java     |  7 +++----
 .../jackrabbit/oak/composite/package-info.java     |  2 +-
 .../NodeTypeDefinitionNodeStoreCheckerTest.java    |  2 +-
 .../plugins/document/DocumentNodeStoreService.java |  1 -
 .../oak/plugins/document/NodeDocument.java         |  1 -
 .../document/mongo/MongoVersionGCSupport.java      |  2 +-
 .../document/DocumentMKBuilderProvider.java        |  6 +++---
 .../jackrabbit/oak/spi/state/Clusterable.java      | 15 +++++++-------
 54 files changed, 94 insertions(+), 144 deletions(-)

diff --git 
a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfig.java
 
b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfig.java
index b73342fc58..3b0219f339 100644
--- 
a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfig.java
+++ 
b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfig.java
@@ -417,12 +417,12 @@ public class DefaultSyncConfig {
         /**
          * <p>Returns {@code true} if external group identities are being 
synchronized into the repository as dynamic groups.
          * In this case a dedicated {@link 
org.apache.jackrabbit.oak.spi.security.user.DynamicMembershipProvider} must be 
-         * present in order to have group membership reflected through User 
Management API.</p>
+         * present in order to have group membership reflected through User 
Management API.
          * 
          * <p>Note, that currently this option only takes effect if it is 
enabled together with dynamic membership 
          * (i.e. {@link User#getDynamicMembership()} returns true). In this 
case a dedicated 
          * {@link 
org.apache.jackrabbit.oak.spi.security.user.DynamicMembershipProvider} based on 
the 
-         * {@code ExternalGroupPrincipalProvider} will be registered.</p>
+         * {@code ExternalGroupPrincipalProvider} will be registered.
          *
          * @return {@code true} if external groups should be synchronized as 
dynamic groups (i.e. without having their
          * members added); {@code false} otherwise. Note, that this option 
currently only takes effect if {@link User#getDynamicMembership()} is enabled.
diff --git 
a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynchronizationMBean.java
 
b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynchronizationMBean.java
index 19be24391e..99b90c9f71 100644
--- 
a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynchronizationMBean.java
+++ 
b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SynchronizationMBean.java
@@ -119,7 +119,7 @@ public interface SynchronizationMBean {
     /**
      * <p>Migrates all previously synchronized users to have dynamic 
membership if the {@code SyncHandler} has the dynamic 
      * membership option enabled. Otherwise this method will have no effect.
-     * </p>
+     * <p>
      * Note: calling this method will only migrate existing group membership 
information to the dynamic persistence format. 
      * It does not retrieve the latest membership information from the 
external identity provider. Membership information 
      * will therefore only be updated upon the next synchronization.
diff --git 
a/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeRelationshipSuite.java
 
b/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeRelationshipSuite.java
index fb73f4a2f6..d431983013 100644
--- 
a/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeRelationshipSuite.java
+++ 
b/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeRelationshipSuite.java
@@ -317,7 +317,6 @@ public class ScalabilityNodeRelationshipSuite extends 
ScalabilityNodeSuite {
      *                                     targetId: cUser0_5
      * }
      * </pre>
-     * </p>
      */
     class ActivityWriter extends Writer {
         private int startIdx;
diff --git 
a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java
 
b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java
index 36b264c203..b2877d5d1d 100644
--- 
a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java
+++ 
b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java
@@ -100,21 +100,17 @@ public abstract class AbstractTest<T> extends Benchmark 
implements CSVResultGene
      * <p>
      * used to signal the {@link #runTest(int)} if stop running future test 
planned or not. If set
      * to true, it will exit the loop not performing any more tests.
-     * </p>
-     * 
+     *
      * <p>
      * useful when the running of the benchmark makes sense for as long as 
other processes didn't
      * complete.
-     * </p>
-     * 
+     *
      * <p>
      * Set this variable from within the benchmark itself by using {@link 
#issueHaltRequest(String)}
-     * </p>
-     * 
+     *
      * <p>
      * <strong>it works only for concurrency level of 1 ({@code --concurrency 
1} the
      * default)</strong>
-     * </p>
      */
     private boolean haltRequested;
 
@@ -136,11 +132,9 @@ public abstract class AbstractTest<T> extends Benchmark 
implements CSVResultGene
      * <p>
      * this method will be called during the {@link #tearDown()} before the 
{@link #afterSuite()}.
      * Override it if you have background processes you wish to stop.
-     * </p>
      * <p>
      * For example in case of big imports, the suite could be keep running for 
as long as the import
      * is running, even if the tests are actually no longer executed.
-     * </p>
      */
     protected void issueHaltChildThreads() {
     }
diff --git 
a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurrent/NotifyingFutureTask.java
 
b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurrent/NotifyingFutureTask.java
index c2496f051c..cca1493566 100644
--- 
a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurrent/NotifyingFutureTask.java
+++ 
b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/concurrent/NotifyingFutureTask.java
@@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
  * listener will execute immediately.
  *
  * <p>Listener is invoked synchronously on the same thread which is used to
- * executed the Future</p>
+ * executed the Future
  */
 public class NotifyingFutureTask extends FutureTask<Void> {
     private final AtomicBoolean completed = new AtomicBoolean(false);
@@ -53,7 +53,6 @@ public class NotifyingFutureTask extends FutureTask<Void> {
      * <p>
      * Note: there is no guarantee to which handler will run when the method
      * is called multiple times with different arguments.
-     * </p>
      * @param onComplete listener to invoke upon completion
      */
     public void onComplete(Runnable onComplete) {
diff --git 
a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/JmxUtil.java 
b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/JmxUtil.java
index f3138cbfd6..f8133796a0 100644
--- 
a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/JmxUtil.java
+++ 
b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/commons/jmx/JmxUtil.java
@@ -43,7 +43,7 @@ public final class JmxUtil {
      * it would return a quoted string which is then safe to be used
      * as part of ObjectName.
      *
-     * <p>This is meant to avoid unnecessary quoting of value</p>
+     * <p>This is meant to avoid unnecessary quoting of value
      *
      * @param unquotedValue to quote if required
      * @return passed value or quoted value if required
diff --git 
a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/Mount.java 
b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/Mount.java
index 1f613f7b5b..4d29db9751 100644
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/Mount.java
+++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/Mount.java
@@ -25,7 +25,7 @@ import org.osgi.annotation.versioning.ProviderType;
  * Refers to a set of paths from a {@code ContentRepository}x that are 
possibly 
  * stored in a separate physical persistent store.
  * 
- * <p>In a default setup all paths belong to a default Mount.</p>
+ * <p>In a default setup all paths belong to a default Mount.
  */
 @ProviderType
 public interface Mount {
@@ -46,7 +46,7 @@ public interface Mount {
      * Checks whether current mount is the default mount.
      * 
      * <p>The Default mount includes the root path and all other
-     * paths which are not part of any other mount.</p>
+     * paths which are not part of any other mount.
      *
      * @return true if this mount represents the
      * default mount
@@ -97,14 +97,14 @@ public interface Mount {
     /**
      * Checks if given path belongs to this <code>Mount</code>
      *
-     * <p>A path belongs to a Mount in two scenarios:</p>
+     * <p>A path belongs to a Mount in two scenarios:
      * <ol>
      *   <li>The path is below a fragment-supported path and the path contains 
a fragment name.</li>
      *   <li>The path of this mount is the most specific ancestor for the 
specified path.</li>
      * </ol>
      * 
      * <p>The fragment check has a higher priority, and the presence of a 
fragment name in the path
-     * always decides the mount this path belongs to.</p>
+     * always decides the mount this path belongs to.
      *
      * @param path path to check
      * @return true if path belong to this mount
diff --git 
a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/MountInfoProvider.java
 
b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/MountInfoProvider.java
index e83fcbb0e5..6dbedc17a9 100644
--- 
a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/MountInfoProvider.java
+++ 
b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/MountInfoProvider.java
@@ -28,7 +28,7 @@ import org.osgi.annotation.versioning.ProviderType;
 /**
  * Holds information related to the {@link Mount}s configured in a {@code 
ContentRepository}.
  * 
- * <p>The configuration may either be trivial - only a default mount is 
configured, or defining at least one non-default mount.</p>
+ * <p>The configuration may either be trivial - only a default mount is 
configured, or defining at least one non-default mount.
  */
 @ProviderType
 public interface MountInfoProvider {
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
index d1c96fc0a9..b1eb93ec9b 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
@@ -602,12 +602,10 @@ public class Oak {
     /**
      * <p>
      * Enable the asynchronous (background) indexing behavior.
-     * </p>
      * <p>
      * Please note that when enabling the background indexer, you need to take
      * care of calling
      * <code>#shutdown</code> on the <code>executor</code> provided for this 
Oak instance.
-     * </p>
      * @deprecated Use {@link Oak#withAsyncIndexing(String, long)} instead
      */
     @Deprecated
@@ -652,12 +650,10 @@ public class Oak {
      * <p>
      * Enable the asynchronous (background) indexing behavior for the provided
      * task name.
-     * </p>
      * <p>
      * Please note that when enabling the background indexer, you need to take
      * care of calling
      * <code>#shutdown</code> on the <code>executor</code> provided for this 
Oak instance.
-     * </p>
      */
     public Oak withAsyncIndexing(@NotNull String name, long delayInSeconds) {
         if (this.asyncTasks == null) {
diff --git 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditor.java
 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditor.java
index 3397723754..47440a4df4 100644
--- 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditor.java
+++ 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditor.java
@@ -167,14 +167,12 @@ public class AtomicCounterEditor extends DefaultEditor {
      * <p>
      * Create an instance of the editor for atomic increments. It can works 
synchronously as well as
      * asynchronously. See class javadoc for details around it.
-     * </p>
      * <p>
      * If {@code instanceId} OR {@code executor} OR {@code store} OR {@code 
board} are null, the
      * editor will switch to synchronous behaviour for consolidation. If no 
{@link CommitHook} will
      * be found in the whiteboard, a {@link EmptyHook} will be provided to the 
{@link NodeStore} for
      * merging.
-     * </p>
-     * 
+     *
      * @param builder the build on which to work. Cannot be null.
      * @param instanceId the current Oak instance Id. If null editor will be 
synchronous.
      * @param executor the current Oak executor service. If null editor will 
be synchronous.
@@ -231,15 +229,13 @@ public class AtomicCounterEditor extends DefaultEditor {
      * <p>
      * consolidate the {@link #PREFIX_PROP_COUNTER} properties and sum them 
into the
      * {@link #PROP_COUNTER}
-     * </p>
-     * 
+     *
      * <p>
      * The passed in {@code NodeBuilder} must have
      * {@link org.apache.jackrabbit.JcrConstants#JCR_MIXINTYPES 
JCR_MIXINTYPES} with
      * {@link NodeTypeConstants#MIX_ATOMIC_COUNTER MIX_ATOMIC_COUNTER}.
      * If not it will be silently ignored.
-     * </p>
-     * 
+     *
      * @param builder the builder to work on. Cannot be null.
      */
     public static void consolidateCount(@NotNull final NodeBuilder builder) {
diff --git 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditorProvider.java
 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditorProvider.java
index 7018107be2..ec94551d86 100644
--- 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditorProvider.java
+++ 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditorProvider.java
@@ -105,13 +105,11 @@ public class AtomicCounterEditorProvider implements 
EditorProvider {
      * Plain Java oriented constructor. Refer to
      * {@link AtomicCounterEditor#AtomicCounterEditor(NodeBuilder, String, 
ScheduledExecutorService, NodeStore, Whiteboard)}
      * for constructions details of the actual editor.
-     * </p>
-     * 
+     *
      * <p>
      * Based on the use case this may need an already set of the constructor 
parameters during the
      * repository construction. Please ensure they're registered before this 
provider is registered.
-     * </p>
-     * 
+     *
      * @param clusterInfo cluster node information
      * @param executor the executor for running asynchronously.
      * @param store reference to the NodeStore.
diff --git 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/cow/COWNodeStore.java
 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/cow/COWNodeStore.java
index 1bbb47f190..66d4b1be9b 100644
--- 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/cow/COWNodeStore.java
+++ 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/cow/COWNodeStore.java
@@ -39,18 +39,18 @@ import java.util.concurrent.CopyOnWriteArrayList;
  * <p>The copy-on-write (COW) node store implementation allows to temporarily
  * switch the repository into the "testing" mode, in which all the changes are
  * stored in a volatile storage, namely the MemoryNodeStore. After switching
- * back to the "production" mode, the test changes should be dropped.</p>
+ * back to the "production" mode, the test changes should be dropped.
  *
  * <p>If the CoW is enabled, a special :cow=true property will be set on the
  * root node returned by getRoot(). It's being used in the merge() to decide
  * which store be modified. Removing this property will result in merging
- * changes to the main node store, even in the CoW mode.</p>
+ * changes to the main node store, even in the CoW mode.
  *
  * <p>The checkpoint support is provided by the {@link BranchNodeStore} class.
  * All the existing checkpoints are still available in the CoW mode (until they
- * expire). New checkpoints are only created in the MemoryNodeStore.</p>
+ * expire). New checkpoints are only created in the MemoryNodeStore.
  *
- * <p>Known limitations:</p>
+ * <p>Known limitations:
  *
  * <ul>
  *     <li>turning the CoW mode on and off requires cleaning up the
diff --git 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexEditorProvider.java
 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexEditorProvider.java
index 9705f8e95a..b68897fc0d 100644
--- 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexEditorProvider.java
+++ 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexEditorProvider.java
@@ -40,13 +40,11 @@ public interface IndexEditorProvider extends AutoCloseable {
      * <p>
      * The {@code definition} builder must points to the index definition
      * node under which the indexer is expected to store the index content.
-     * </p>
      *
      * <p>
      * The <code>callback</code> instance may be of type {@link 
ContextAwareCallback}
      * and that can be used to access {@link IndexingContext}
-     * </p>
-     * 
+     *
      * @param type  index type
      * @param definition index definition node builder, used for updates
      * @param root root node state, used for things like node type information
diff --git 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java
 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java
index d56a4ad5ba..e33bfe9eff 100644
--- 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java
+++ 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java
@@ -88,20 +88,16 @@ public class IndexUpdate implements Editor, PathSource {
      * <p>
      * The value of this flag determines the behavior of the IndexUpdate when
      * dealing with {@code reindex} flags.
-     * </p>
      * <p>
      * If {@code false} (default value), the indexer will start reindexing
      * immediately in the current thread, blocking a commit until this 
operation
      * is done.
-     * </p>
      * <p>
      * If {@code true}, the indexer will ignore the flag, therefore ignoring 
any
      * reindex requests.
-     * </p>
      * <p>
      * This is only provided as a support tool (see OAK-3505) so it should be
      * used with extreme caution!
-     * </p>
      */
     static final boolean IGNORE_REINDEX_FLAGS = Boolean
             .getBoolean("oak.indexUpdate.ignoreReindexFlags");
diff --git 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/MetricsUtils.java
 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/MetricsUtils.java
index f4d2f17808..462d54ec5c 100644
--- 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/MetricsUtils.java
+++ 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/MetricsUtils.java
@@ -29,13 +29,12 @@ public class MetricsUtils {
 
     /**
      * <p>Set a counter metric to the given value. The previous value of the 
metric is discarded and replaced by the
-     * given value.</p>
+     * given value.
      * <p>
      * Note that this method is to support a non-standard use case of the 
counter metrics.
      * Normally counters are incremented periodically to keep track of how 
many times an event occurred. This method
      * instead is intended to be called only once for a given metric, to 
provide the final value of the metrics. If
      * called more than once for the same metric, it will log a warning and 
discard the old value.
-     * </p>
      *
      * @param statisticsProvider The statistics provider to use.
      * @param name               The name of the counter to set.
diff --git 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/UniqueEntryStoreStrategy.java
 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/UniqueEntryStoreStrategy.java
index 0f07e84eab..3176a20f32 100644
--- 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/UniqueEntryStoreStrategy.java
+++ 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/UniqueEntryStoreStrategy.java
@@ -266,7 +266,7 @@ public class UniqueEntryStoreStrategy implements 
IndexStoreStrategy {
     /**
      * Creates a specific type of "hit" to return from the query methods
      * 
-     * <p>Use primarily to reduce duplication when the query algorithms 
execute mostly the same steps but return different objects.</p>
+     * <p>Use primarily to reduce duplication when the query algorithms 
execute mostly the same steps but return different objects.
      * 
      * @param <T> The type of Hit to produce
      */
diff --git 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java
 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java
index 67bd38c366..f5d3b3cbc9 100644
--- 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java
+++ 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeEditor.java
@@ -84,9 +84,9 @@ public class TypeEditor extends DefaultEditor {
          * Invoked whenever a constraint violation is detected.
          * 
          * <p>Implementors may choose to throw a {@link 
org.apache.jackrabbit.oak.api.CommitFailedException} or to handle the error
-         * internally, for instance by logging.</p>
+         * internally, for instance by logging.
          * 
-         * <p>Implementors may <b>not</b> throw other exception types from 
this method.</p>
+         * <p>Implementors may <b>not</b> throw other exception types from 
this method.
          * 
          * @param path the path where the constraint violation was detected
          * @param nodeTypeNames the node type names of the node
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/Query.java 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/Query.java
index 1e96665ca1..af8dc62262 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/Query.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/Query.java
@@ -150,11 +150,9 @@ public interface Query {
      * returns a clone of the current object. Will throw an exception in case 
it's invoked in a non
      * appropriate moment. For example the default {@link QueryImpl} cannot be 
cloned once the
      * {@link #init()} has been executed.
-     * </p>
-     * 
+     *
      * <p>
      * <strong>May return null if not implemented.</strong>
-     * </p>
      * @return a clone of self
      * @throws IllegalStateException
      */
diff --git 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AstElementFactory.java
 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AstElementFactory.java
index d99888762b..91510974f1 100644
--- 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AstElementFactory.java
+++ 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AstElementFactory.java
@@ -192,8 +192,7 @@ public class AstElementFactory {
      * as the {@link AstElement#copyOf()} can return {@code this} is the 
cloning is not implemented
      * by the subclass, this method add some spice around it by checking for 
this case and tracking
      * a DEBUG message in the logs.
-     * </p>
-     * 
+     *
      * @param e the element to be cloned. Cannot be null.
      * @return same as {@link AstElement#copyOf()}
      */
diff --git 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobsPattern.java
 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobsPattern.java
index 5574737214..e7c0d3249f 100644
--- 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobsPattern.java
+++ 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobsPattern.java
@@ -30,10 +30,10 @@ import java.util.Arrays;
 /**
  * <p>Multi-valued variant of the {@link GlobPattern} that will match a given 
path (or tree/property) if any of the 
  * contained patterns matches. This is equivalent to creating multiple access 
control entries with a single rep:glob
- * restrictions each.</p>
+ * restrictions each.
  * 
- * <p>NOTE: An empty value array will not match any path/item</p>
- * <p>NOTE: Currently the pattern keeps a list of {@link GlobPattern} and 
doesn't attempt to optimize the evaluation.</p>
+ * <p>NOTE: An empty value array will not match any path/item
+ * <p>NOTE: Currently the pattern keeps a list of {@link GlobPattern} and 
doesn't attempt to optimize the evaluation.
  * 
  * @see GlobPattern GlobPattern for details
  */
diff --git 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/PrefixPattern.java
 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/PrefixPattern.java
index 7eb3d01ae1..870b83d673 100644
--- 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/PrefixPattern.java
+++ 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/PrefixPattern.java
@@ -33,7 +33,7 @@ import org.jetbrains.annotations.Nullable;
  * {@link 
org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionPattern}
  * interface that returns {@code true} if the name of the target property or 
tree
  * starts with any of the configured namespace prefixes.
- * </p>s
+ * <p>
  * Note: an empty string prefix will match qualified item names defined with 
the 
  * {@link javax.jcr.NamespaceRegistry#NAMESPACE_EMPTY empty namespace}. 
  * See also sections 
diff --git 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManager.java
 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManager.java
index b965945d63..d8bb748754 100644
--- 
a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManager.java
+++ 
b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManager.java
@@ -40,7 +40,7 @@ import org.jetbrains.annotations.Nullable;
  *
  * <p>In general any consumer of the Jackrabbit user management API should 
stick
  * to the API contract and verify that the autosave flag is enabled before
- * relying on the implementation to have it turned on:</p>
+ * relying on the implementation to have it turned on:
  *
  * <pre>
  *     JackrabbitSession session = ...;
diff --git 
a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/ContentMirrorStoreStrategyTest.java
 
b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/ContentMirrorStoreStrategyTest.java
index bc493994b5..5e56e0a426 100644
--- 
a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/ContentMirrorStoreStrategyTest.java
+++ 
b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/ContentMirrorStoreStrategyTest.java
@@ -57,7 +57,6 @@ public class ContentMirrorStoreStrategyTest {
     /**
      * <p>
      * Tests the index pruning mechanism
-     * </p>
      * <ul>
      * <li>
      * adds a few levels of nodes, nodes with an even index will have the
diff --git 
a/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java 
b/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java
index 9e7157b677..c20748ae43 100644
--- 
a/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java
+++ 
b/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java
@@ -413,7 +413,6 @@ public abstract class AbstractQueryTest {
      * or
      * <p>
      * "/ - "test"
-     * </p>
      *
      * @param root
      * @param commit the commit string
diff --git 
a/oak-jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlManager.java
 
b/oak-jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlManager.java
index 35e9c341df..cd01a7591e 100644
--- 
a/oak-jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlManager.java
+++ 
b/oak-jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/JackrabbitAccessControlManager.java
@@ -222,8 +222,8 @@ public interface JackrabbitAccessControlManager extends 
AccessControlManager {
      * must be an existing node. This is equivalent to {@link 
#getPrivileges(String)} and 
      * {@link #hasPrivileges(String, Privilege[])} but allows for easy 
resolution of aggregated privileges 
      * (like e.g. jcr:all) and repeated evaluation if the editing session has 
privileges granted 
-     * at the given target node.</p>
-     * 
+     * at the given target node.
+     * <p>
      * Note: For backwards compatibility this method comes with a default 
implementation that computes the {@link PrivilegeCollection}
      * using regular JCR/Jackrabbit API, which might not be efficient. 
Implementations of {@link JackrabbitAccessControlManager} 
      * are therefore expected to overwrite the default.
@@ -245,8 +245,8 @@ public interface JackrabbitAccessControlManager extends 
AccessControlManager {
      * must be an existing node. This is equivalent to {@link 
#getPrivileges(String,Set)} and 
      * {@link #hasPrivileges(String, Set, Privilege[])} but allows for easy 
resolution of aggregated privileges 
      * (like e.g. jcr:all) and repeated evaluation if the editing session has 
privileges granted 
-     * at the given target node.</p>
-     *
+     * at the given target node.
+     * <p>
      * Note: For backwards compatibility this method comes with a default 
implementation that computes the {@link PrivilegeCollection}
      * using regular JCR/Jackrabbit API, which might not be efficient. 
Implementations of {@link JackrabbitAccessControlManager}
      * are therefore expected to overwrite the default.
@@ -268,8 +268,8 @@ public interface JackrabbitAccessControlManager extends 
AccessControlManager {
     /**
      * <p>Returns the {@link PrivilegeCollection} for the specified 
<code>privilegeNames</code>.
      * Since the privilege names are JCR names, they may be passed in either
-     * qualified or expanded form (see specification for details on JCR 
names).</p>
-     * 
+     * qualified or expanded form (see specification for details on JCR names).
+     * <p>
      * Note: For backwards compatibility this method comes with a default 
implementation that computes the {@link PrivilegeCollection}
      * using regular JCR/Jackrabbit API, which might not be efficient. 
Implementations of {@link JackrabbitAccessControlManager}
      * are therefore expected to overwrite the default.
diff --git 
a/oak-jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/PrincipalSetPolicy.java
 
b/oak-jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/PrincipalSetPolicy.java
index a3a76d99d2..651ac7d50e 100644
--- 
a/oak-jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/PrincipalSetPolicy.java
+++ 
b/oak-jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/PrincipalSetPolicy.java
@@ -37,7 +37,7 @@ import org.osgi.annotation.versioning.ProviderType;
  * remains an implementation detail. Similarly a given permission model is
  * in charge of defining the interactions and effects different
  * {@link AccessControlPolicy policies} will have if used together in the same
- * repository.</p>
+ * repository.
  */
 @ProviderType
 public interface PrincipalSetPolicy extends AccessControlPolicy {
diff --git 
a/oak-jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/PrivilegeCollection.java
 
b/oak-jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/PrivilegeCollection.java
index 623a98d0b8..0e43de2e09 100644
--- 
a/oak-jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/PrivilegeCollection.java
+++ 
b/oak-jackrabbit-api/src/main/java/org/apache/jackrabbit/api/security/authorization/PrivilegeCollection.java
@@ -33,7 +33,7 @@ import org.osgi.annotation.versioning.ProviderType;
 /**
  * <p>Wrapper around a set of {@link Privilege}s that allows to test if a 
given list of privilege names in included. This 
  * avoids repeated calls to {@link AccessControlManager#hasPrivileges(String, 
Privilege[])} or having to manually resolve 
- * the privilege aggregation when using {@link 
AccessControlManager#getPrivileges(String)}.</p>
+ * the privilege aggregation when using {@link 
AccessControlManager#getPrivileges(String)}.
  * 
  * While a {@link PrivilegeCollection.Default default} is available for 
backwards compatibility, it uses regular 
  * JCR API. Therefore it is recommended to provide custom implementations of 
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java 
b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java
index 012d8de4c5..7b3bb91146 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java
@@ -59,11 +59,11 @@ import org.jetbrains.annotations.NotNull;
  * <p>The backing {@linkplain ContentRepository} instance will be constructed 
with
  * reasonable defaults and additional components can be registered by calling
  * the {@code with} methods. Note that it is not possible to remove components
- * once registered.</p>
+ * once registered.
  *
  * <p>The Jcr builder is a lazy initializer, to have a working repository make 
sure
  * you call {@link Jcr#createContentRepository()} or
- * {@link Jcr#createRepository()}.</p>
+ * {@link Jcr#createRepository()}.
  */
 public class Jcr {
     public static final int DEFAULT_OBSERVATION_QUEUE_LENGTH = 
BackgroundObserver.DEFAULT_QUEUE_SIZE;
diff --git 
a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/CompatibilityIssuesTest.java
 
b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/CompatibilityIssuesTest.java
index c26f09929d..976ea39446 100644
--- 
a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/CompatibilityIssuesTest.java
+++ 
b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/CompatibilityIssuesTest.java
@@ -198,7 +198,7 @@ public class CompatibilityIssuesTest extends 
AbstractRepositoryTest {
     /**
      * Type checks are deferred to the Session#save call instead of the
      * Node#addNode method like in Jackrabbit2.
-     * <p>Stacktrace in JR2:</p>
+     * <p>Stacktrace in JR2:
      * <pre>
      * {@code
      * javax.jcr.nodetype.ConstraintViolationException: No child node 
definition for fail found in node /f1362578560413
@@ -211,7 +211,7 @@ public class CompatibilityIssuesTest extends 
AbstractRepositoryTest {
      *     at org.apache.jackrabbit.core.NodeImpl.addNode(NodeImpl.java:1774)
      * }
      * <pre>
-     * <p>Stacktrace in Oak:</p>
+     * <p>Stacktrace in Oak:
      * <pre>
      * {@code
      *javax.jcr.nodetype.ConstraintViolationException
diff --git 
a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/DocumentClusterIT.java 
b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/DocumentClusterIT.java
index e24919ba5f..07d65ab535 100644
--- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/DocumentClusterIT.java
+++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/DocumentClusterIT.java
@@ -116,7 +116,6 @@ public abstract class DocumentClusterIT {
     /**
      * <p> 
      * ensures that the cluster is aligned by running all the background 
operations
-     * </p>
      *
      * @param mks the list of {@link DocumentMK} composing the cluster. Cannot 
be null.
      */
@@ -240,11 +239,9 @@ public abstract class DocumentClusterIT {
      * the default {@link #initRepository(Class, List, List, int, int)} uses 
this for registering
      * any additional {@link IndexEditorProvider}. Override and return all the 
provider you'd like
      * to have running other than the OOTB one.
-     * </p>
-     * 
+     *
      * <p>
      * the default implementation returns {@code null}
-     * </p>
      * @return
      */
     protected Set<IndexEditorProvider> additionalIndexEditorProviders() {
diff --git 
a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/LargeOperationIT.java 
b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/LargeOperationIT.java
index 7ad987fdc9..dfd6cd4f5d 100644
--- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/LargeOperationIT.java
+++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/LargeOperationIT.java
@@ -742,7 +742,7 @@ public class LargeOperationIT {
          * associated with a <a 
href="http://en.wikipedia.org/wiki/Binomial_test";> Binomial test</a>.
          * <p>
          * The number returned is the smallest significance level at which one 
can reject the null hypothesis.
-         * The form of the hypothesis depends on {@code 
alternativeHypothesis}.</p>
+         * The form of the hypothesis depends on {@code alternativeHypothesis}.
          * <p>
          * The p-Value represents the likelihood of getting a result at least 
as extreme as the sample,
          * given the provided {@code probability} of success on a single 
trial. For single-sided tests,
@@ -750,7 +750,7 @@ public class LargeOperationIT {
          * the implementation works as follows: we start by looking at the 
most extreme cases
          * (0 success and n success where n is the number of trials from the 
sample) and determine their likelihood.
          * The lower value is added to the p-Value (if both values are equal, 
both are added). Then we continue with
-         * the next extreme value, until we added the value for the actual 
observed sample.</p>
+         * the next extreme value, until we added the value for the actual 
observed sample.
          * <p>
          * <strong>Preconditions</strong>:
          * <ul>
@@ -758,7 +758,7 @@ public class LargeOperationIT {
          * <li>Number of successes must be &ge; 0.</li>
          * <li>Number of successes must be &le; number of trials.</li>
          * <li>Probability must be &ge; 0 and &le; 1.</li>
-         * </ul></p>
+         * </ul>
          *
          * @param numberOfTrials number of trials performed
          * @param numberOfSuccesses number of successes observed
diff --git 
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedUtils.java
 
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedUtils.java
index 50062d25b4..b5cf018603 100644
--- 
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedUtils.java
+++ 
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/pipelined/PipelinedUtils.java
@@ -25,7 +25,7 @@ import java.util.Locale;
 public class PipelinedUtils {
     /**
      * <p>Format a percentage as a string with 2 decimal places. For instance:
-     * <code>formatAsPercentage(52, 1000)</code> returns 
<code>"5.20"</code>.</p>
+     * <code>formatAsPercentage(52, 1000)</code> returns <code>"5.20"</code>.
      */
     public static String formatAsPercentage(long numerator, long denominator) {
         if (denominator == 0) {
diff --git 
a/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexAggregation2CommonTest.java
 
b/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexAggregation2CommonTest.java
index 9970be4b77..d5befb41f9 100644
--- 
a/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexAggregation2CommonTest.java
+++ 
b/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexAggregation2CommonTest.java
@@ -306,7 +306,6 @@ public abstract class IndexAggregation2CommonTest extends 
AbstractQueryTest {
     /**
      * <p>
      * convenience method that create an "asset" structure like
-     * </p>
      * <p>
      * <pre>
      *  "parent" : {
@@ -322,9 +321,7 @@ public abstract class IndexAggregation2CommonTest extends 
AbstractQueryTest {
      *  }
      * </pre>
      * <p>
-     * <p>
      * and returns the {@code metadata} node
-     * </p>
      *
      * @param parent   the parent under which creating the node
      * @param nodeName the node name to be used
@@ -348,7 +345,6 @@ public abstract class IndexAggregation2CommonTest extends 
AbstractQueryTest {
     /**
      * <p>
      * convenience method that create an "page" structure like
-     * </p>
      * <p>
      * <pre>
      *  "parent" : {
@@ -361,9 +357,7 @@ public abstract class IndexAggregation2CommonTest extends 
AbstractQueryTest {
      *  }
      * </pre>
      * <p>
-     * <p>
      * and returns the {@code jcr:content} node
-     * </p>
      *
      * @param parent   the parent under which creating the node
      * @param nodeName the node name to be used
diff --git 
a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AccessControlConstants.java
 
b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AccessControlConstants.java
index 653f21a03f..b5fbd3b030 100644
--- 
a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AccessControlConstants.java
+++ 
b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AccessControlConstants.java
@@ -64,22 +64,20 @@ public interface AccessControlConstants {
      * An empty value array will make this restriction matching the target 
node only (i.e. equivalent to rep:glob=""). 
      * An array of property names will extend the effect of the restriction to 
properties of the target node that match 
      * the specified names. The {@link 
org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants#RESIDUAL_NAME residual 
name '*'}  
-     * will match the target node and all it's properties.</p>
+     * will match the target node and all it's properties.
      * <p>
      * The corresponding restriction type is {@link 
org.apache.jackrabbit.oak.api.Type#STRINGS}
-     * </p>
      * <p>
      * Note: due to the support of {@link NodeTypeConstants#RESIDUAL_NAME}, 
which isn't a valid JCR name,
      * this restriction is defined to be of {@link 
org.apache.jackrabbit.oak.api.Type#STRINGS} instead of 
      * {@link org.apache.jackrabbit.oak.api.Type#NAMES}. Like the rep:glob 
restriction it will therefore not work with 
      * expanded JCR names or with remapped namespace prefixes.
-     * </p>
      * <p>
      * Note: In case of permission evaluation for a path pointing to a 
non-existing JCR item (see e.g. 
      * {@link javax.jcr.Session#hasPermission(String, String)}) a best-effort 
attempt is made to determine if the path 
      * may point to a property, default being that the path points to a 
non-existing node.
-     * </p>
-     * 
+     *
+     * <p>
      * Example:
      * <pre>
      * rep:current = []                =&gt; restriction applies to the target 
node only
@@ -96,19 +94,18 @@ public interface AccessControlConstants {
      * <p>Name of the optional multi-valued access control restriction that 
allows to combine more than one 
      * {@link #REP_GLOB} restriction. The effect is equivalent to defining 
multiple access control entries with a 
      * single {@link #REP_GLOB} restriction each and will match a given path 
or item if any of the specified glob-values 
-     * matches.</p>
+     * matches.
      * <p>
-     * Note, that an empty value array will never match any path/item.</p>
+     * Note, that an empty value array will never match any path/item.
      * <p>
      * The corresponding restriction type is {@link 
org.apache.jackrabbit.oak.api.Type#STRINGS}
-     * </p>
      */
     String REP_GLOBS = "rep:globs";
 
     /**
      * <p>Name of the optional multi-valued access control restriction that 
allows to limit the effect to one or multiple  
      * subtrees. It is a simplified variant of the common pattern using 2 
{@link #REP_GLOB} wildcard patterns to grant or 
-     * deny access on a particular node in the subtree and all its descendent 
items.</p>
+     * deny access on a particular node in the subtree and all its descendent 
items.
      *
      * <pre>
      * NodePath = "/foo"
@@ -120,10 +117,10 @@ public interface AccessControlConstants {
      * cat/          |   all siblings or descendants of /foo that have an 
intermediate segment ending with "cat"
      * </pre>
      *  
-     * <p>Note, that variants of 'cat'-paths could also consist of multiple 
segments like e.g. '/cat/dog' or '/cat/dog'</p> 
-     * <p>Note, that in contrast to {@link #REP_GLOB}</p> no wildcard 
characters are used to specify the restriction.
-     * <p>Note, that an empty value array will never match any path/item.</p>
-     * <p>Note, that null values and empty string values will be omitted.</p>
+     * <p>Note, that variants of 'cat'-paths could also consist of multiple 
segments like e.g. '/cat/dog' or '/cat/dog'
+     * <p>Note, that in contrast to {@link #REP_GLOB} no wildcard characters 
are used to specify the restriction.
+     * <p>Note, that an empty value array will never match any path/item.
+     * <p>Note, that null values and empty string values will be omitted.
      */
     String REP_SUBTREES = "rep:subtrees";
 
diff --git 
a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionProvider.java
 
b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionProvider.java
index 994eb0b7fb..0d81731639 100644
--- 
a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionProvider.java
+++ 
b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionProvider.java
@@ -60,7 +60,6 @@ public interface PermissionProvider {
      * <p>
      * Testing a name identifying an aggregate privilege is equivalent to 
testing
      * each non aggregate privilege name.
-     * </p>
      *
      * @param tree The tree to test for privileges being granted.
      * @param privilegeNames The name of the privileges.
@@ -114,7 +113,6 @@ public interface PermissionProvider {
      * {@link javax.jcr.Session#hasPermission(String, String)}. When more than 
one
      * action is specified in the {@code jcrActions} parameter, this method 
will
      * only return {@code true} if all of them are granted on the specified 
path.
-     * </p>
      *
      * @param oakPath A valid oak path.
      * @param jcrActions The JCR actions that should be tested separated by ','
diff --git 
a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConstants.java
 
b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConstants.java
index 1abb3ae5c9..99ec99f207 100644
--- 
a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConstants.java
+++ 
b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserConstants.java
@@ -217,7 +217,7 @@ public interface UserConstants {
      * User Management API expects that API consumers tests the auto-save
      * mode is enabled. Therefore this option should be considered a temporary
      * workaround after upgrading a repository to OAK; the affected code should
-     * be reviewed and adjusted accordingly.</p>
+     * be reviewed and adjusted accordingly.
      */
     String PARAM_SUPPORT_AUTOSAVE = "supportAutoSave";
 
diff --git 
a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AccessControlAction.java
 
b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AccessControlAction.java
index 34d6db38fa..3ef32bb13a 100644
--- 
a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AccessControlAction.java
+++ 
b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AccessControlAction.java
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
  * granted on it's own 'home directory' being represented by the new node
  * associated with that new authorizable.
  *
- * <p>The following to configuration parameters are available with this 
implementation:</p>
+ * <p>The following to configuration parameters are available with this 
implementation:
  * <ul>
  *    <li><strong>groupPrivilegeNames</strong>: the value is expected to be a
  *    comma separated list of privileges that will be granted to the new group 
on
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
  * </pre>
  * <p>This configuration could for example lead to the following content
  * structure upon user or group creation. Note however that the resulting
- * structure depends on the actual access control management being in 
place:</p>
+ * structure depends on the actual access control management being in place:
  *
  * <pre>
  *     UserManager umgr = ((JackrabbitSession) session).getUserManager();
diff --git 
a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AuthorizableAction.java
 
b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AuthorizableAction.java
index 2fb2520ec8..5b4baabc93 100644
--- 
a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AuthorizableAction.java
+++ 
b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AuthorizableAction.java
@@ -41,7 +41,7 @@ import org.jetbrains.annotations.Nullable;
  *
  * <p>Please be aware, that in contrast to {@link 
org.apache.jackrabbit.oak.spi.commit.Validator}
  * the authorizable actions will only be enforced when user related content
- * modifications are generated by using the user management API.</p>
+ * modifications are generated by using the user management API.
  *
  * <p>
  * <strong>Note:</strong> user management operations are defined to perform 
transient
diff --git 
a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationAction.java
 
b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationAction.java
index aea477263b..0df96d8773 100644
--- 
a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationAction.java
+++ 
b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationAction.java
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
  *
  * <p>The password validation is executed on user creation and upon password
  * change. It throws a {@code ConstraintViolationException} if the password
- * validation fails.</p>
+ * validation fails.
  *
  * @see org.apache.jackrabbit.api.security.user.UserManager#createUser(String, 
String)
  * @see org.apache.jackrabbit.api.security.user.User#changePassword(String)
diff --git 
a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ManyChildNodesIT.java
 
b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ManyChildNodesIT.java
index cbf8da3585..84727fcb63 100644
--- 
a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ManyChildNodesIT.java
+++ 
b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ManyChildNodesIT.java
@@ -46,7 +46,7 @@ import org.junit.rules.TemporaryFolder;
  * consumes a constant amount of memory (See OAK-4949). It should be possible 
to add
  * 2M child nodes with a 512M heap.
  *
- *<p>The test is <b>disabled</b> by default, to run it set {@code 
-Dtest=ManyChildNodesIT} </p>
+ *<p>The test is <b>disabled</b> by default, to run it set {@code 
-Dtest=ManyChildNodesIT}
  */
 public class ManyChildNodesIT {
     private static final int NODE_COUNT = 
getInteger("many-child-node-it.node-count", 2000000);
diff --git 
a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java
 
b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java
index 7428212221..12250da7c5 100644
--- 
a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java
+++ 
b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCompactionIT.java
@@ -115,7 +115,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * <p>This is a longevity test for revision garbage collection.</p>
+ * <p>This is a longevity test for revision garbage collection.
  *
  * <p>The test schedules a number of readers, writers, a compactor and holds 
some references for a certain time.
  * All of which can be interactively modified through the accompanying {@link 
SegmentCompactionITMBean} and the {@link SegmentRevisionGC}.
@@ -123,7 +123,7 @@ import org.slf4j.LoggerFactory;
  *<p>The test is <b>disabled</b> by default, to run it you need to set the 
{@code SegmentCompactionIT} system property:<br>
  * {@code mvn test -Dtest=SegmentCompactionIT -Dtest.opts.memory=-Xmx4G}
  *
- * <p>TODO Leverage longevity test support from OAK-2771 once we have it.</p>
+ * <p>TODO Leverage longevity test support from OAK-2771 once we have it.
  */
 public class SegmentCompactionIT {
 
diff --git 
a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentOverflowExceptionIT.java
 
b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentOverflowExceptionIT.java
index 0206ab042e..5b8e98bdcd 100644
--- 
a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentOverflowExceptionIT.java
+++ 
b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentOverflowExceptionIT.java
@@ -48,7 +48,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * <p>Tests verifying if the repository gets corrupted or not: {@code OAK-2662 
SegmentOverflowException in HeavyWriteIT on Jenkins}</p>
+ * <p>Tests verifying if the repository gets corrupted or not: {@code OAK-2662 
SegmentOverflowException in HeavyWriteIT on Jenkins}
  *
  * <p><b>This test will run for one hour unless it fails</b>, thus it is 
disabled by default. On the
  * command line specify {@code -Dtest=SegmentOverflowExceptionIT} to enable 
it. Use {@code -Dtimeout=t}
diff --git 
a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/LargeNumberOfPropertiesTestIT.java
 
b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/LargeNumberOfPropertiesTestIT.java
index 4c125bb640..db623506f7 100644
--- 
a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/LargeNumberOfPropertiesTestIT.java
+++ 
b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/LargeNumberOfPropertiesTestIT.java
@@ -38,11 +38,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * <p>Tests verifying if the repository gets corrupted or not: {@code OAK-2481 
IllegalStateException in TarMk with large number of properties}</p>
+ * <p>Tests verifying if the repository gets corrupted or not: {@code OAK-2481 
IllegalStateException in TarMk with large number of properties}
  *
  * <p>These tests are disabled by default due to their long running time. On 
the
  * command line specify {@code -DLargeNumberOfPropertiesTestIT=true} to enable
- * them.</p>
+ * them.
  *
  *<p>If you only want to run this test:<br>
  * {@code mvn verify -Dsurefire.skip.ut=true -PintegrationTesting 
-Dit.test=LargeNumberOfPropertiesTestIT -DLargeNumberOfPropertiesTestIT=true}
diff --git 
a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/SegmentReferenceLimitTestIT.java
 
b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/SegmentReferenceLimitTestIT.java
index c390c38988..a3852ba46d 100644
--- 
a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/SegmentReferenceLimitTestIT.java
+++ 
b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/SegmentReferenceLimitTestIT.java
@@ -43,11 +43,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * <p>Tests verifying if the repository gets corrupted or not: {@code OAK-2294 
Corrupt repository after concurrent version operations}</p>
+ * <p>Tests verifying if the repository gets corrupted or not: {@code OAK-2294 
Corrupt repository after concurrent version operations}
  *
  * <p>These tests are disabled by default due to their long running time. On 
the
  * command line specify {@code -DSegmentReferenceLimitTestIT=true} to enable
- * them.</p>
+ * them.
  *
  *<p>If you only want to run this test:<br>
  * {@code mvn verify -Dsurefire.skip.ut=true -PintegrationTesting 
-Dit.test=SegmentReferenceLimitTestIT -DSegmentReferenceLimitTestIT=true}
diff --git 
a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/checks/MountedNodeStoreChecker.java
 
b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/checks/MountedNodeStoreChecker.java
index c300e89fe2..54a0ef6255 100644
--- 
a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/checks/MountedNodeStoreChecker.java
+++ 
b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/checks/MountedNodeStoreChecker.java
@@ -27,10 +27,9 @@ import org.apache.jackrabbit.oak.spi.state.NodeStore;
 /**
  * Applies a category of consistency checks specific to {@linkplain NodeStore} 
mounts
  * 
- * <p>Checks are only performed on non-default mounts.</p>
+ * <p>Checks are only performed on non-default mounts.
  * 
- * <p>Named 'Checker' to clarify that it is not a Validator in the Oak 
sense.</p> 
- *
+ * <p>Named 'Checker' to clarify that it is not a Validator in the Oak sense.
  */
 public interface MountedNodeStoreChecker<T> {
     
diff --git 
a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/checks/UniqueIndexNodeStoreChecker.java
 
b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/checks/UniqueIndexNodeStoreChecker.java
index 79434ff6b0..282b351e43 100644
--- 
a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/checks/UniqueIndexNodeStoreChecker.java
+++ 
b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/checks/UniqueIndexNodeStoreChecker.java
@@ -52,12 +52,11 @@ import org.slf4j.LoggerFactory;
  * Checker that ensures the consistency of unique entries in the various mounts
  * 
  * <p>For all unique indexes, it checks that the uniqueness constraint holds 
when
- * taking into account the combined index from all the mounts, including the 
global one.</p>
+ * taking into account the combined index from all the mounts, including the 
global one.
  * 
  * <p>Being a one-off check, it does not strictly implement the {@link 
#check(MountedNodeStore, Tree, ErrorHolder, Context)}
  * contract in terms of navigating the specified tree, but instead accesses 
the index definitions node directly
- * on first access and skips all subsequent executions.</p>
- *
+ * on first access and skips all subsequent executions.
  */
 @Component(service = {MountedNodeStoreChecker.class})
 public class UniqueIndexNodeStoreChecker implements 
MountedNodeStoreChecker<UniqueIndexNodeStoreChecker.Context> {
diff --git 
a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/impl/NonDefaultMountWriteReportingObserver.java
 
b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/impl/NonDefaultMountWriteReportingObserver.java
index 17efee6369..e25ec167b2 100644
--- 
a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/impl/NonDefaultMountWriteReportingObserver.java
+++ 
b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/impl/NonDefaultMountWriteReportingObserver.java
@@ -50,16 +50,15 @@ import org.slf4j.LoggerFactory;
  * 
  * <p>This is a <em>diagnostic observer</em> and is expected to be used in 
scenarios where the
  * <code>CompositeNodeStore</code> is configured in a 'seed' mode, where the 
non-default
- * mounts are write-enabled.</p>
+ * mounts are write-enabled.
  * 
  * <p>In such scenarios it is useful to report writes to non-default mounts 
from components
  * that are unexpected. For instance, it can report all writes that do not 
originate
- * from the FileVault package installer.</p>
+ * from the FileVault package installer.
  * 
  * <p>Performance note: the overhead of this observer has not been measured, 
but as it is
  * designed to be used only for initial setups the performance impact should 
not
- * matter.</p>
- *
+ * matter.
  */
 @Component(service =  Observer.class, configurationPolicy =  
ConfigurationPolicy.REQUIRE)
 @Designate(ocd = Config.class)
diff --git 
a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/package-info.java
 
b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/package-info.java
index 2a3ea0f0be..fb36293dc2 100644
--- 
a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/package-info.java
+++ 
b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/package-info.java
@@ -17,7 +17,7 @@
 /**
  * <h1>Composition support</h1>
  *
- * <p>This package contains support classes for implementing a composite 
persistence at the {@linkplain org.apache.jackrabbit.oak.spi.state.NodeStore} 
level.</p>
+ * <p>This package contains support classes for implementing a composite 
persistence at the {@linkplain org.apache.jackrabbit.oak.spi.state.NodeStore} 
level.
  *
  * <h2>Design goals</h2>
  * <ol>
diff --git 
a/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/checks/NodeTypeDefinitionNodeStoreCheckerTest.java
 
b/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/checks/NodeTypeDefinitionNodeStoreCheckerTest.java
index 64489a3a4b..69a097e1bb 100644
--- 
a/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/checks/NodeTypeDefinitionNodeStoreCheckerTest.java
+++ 
b/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/checks/NodeTypeDefinitionNodeStoreCheckerTest.java
@@ -41,7 +41,7 @@ import org.junit.Test;
  * Validates that the <tt>NodeTypeDefinitionNodeStoreChecker</tt> is properly 
applied
  * 
  * <p>This class does not attempt to exhaustively validate the checks that 
should be performed, only
- * that they are performed when needed.</p>
+ * that they are performed when needed.
  *
  */
 @Component(service = {MountedNodeStoreChecker.class})
diff --git 
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
 
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
index 9790267abd..cdcc159c47 100644
--- 
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
+++ 
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
@@ -790,7 +790,6 @@ public class DocumentNodeStoreService {
      * <p>
      * This method iterates over the provided varargs of features and closes 
each one
      * that is not null.
-     * </p>
      *
      * @param features a varargs of {@link Feature} objects to be closed.
      */
diff --git 
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
 
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
index 563522b23d..967ae774b2 100644
--- 
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
+++ 
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
@@ -563,7 +563,6 @@ public final class NodeDocument extends Document {
      *     <bold>Note</bold> - This method should only be invoked upon startup
      *     as then only we can safely assume that these revisions would not be
      *     committed
-     * </p>
      *
      * @param clusterId the clusterId.
      * @param batchSize the batch size to purge uncommitted revisions
diff --git 
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java
 
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java
index 931a7b2d19..3af598091c 100644
--- 
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java
+++ 
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java
@@ -86,7 +86,7 @@ import com.mongodb.client.model.Filters;
  * to fetch required NodeDocuments
  *
  * <p>Version collection involves looking into old record and mostly unmodified
- * documents. In such case read from secondaries are preferred</p>
+ * documents. In such case read from secondaries are preferred
  */
 public class MongoVersionGCSupport extends VersionGCSupport {
 
diff --git 
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderProvider.java
 
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderProvider.java
index 98245231dd..c73358dc69 100644
--- 
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderProvider.java
+++ 
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderProvider.java
@@ -27,16 +27,16 @@ import org.slf4j.LoggerFactory;
  * The <tt>DocumentMkBuilderProvider</tt> is a JUnit <tt>@Rule</tt> which
  * automatically disposes created <tt>DocumentNodeStore</tt> instances
  * 
- * <p>Usage samples are below</p>
+ * <p>Usage samples are below
  * 
- *  <p>Before:</p>
+ * <p>Before:
  *  
  *  <pre>
  *  @Test public void someTest() {
  *      DocumentNodeStore = new DocumentMK.Builder().getNodeStore();
  *  }</pre>
  *  
- *  <p>After:</p>
+ *  <p>After:
  *  
  *  <pre>
  *  @Rule
diff --git 
a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/Clusterable.java
 
b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/Clusterable.java
index 1fc4bd3bbf..0edfd53751 100644
--- 
a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/Clusterable.java
+++ 
b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/state/Clusterable.java
@@ -27,8 +27,7 @@ public interface Clusterable {
      * <p>
      * Will return a unique number per instance across the cluster. It will 
only make its best
      * effort to preserve the same number across restarts but it must be 
unique across the cluster.
-     * </p>
-     * 
+     *
      * @return Cannot be null or empty.
      */
     @NotNull
@@ -40,7 +39,7 @@ public interface Clusterable {
      * one NodeStore are visible on another NodeStore of the same cluster. This
      * can be achieved by generating such a visibility token on the source
      * NodeStore, passing it on to the target NodeStore (by whatever means) and
-     * checking for visibility on that target NodeStore.</p>
+     * checking for visibility on that target NodeStore.
      *
      * <p>The visibility check returns true if the target NodeStore sees at 
least
      * all the changes that the source NodeStore saw at time of visibility 
token
@@ -48,16 +47,16 @@ public interface Clusterable {
      * it will always return true ever after. This also implies that the
      * visibility check can only state whether at least all source changes are
      * visible on the target and that it is independent of any further
-     * modifications.</p>
+     * modifications.
      *
      * <p>When source and target NodeStore are identical, the visibility check 
is
      * expected to return true, immediately. This is based on the assumption
      * that with a session.refresh() on that NodeStore you'll always get the
-     * latest changes applied by any other session locally.</p>
+     * latest changes applied by any other session locally.
      *
      * <p>Visibility tokens are meant to be lightweight and are not expected 
to be
      * persisted by the implementor. Nevertheless they should survive their
-     * validity in the case of crashes of the source and/or the target 
instance.</p>
+     * validity in the case of crashes of the source and/or the target 
instance.
      */
     @Nullable
     String getVisibilityToken();
@@ -65,10 +64,10 @@ public interface Clusterable {
     /**
      * <p>Checks if the underlying NodeStore sees at least the changes that 
were
      * visible at the time the visibility token was created on potentially
-     * another instance if in a clustered NodeStore setup.</p>
+     * another instance if in a clustered NodeStore setup.
      *
      * <p>If the visibility token was created on the underlying NodeStore this
-     * check always returns true, immediately.</p>
+     * check always returns true, immediately.
      * 
      * @param visibilityToken
      *            the visibility token that was created on another instance in 
a

Reply via email to