diff --git a/parent/pom.xml b/parent/pom.xml
index 6f81244d38..767d84d61d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -440,7 +440,73 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
                     <source>${java.source.version}</source>
+                    <quiet>true</quiet>
+                    <excludePackageNames>${aries.javadoc.exclude.packages}</excludePackageNames>
+                    <!--
+                        External links are deliberately omitted here: javadoc would fetch the
+                        referenced package-list/element-list files on every invocation, making
+                        the build dependent on network access. External API links are only
+                        configured for the generated site (reporting section below).
+                    -->
+                    <tags>
+                        <tag>
+                            <name>goal</name>
+                            <placement>Xt</placement>
+                        </tag>
+                        <tag>
+                            <name>phase</name>
+                            <placement>Xt</placement>
+                        </tag>
+                        <tag>
+                            <name>execute</name>
+                            <placement>Xt</placement>
+                        </tag>
+                        <tag>
+                            <name>requiresDependencyResolution</name>
+                            <placement>Xt</placement>
+                        </tag>
+                        <tag>
+                            <name>parameter</name>
+                            <placement>Xf</placement>
+                        </tag>
+                        <tag>
+                            <name>required</name>
+                            <placement>Xf</placement>
+                        </tag>
+                        <tag>
+                            <name>readonly</name>
+                            <placement>Xf</placement>
+                        </tag>
+                        <tag>
+                            <name>component</name>
+                            <placement>Xf</placement>
+                        </tag>
+                        <tag>
+                            <name>plexus.component</name>
+                            <placement>Xf</placement>
+                        </tag>
+                        <tag>
+                            <name>plexus.requirement</name>
+                            <placement>Xf</placement>
+                        </tag>
+                        <tag>
+                            <name>Immutable</name>
+                            <placement>t</placement>
+                        </tag>
+                        <tag>
+                            <name>ThreadSafe</name>
+                            <placement>t</placement>
+                        </tag>
+                    </tags>
                 </configuration>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.rat</groupId>
@@ -554,8 +620,8 @@
                     <quiet>true</quiet>
                     <source>${java.source.version}</source>
                     <links>
-                        <link>http://java.sun.com/j2se/1.7.0/docs/api</link>
-                        <link>http://www.osgi.org/javadoc/r4v43/</link>
+                        <link>https://docs.osgi.org/javadoc/r4v43/core/</link>
+                        <link>https://docs.osgi.org/javadoc/r4v43/cmpn/</link>
                     </links>
                     <tags>
                         <tag>
diff --git a/testsupport/pom.xml b/testsupport/pom.xml
index 674d6c3740..92c6bf4a76 100644
--- a/testsupport/pom.xml
+++ b/testsupport/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.1-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/testsupport/testsupport-unit/pom.xml b/testsupport/testsupport-unit/pom.xml
index 364302e5bb..ffe75cd171 100644
--- a/testsupport/testsupport-unit/pom.xml
+++ b/testsupport/testsupport-unit/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.1-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/util/pom.xml b/util/pom.xml
index 6a0b105d86..d1375ec1b1 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.1-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
@@ -66,7 +66,7 @@
         <aries.skip.version.check>true</aries.skip.version.check>
         <org.apache.aries.versioning.plugin.version>0.3.1</org.apache.aries.versioning.plugin.version>
 
-        <maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
+        <aries.javadoc.exclude.packages>${aries.osgi.private.pkg}</aries.javadoc.exclude.packages>
         <org.apache.aries.testsupport.unit.version>2.0.0</org.apache.aries.testsupport.unit.version>
         <org.eclipse.osgi.version>3.23.100</org.eclipse.osgi.version>
     </properties>
@@ -101,25 +101,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>${maven-javadoc-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <id>javadoc-jar</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                            <failOnError>false</failOnError>
-                            <excludePackageNames>*.impl:*.internal</excludePackageNames>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/util/src/main/java/org/apache/aries/util/log/Logger.java b/util/src/main/java/org/apache/aries/util/log/Logger.java
index 57a75a8606..04ecc9cda0 100644
--- a/util/src/main/java/org/apache/aries/util/log/Logger.java
+++ b/util/src/main/java/org/apache/aries/util/log/Logger.java
@@ -26,7 +26,7 @@
 // Note this file originated in the JMX subproject.
 
 /**
- * <p>This <tt>Logger</tt> class represents ServiceTracker for LogService.
+ * <p>This <code>Logger</code> class represents ServiceTracker for LogService.
  * It provides a simple mechanism for interacting with the log service.
  *
  * @see org.osgi.service.log.LogService
diff --git a/versioning/pom.xml b/versioning/pom.xml
index 1da233b2a2..eacb745ad3 100644
--- a/versioning/pom.xml
+++ b/versioning/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.1-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
diff --git a/versioning/versioning-checker/pom.xml b/versioning/versioning-checker/pom.xml
index 58c98d9786..4388f6338e 100644
--- a/versioning/versioning-checker/pom.xml
+++ b/versioning/versioning-checker/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.1-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -57,6 +57,7 @@
         <aries.osgi.private.pkg>
             org.apache.aries.versioning.utils;
         </aries.osgi.private.pkg>
+        <aries.javadoc.exclude.packages>org.apache.aries.versioning.utils</aries.javadoc.exclude.packages>
         <lastReleaseVersion>0.4.0</lastReleaseVersion>
         <aries.skip.version.check>true</aries.skip.version.check>
 
diff --git a/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/check/BundleCompatibility.java b/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/check/BundleCompatibility.java
index c695ac66f0..64eeea9451 100644
--- a/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/check/BundleCompatibility.java
+++ b/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/check/BundleCompatibility.java
@@ -54,9 +54,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * @version $Rev:$ $Date:$
- */
 public class BundleCompatibility {
   private static final Logger _logger = LoggerFactory.getLogger(BundleCompatibility.class);
 
diff --git a/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/check/BundleInfo.java b/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/check/BundleInfo.java
index 2b8654f6e5..bcfdb320a0 100644
--- a/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/check/BundleInfo.java
+++ b/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/check/BundleInfo.java
@@ -24,9 +24,6 @@
 
 import org.apache.aries.util.manifest.BundleManifest;
 
-/**
-* @version $Rev:$ $Date:$
-*/
 public class BundleInfo {
     private final BundleManifest bundleManifest;
     private final File bundle;
diff --git a/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/check/VersionChange.java b/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/check/VersionChange.java
index 29128b8c8c..a4034bf177 100644
--- a/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/check/VersionChange.java
+++ b/versioning/versioning-checker/src/main/java/org/apache/aries/versioning/check/VersionChange.java
@@ -22,9 +22,6 @@
 
 import org.osgi.framework.Version;
 
-/**
- * @version $Rev:$ $Date:$
- */
 public class VersionChange {
     private BundleCompatibility.VERSION_CHANGE_TYPE changeType;
     private Version oldVersion;
diff --git a/versioning/versioning-checker/src/test/java/org/apache/aries/versioning/tests/BinaryCompatibilityTest.java b/versioning/versioning-checker/src/test/java/org/apache/aries/versioning/tests/BinaryCompatibilityTest.java
index 66281516c7..13ec7b06f9 100644
--- a/versioning/versioning-checker/src/test/java/org/apache/aries/versioning/tests/BinaryCompatibilityTest.java
+++ b/versioning/versioning-checker/src/test/java/org/apache/aries/versioning/tests/BinaryCompatibilityTest.java
@@ -301,7 +301,7 @@ public void test_jdk_chap13_4_7_4() throws IOException {
     }
 
     /**
-     * Change the signature of the field from Colllection<AA> to Collection<String>
+     * Change the signature of the field from {@code Colllection<AA>} to {@code Collection<String>}
      */
     @Test
     public void test_jdk_chap13_4_7_5() {
diff --git a/versioning/versioning-plugin/pom.xml b/versioning/versioning-plugin/pom.xml
index 2c97f99595..a74c90797a 100644
--- a/versioning/versioning-plugin/pom.xml
+++ b/versioning/versioning-plugin/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.1-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>