diff --git a/bom/pom.xml b/bom/pom.xml
index 5221ce9b91f3..c62e931dcd47 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -178,6 +178,11 @@
             <artifactId>infinispan-cli-interpreter</artifactId>
             <version>${project.version}</version>
          </dependency>
+         <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>infinispan-clustered-counter</artifactId>
+            <version>${project.version}</version>
+         </dependency>
          <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>infinispan-commons</artifactId>
diff --git a/commons/src/main/java/org/infinispan/counter/api/package-info.java b/commons/src/main/java/org/infinispan/counter/api/package-info.java
new file mode 100644
index 000000000000..9a2686fe8e32
--- /dev/null
+++ b/commons/src/main/java/org/infinispan/counter/api/package-info.java
@@ -0,0 +1,6 @@
+/**
+ * Clustered Counters API.
+ *
+ * @public
+ */
+package org.infinispan.counter.api;
diff --git a/commons/src/main/java/org/infinispan/counter/exception/package-info.java b/commons/src/main/java/org/infinispan/counter/exception/package-info.java
new file mode 100644
index 000000000000..cd47cdac657c
--- /dev/null
+++ b/commons/src/main/java/org/infinispan/counter/exception/package-info.java
@@ -0,0 +1,6 @@
+/**
+ * Clustered Counters Exceptions.
+ *
+ * @public
+ */
+package org.infinispan.counter.exception;
diff --git a/counter/src/main/java/org/infinispan/counter/package-info.java b/counter/src/main/java/org/infinispan/counter/package-info.java
new file mode 100644
index 000000000000..efa1c0815b76
--- /dev/null
+++ b/counter/src/main/java/org/infinispan/counter/package-info.java
@@ -0,0 +1,6 @@
+/**
+ * Embedded Clustered Counters.
+ *
+ * @public
+ */
+package org.infinispan.counter;
diff --git a/javadoc/javadoc-all/pom.xml b/javadoc/javadoc-all/pom.xml
index 3b3705eb19c6..496724aba3c9 100644
--- a/javadoc/javadoc-all/pom.xml
+++ b/javadoc/javadoc-all/pom.xml
@@ -97,6 +97,11 @@
          <artifactId>infinispan-cachestore-rocksdb</artifactId>
       </dependency>
 
+      <dependency>
+         <groupId>${project.groupId}</groupId>
+         <artifactId>infinispan-clustered-counter</artifactId>
+      </dependency>
+
       <dependency>
          <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-server-core</artifactId>
@@ -193,6 +198,10 @@
                            <title>Query API</title>
                            <packages>org.infinispan.query*:org.infinispan.objectfilter*</packages>
                         </group>
+                        <group>
+                           <title>Clustered Counter API</title>
+                           <packages>org.infinispan.counter*</packages>
+                        </group>
                         <group>
                            <title>Distributed Executors (deprecated)</title>
                            <packages>org.infinispan.distexec*</packages>
@@ -215,6 +224,9 @@
                      <dependencySourceIncludes>
                         <dependencySourceInclude>org.infinispan:*</dependencySourceInclude>
                      </dependencySourceIncludes>
+                     <dependencySourceExcludes>
+                        <dependencySourceExclude>org.infinispan:infinispan-license</dependencySourceExclude>
+                     </dependencySourceExcludes>
                      <javadocDirectory>${basedir}/src/main/javadoc</javadocDirectory>
                      <links>
                         <link>http://docs.oracle.com/javase/8/docs/api/</link>
@@ -284,6 +296,12 @@
                </execution>
             </executions>
          </plugin>
+         <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+               <skip>true</skip>
+            </configuration>
+         </plugin>
       </plugins>
    </build>
 </project>
diff --git a/javadoc/javadoc-embedded/pom.xml b/javadoc/javadoc-embedded/pom.xml
index 79cb55beb310..7fd1d4f039cf 100644
--- a/javadoc/javadoc-embedded/pom.xml
+++ b/javadoc/javadoc-embedded/pom.xml
@@ -99,6 +99,11 @@
          <artifactId>infinispan-lucene-directory</artifactId>
       </dependency>
 
+      <dependency>
+         <groupId>${project.groupId}</groupId>
+         <artifactId>infinispan-clustered-counter</artifactId>
+      </dependency>
+
       <dependency>
          <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-server-core</artifactId>
@@ -188,6 +193,10 @@
                            <title>Query API</title>
                            <packages>org.infinispan.query*:org.infinispan.objectfilter*</packages>
                         </group>
+                        <group>
+                           <title>Clustered Counter API</title>
+                           <packages>org.infinispan.counter*</packages>
+                        </group>
                         <group>
                            <title>Distributed Executors (deprecated)</title>
                            <packages>org.infinispan.distexec*</packages>
@@ -206,6 +215,9 @@
                      <dependencySourceIncludes>
                         <dependencySourceInclude>org.infinispan:*</dependencySourceInclude>
                      </dependencySourceIncludes>
+                     <dependencySourceExcludes>
+                        <dependencySourceExclude>org.infinispan:infinispan-license</dependencySourceExclude>
+                     </dependencySourceExcludes>
                      <javadocDirectory>${basedir}/src/main/javadoc</javadocDirectory>
                      <links>
                         <link>http://docs.oracle.com/javase/8/docs/api/</link>
@@ -275,6 +287,12 @@
                </execution>
             </executions>
          </plugin>
+         <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+               <skip>true</skip>
+            </configuration>
+         </plugin>
       </plugins>
    </build>
 </project>
diff --git a/javadoc/javadoc-remote/pom.xml b/javadoc/javadoc-remote/pom.xml
index 15986e8f925e..db5ec0cf3ecf 100644
--- a/javadoc/javadoc-remote/pom.xml
+++ b/javadoc/javadoc-remote/pom.xml
@@ -79,6 +79,9 @@
                      <dependencySourceIncludes>
                         <dependencySourceInclude>org.infinispan:*</dependencySourceInclude>
                      </dependencySourceIncludes>
+                     <dependencySourceExcludes>
+                        <dependencySourceExclude>org.infinispan:infinispan-license</dependencySourceExclude>
+                     </dependencySourceExcludes>
                      <javadocDirectory>${basedir}/src/main/javadoc</javadocDirectory>
                      <links>
                         <link>http://docs.oracle.com/javase/8/docs/api/</link>
@@ -95,6 +98,12 @@
                </execution>
             </executions>
          </plugin>
+         <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+               <skip>true</skip>
+            </configuration>
+         </plugin>
       </plugins>
    </build>
 </project>
diff --git a/parent/pom.xml b/parent/pom.xml
index 4ebb1f0805c4..ca48487df988 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1185,7 +1185,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.10.3</version>
+                    <version>3.0.0-M1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>