diff --git a/client/jackson/build.gradle b/client/jackson/build.gradle
index 4008d851e5..eb4cca280e 100644
--- a/client/jackson/build.gradle
+++ b/client/jackson/build.gradle
@@ -46,3 +46,12 @@ jar {
         attributes 'Automatic-Module-Name': 'net.corda.client.jackson'
     }
 }
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifactId jar.baseName
+            from components.java
+        }
+    }
+}
diff --git a/client/jfx/build.gradle b/client/jfx/build.gradle
index 5031de58bd..7303ee9d19 100644
--- a/client/jfx/build.gradle
+++ b/client/jfx/build.gradle
@@ -90,3 +90,12 @@ jar {
         attributes 'Automatic-Module-Name': 'net.corda.client.jfx'
     }
 }
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifactId jar.baseName
+            from components.java
+        }
+    }
+}
diff --git a/client/mock/build.gradle b/client/mock/build.gradle
index c588ac52b7..9963b73d6c 100644
--- a/client/mock/build.gradle
+++ b/client/mock/build.gradle
@@ -37,3 +37,12 @@ jar {
         )
     }
 }
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifactId jar.baseName
+            from components.java
+        }
+    }
+}
diff --git a/client/rpc/build.gradle b/client/rpc/build.gradle
index 9085ec7c25..30afb18723 100644
--- a/client/rpc/build.gradle
+++ b/client/rpc/build.gradle
@@ -85,3 +85,12 @@ jar {
         attributes 'Automatic-Module-Name': 'net.corda.client.rpc'
     }
 }
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifactId jar.baseName
+            from components.java
+        }
+    }
+}
diff --git a/common/configuration-parsing/build.gradle b/common/configuration-parsing/build.gradle
index 6db7c622ef..4a7a7b05d1 100644
--- a/common/configuration-parsing/build.gradle
+++ b/common/configuration-parsing/build.gradle
@@ -23,3 +23,12 @@ jar {
     baseName 'corda-common-configuration-parsing'
 }
 
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifactId jar.baseName
+            from components.java
+        }
+    }
+}
+
diff --git a/common/logging/build.gradle b/common/logging/build.gradle
index 77d48274a3..25dfeadcf2 100644
--- a/common/logging/build.gradle
+++ b/common/logging/build.gradle
@@ -36,3 +36,12 @@ jar {
     baseName 'corda-common-logging'
 }
 
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifactId jar.baseName
+            from components.java
+        }
+    }
+}
+
diff --git a/common/validation/build.gradle b/common/validation/build.gradle
index a995a7301c..56bab1a8d8 100644
--- a/common/validation/build.gradle
+++ b/common/validation/build.gradle
@@ -8,3 +8,12 @@ dependencies {
 jar {
     baseName 'corda-common-validation'
 }
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifactId jar.baseName
+            from components.java
+        }
+    }
+}
diff --git a/docs/build.gradle b/docs/build.gradle
index 53890943d8..12a1c72558 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -1,7 +1,6 @@
 import org.apache.tools.ant.taskdefs.condition.Os
 
 apply plugin: 'org.jetbrains.dokka'
-apply plugin: 'corda.common-publishing'
 
 dependencies {
     implementation rootProject
@@ -24,6 +23,10 @@ ext {
     archivedApiDocsBaseFilename = 'api-docs'
 }
 
+jar {
+    enabled = false
+}
+
 dokkaHtml {
     outputDirectory = file("${rootProject.rootDir}/docs/build/html/api/html")
 }
@@ -94,6 +97,8 @@ task archiveApiDocs(type: Tar) {
 publishing {
     publications {
         if (System.getProperty('publishApiDocs') != null) {
+            apply plugin: 'corda.common-publishing'
+
             archivedApiDocs(MavenPublication) {
                 artifact archiveApiDocs {
                     artifactId archivedApiDocsBaseFilename
diff --git a/node-api/build.gradle b/node-api/build.gradle
index 1c196ca8b7..de20afd37f 100644
--- a/node-api/build.gradle
+++ b/node-api/build.gradle
@@ -106,3 +106,12 @@ jar {
         attributes('Add-Opens': 'java.base/java.io java.base/java.time java.base/java.util java.base/java.lang.invoke java.base/java.security')
     }
 }
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifactId jar.baseName
+            from components.java
+        }
+    }
+}
diff --git a/node/build.gradle b/node/build.gradle
index 31b48ded45..e3f184e590 100644
--- a/node/build.gradle
+++ b/node/build.gradle
@@ -338,3 +338,12 @@ tasks.named('test', Test) {
     maxHeapSize = "3g"
     maxParallelForks = (System.env.CORDA_NODE_TESTING_FORKS == null) ? 1 : "$System.env.CORDA_NODE_TESTING_FORKS".toInteger()
 }
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifactId jar.baseName
+            from components.java
+        }
+    }
+}
diff --git a/testing/core-test-utils/build.gradle b/testing/core-test-utils/build.gradle
index 35d2c18426..61c44ed34a 100644
--- a/testing/core-test-utils/build.gradle
+++ b/testing/core-test-utils/build.gradle
@@ -44,3 +44,12 @@ jar {
         attributes('Corda-Testing': true)
     }
 }
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifactId jar.baseName
+            from components.java
+        }
+    }
+}
diff --git a/testing/node-driver/build.gradle b/testing/node-driver/build.gradle
index e5ab854db9..e8a122fff8 100644
--- a/testing/node-driver/build.gradle
+++ b/testing/node-driver/build.gradle
@@ -139,3 +139,12 @@ scanApi {
         ]
     ]
 }
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifactId jar.baseName
+            from components.java
+        }
+    }
+}
diff --git a/testing/test-common/build.gradle b/testing/test-common/build.gradle
index cde404785f..1a84f6863f 100644
--- a/testing/test-common/build.gradle
+++ b/testing/test-common/build.gradle
@@ -29,3 +29,12 @@ jar {
         attributes('Corda-Testing': true)
     }
 }
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifactId jar.baseName
+            from components.java
+        }
+    }
+}
diff --git a/testing/test-db/build.gradle b/testing/test-db/build.gradle
index 90b5198390..98d33ca8c1 100644
--- a/testing/test-db/build.gradle
+++ b/testing/test-db/build.gradle
@@ -20,3 +20,12 @@ jar {
         attributes('Corda-Testing': true)
     }
 }
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifactId jar.baseName
+            from components.java
+        }
+    }
+}
diff --git a/testing/test-utils/build.gradle b/testing/test-utils/build.gradle
index dd52990d71..f42a246de2 100644
--- a/testing/test-utils/build.gradle
+++ b/testing/test-utils/build.gradle
@@ -55,3 +55,12 @@ jar {
         attributes('Corda-Testing': true)
     }
 }
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifactId jar.baseName
+            from components.java
+        }
+    }
+}
diff --git a/testing/testserver/build.gradle b/testing/testserver/build.gradle
index 8848d690e1..f4b029efd4 100644
--- a/testing/testserver/build.gradle
+++ b/testing/testserver/build.gradle
@@ -89,3 +89,12 @@ task integrationTest(type: Test) {
 jar {
     baseName 'corda-testserver-impl'
 }
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifactId jar.baseName
+            from components.java
+        }
+    }
+}
diff --git a/tools/cliutils/build.gradle b/tools/cliutils/build.gradle
index c296de0663..c07abdf9b1 100644
--- a/tools/cliutils/build.gradle
+++ b/tools/cliutils/build.gradle
@@ -23,3 +23,11 @@ jar {
     archiveBaseName = "corda-tools-cliutils"
 }
 
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifactId jar.baseName
+            from components.java
+        }
+    }
+}