From d4c8fa98a715c03efb302e7c6a63c30edd888034 Mon Sep 17 00:00:00 2001
From: Chris Richardson <chris@chrisrichardson.net>
Date: Thu, 18 Mar 2021 09:51:55 -0700
Subject: [PATCH] Upgraded Gradle Wrapper, eliminated redundant JavaDoc
 plugins, and Removed bintray plugin

---
 build.gradle                                  |  4 ---
 .../main/groovy/PrivateModulePlugin.groovy    | 18 -------------
 .../src/main/groovy/PublicModulePlugin.groovy | 27 -------------------
 .../build.gradle                              |  1 -
 .../build.gradle                              |  3 +--
 eventuate-tram-commands/build.gradle          |  3 +--
 .../build.gradle                              |  3 +--
 eventuate-tram-consumer-activemq/build.gradle |  1 -
 eventuate-tram-consumer-common/build.gradle   |  1 -
 eventuate-tram-consumer-jdbc/build.gradle     |  3 +--
 eventuate-tram-consumer-kafka/build.gradle    |  1 -
 eventuate-tram-consumer-rabbitmq/build.gradle |  1 -
 eventuate-tram-consumer-redis/build.gradle    |  1 -
 .../build.gradle                              |  3 +--
 eventuate-tram-events/build.gradle            |  1 -
 eventuate-tram-in-memory-test/build.gradle    |  3 +--
 eventuate-tram-in-memory/build.gradle         |  3 +--
 .../build.gradle                              |  3 +--
 eventuate-tram-jdbc-activemq/build.gradle     |  3 +--
 eventuate-tram-jdbc-rabbitmq/build.gradle     |  3 +--
 eventuate-tram-jdbc-redis/build.gradle        |  3 +--
 .../build.gradle                              |  3 +--
 eventuate-tram-messaging/build.gradle         |  3 +--
 .../build.gradle                              |  1 -
 .../build.gradle                              |  1 -
 .../build.gradle                              |  1 -
 .../build.gradle                              |  1 -
 eventuate-tram-micronaut-events/build.gradle  |  1 -
 .../build.gradle                              |  1 -
 .../build.gradle                              |  3 +--
 .../build.gradle                              |  1 -
 .../build.gradle                              |  1 -
 .../build.gradle                              |  1 -
 .../build.gradle                              |  1 -
 eventuate-tram-producer-jdbc/build.gradle     |  1 -
 .../build.gradle                              |  4 +--
 .../build.gradle                              |  3 +--
 .../build.gradle                              |  3 +--
 .../build.gradle                              |  3 +--
 eventuate-tram-spring-commands/build.gradle   |  3 +--
 .../build.gradle                              |  1 -
 .../build.gradle                              |  3 +--
 .../build.gradle                              |  1 -
 .../build.gradle                              |  1 -
 .../build.gradle                              |  3 +--
 .../build.gradle                              |  1 -
 .../build.gradle                              |  3 +--
 .../build.gradle                              |  3 +--
 .../build.gradle                              |  1 -
 eventuate-tram-spring-events/build.gradle     |  1 -
 eventuate-tram-spring-in-memory/build.gradle  |  3 +--
 eventuate-tram-spring-jdbc-kafka/build.gradle |  3 +--
 .../build.gradle                              |  3 +--
 .../build.gradle                              |  3 +--
 eventuate-tram-spring-messaging/build.gradle  |  3 +--
 .../build.gradle                              |  3 +--
 .../build.gradle                              |  1 -
 .../build.gradle                              |  1 -
 eventuate-tram-test-util/build.gradle         |  3 +--
 eventuate-tram-testing-support/build.gradle   |  1 -
 gradle.properties                             |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 62 files changed, 32 insertions(+), 139 deletions(-)
 delete mode 100644 buildSrc/src/main/groovy/PrivateModulePlugin.groovy
 delete mode 100644 buildSrc/src/main/groovy/PublicModulePlugin.groovy

diff --git a/build.gradle b/build.gradle
index 5c3924dc..17841361 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,6 @@ buildscript {
         eventuateMavenRepoUrl.split(',').each { repoUrl -> maven { url repoUrl } }
     }
     dependencies {
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
         classpath "io.eventuate.plugins.gradle:eventuate-plugins-gradle-versions:$eventuatePluginsGradleVersion"
         classpath "io.eventuate.plugins.gradle:eventuate-plugins-gradle-publish:$eventuatePluginsGradleVersion"
         classpath "com.avast.gradle:gradle-docker-compose-plugin:0.12.0"
@@ -48,11 +47,8 @@ gradle.projectsEvaluated {
     task aggregateJavaDocs(type: Javadoc) {
         description = 'Aggregated Javadoc API documentation of all subprojects.'
         group = JavaBasePlugin.DOCUMENTATION_GROUP
-        dependsOn subprojects.findAll { subproject -> subproject.plugins.hasPlugin(PublicModulePlugin) }.javadoc
 
-        source subprojects.findAll { subproject -> subproject.plugins.hasPlugin(PublicModulePlugin) }.javadoc.source
         destinationDir file("$buildDir/docs/javadoc")
-        classpath = files(subprojects.findAll { subproject -> subproject.plugins.hasPlugin(PublicModulePlugin) }.javadoc.classpath)
     }
 
     task("aggregateJavaDocsJar", type: org.gradle.api.tasks.bundling.Jar, dependsOn: project.aggregateJavaDocs) {
diff --git a/buildSrc/src/main/groovy/PrivateModulePlugin.groovy b/buildSrc/src/main/groovy/PrivateModulePlugin.groovy
deleted file mode 100644
index fe03754c..00000000
--- a/buildSrc/src/main/groovy/PrivateModulePlugin.groovy
+++ /dev/null
@@ -1,18 +0,0 @@
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-
-class PrivateModulePlugin implements Plugin<Project> {
-    void apply(Project project) {
-
-        project.task("sourcesJar", type: org.gradle.api.tasks.bundling.Jar) {
-            classifier = 'sources'
-            from project.sourceSets.main.allSource
-//    manifest = defaultManifest()
-        }
-
-        project.artifacts {
-            archives project.jar
-            archives project.sourcesJar
-        }
-    }
-}
\ No newline at end of file
diff --git a/buildSrc/src/main/groovy/PublicModulePlugin.groovy b/buildSrc/src/main/groovy/PublicModulePlugin.groovy
deleted file mode 100644
index 4ff77a3e..00000000
--- a/buildSrc/src/main/groovy/PublicModulePlugin.groovy
+++ /dev/null
@@ -1,27 +0,0 @@
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-
-class PublicModulePlugin implements Plugin<Project> {
-    void apply(Project project) {
-
-        project.ext.genjavadoc = true
-
-        project.task("javadocJar", type: org.gradle.api.tasks.bundling.Jar, dependsOn: project.javadoc) {
-            classifier = 'javadoc'
-            from 'build/docs/javadoc'
-//    manifest = defaultManifest()
-        }
-
-        project.task("sourcesJar", type: org.gradle.api.tasks.bundling.Jar) {
-            classifier = 'sources'
-            from project.sourceSets.main.allSource
-//    manifest = defaultManifest()
-        }
-
-        project.artifacts {
-            archives project.jar
-            archives project.javadocJar
-            archives project.sourcesJar
-        }
-    }
-}
\ No newline at end of file
diff --git a/eventuate-tram-aggregate-domain-events/build.gradle b/eventuate-tram-aggregate-domain-events/build.gradle
index d33bb50d..86e2dbb0 100644
--- a/eventuate-tram-aggregate-domain-events/build.gradle
+++ b/eventuate-tram-aggregate-domain-events/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-events")
diff --git a/eventuate-tram-commands-db-broker-integration-test/build.gradle b/eventuate-tram-commands-db-broker-integration-test/build.gradle
index 4e9df69a..4cd750f7 100644
--- a/eventuate-tram-commands-db-broker-integration-test/build.gradle
+++ b/eventuate-tram-commands-db-broker-integration-test/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PrivateModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-producer-jdbc")
@@ -16,4 +15,4 @@ test {
         exclude '**/TramCommandsDBBrokerIntegrationCustomDBTest**'
     }
     forkEvery 1
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-commands/build.gradle b/eventuate-tram-commands/build.gradle
index 6662cf9a..dbbc54b6 100644
--- a/eventuate-tram-commands/build.gradle
+++ b/eventuate-tram-commands/build.gradle
@@ -1,7 +1,6 @@
-apply plugin: PrivateModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-messaging")
 
     compile "io.eventuate.common:eventuate-common-json-mapper:$eventuateCommonVersion"
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-common-spring-in-memory/build.gradle b/eventuate-tram-common-spring-in-memory/build.gradle
index 83f687c5..08175ed1 100644
--- a/eventuate-tram-common-spring-in-memory/build.gradle
+++ b/eventuate-tram-common-spring-in-memory/build.gradle
@@ -1,6 +1,5 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-in-memory")
     compile "org.springframework.boot:spring-boot-starter-jdbc:$springBootCdcVersion"
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-consumer-activemq/build.gradle b/eventuate-tram-consumer-activemq/build.gradle
index 81c65ac6..7ff531b1 100644
--- a/eventuate-tram-consumer-activemq/build.gradle
+++ b/eventuate-tram-consumer-activemq/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-messaging")
diff --git a/eventuate-tram-consumer-common/build.gradle b/eventuate-tram-consumer-common/build.gradle
index a1da9060..1438dfda 100644
--- a/eventuate-tram-consumer-common/build.gradle
+++ b/eventuate-tram-consumer-common/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-messaging")
diff --git a/eventuate-tram-consumer-jdbc/build.gradle b/eventuate-tram-consumer-jdbc/build.gradle
index 9b38c6f2..ad890825 100644
--- a/eventuate-tram-consumer-jdbc/build.gradle
+++ b/eventuate-tram-consumer-jdbc/build.gradle
@@ -1,7 +1,6 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile "io.eventuate.common:eventuate-common-jdbc:$eventuateCommonVersion"
     compile 'org.springframework:spring-jdbc:5.1.8.RELEASE'
     compile project(":eventuate-tram-consumer-common")
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-consumer-kafka/build.gradle b/eventuate-tram-consumer-kafka/build.gradle
index ddbe2c18..78064b2b 100644
--- a/eventuate-tram-consumer-kafka/build.gradle
+++ b/eventuate-tram-consumer-kafka/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-messaging")
diff --git a/eventuate-tram-consumer-rabbitmq/build.gradle b/eventuate-tram-consumer-rabbitmq/build.gradle
index 1460b82e..5415283d 100644
--- a/eventuate-tram-consumer-rabbitmq/build.gradle
+++ b/eventuate-tram-consumer-rabbitmq/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-messaging")
diff --git a/eventuate-tram-consumer-redis/build.gradle b/eventuate-tram-consumer-redis/build.gradle
index c626a72a..f74e4497 100644
--- a/eventuate-tram-consumer-redis/build.gradle
+++ b/eventuate-tram-consumer-redis/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-messaging")
diff --git a/eventuate-tram-db-broker-integration-test/build.gradle b/eventuate-tram-db-broker-integration-test/build.gradle
index 0b62f159..c161e282 100644
--- a/eventuate-tram-db-broker-integration-test/build.gradle
+++ b/eventuate-tram-db-broker-integration-test/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-integration-test-common")
@@ -15,4 +14,4 @@ test {
         exclude '**/TramIntegrationCustomDBTest**'
     }
     forkEvery 1
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-events/build.gradle b/eventuate-tram-events/build.gradle
index 558ba67c..dbbc54b6 100644
--- a/eventuate-tram-events/build.gradle
+++ b/eventuate-tram-events/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-messaging")
diff --git a/eventuate-tram-in-memory-test/build.gradle b/eventuate-tram-in-memory-test/build.gradle
index ba286b3d..fabc3639 100644
--- a/eventuate-tram-in-memory-test/build.gradle
+++ b/eventuate-tram-in-memory-test/build.gradle
@@ -1,7 +1,6 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-in-memory")
 
     compile "junit:junit:4.12"
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-in-memory/build.gradle b/eventuate-tram-in-memory/build.gradle
index 3584884f..47441feb 100644
--- a/eventuate-tram-in-memory/build.gradle
+++ b/eventuate-tram-in-memory/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-messaging")
@@ -10,4 +9,4 @@ dependencies {
     compile "io.eventuate.common:eventuate-common-id:$eventuateCommonVersion"
     compile "com.h2database:h2:1.3.166"
     compile "io.eventuate.common:eventuate-common-in-memory-database:$eventuateCommonVersion"
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-integration-test-common/build.gradle b/eventuate-tram-integration-test-common/build.gradle
index 6ee896b9..9ae737c0 100644
--- a/eventuate-tram-integration-test-common/build.gradle
+++ b/eventuate-tram-integration-test-common/build.gradle
@@ -1,8 +1,7 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-spring-jdbc-kafka")
     compile project(":eventuate-tram-jdbc-rabbitmq")
     compile project(":eventuate-tram-jdbc-activemq")
     compile project(":eventuate-tram-jdbc-redis")
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-jdbc-activemq/build.gradle b/eventuate-tram-jdbc-activemq/build.gradle
index 710b21ec..26803679 100644
--- a/eventuate-tram-jdbc-activemq/build.gradle
+++ b/eventuate-tram-jdbc-activemq/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
 
@@ -8,4 +7,4 @@ dependencies {
     compile project(":eventuate-tram-consumer-activemq")
 
     compile "io.eventuate.messaging.activemq:eventuate-messaging-activemq-spring-consumer:$eventuateMessagingActiveMQVersion"
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-jdbc-rabbitmq/build.gradle b/eventuate-tram-jdbc-rabbitmq/build.gradle
index 1982c088..6771427a 100644
--- a/eventuate-tram-jdbc-rabbitmq/build.gradle
+++ b/eventuate-tram-jdbc-rabbitmq/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile "io.eventuate.messaging.rabbitmq:eventuate-messaging-rabbitmq-spring-consumer:$eventuateMessagingRabbitMQVersion"
@@ -7,4 +6,4 @@ dependencies {
     compile project(":eventuate-tram-spring-producer-jdbc")
     compile project(":eventuate-tram-spring-consumer-jdbc")
     compile project(":eventuate-tram-consumer-rabbitmq")
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-jdbc-redis/build.gradle b/eventuate-tram-jdbc-redis/build.gradle
index 6b8e84b0..2b9cc8c0 100644
--- a/eventuate-tram-jdbc-redis/build.gradle
+++ b/eventuate-tram-jdbc-redis/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile "io.eventuate.messaging.redis:eventuate-messaging-redis-spring-consumer:$eventuateMessagingRedisVersion"
@@ -7,4 +6,4 @@ dependencies {
     compile project(":eventuate-tram-spring-producer-jdbc")
     compile project(":eventuate-tram-spring-consumer-jdbc")
     compile project(":eventuate-tram-consumer-redis")
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-messaging-producer-common/build.gradle b/eventuate-tram-messaging-producer-common/build.gradle
index e08c8d68..d23d083d 100644
--- a/eventuate-tram-messaging-producer-common/build.gradle
+++ b/eventuate-tram-messaging-producer-common/build.gradle
@@ -1,7 +1,6 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-messaging")
 
     compile "org.slf4j:slf4j-api:1.7.18"
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-messaging/build.gradle b/eventuate-tram-messaging/build.gradle
index 4297f329..70acbf35 100644
--- a/eventuate-tram-messaging/build.gradle
+++ b/eventuate-tram-messaging/build.gradle
@@ -1,5 +1,4 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile "commons-lang:commons-lang:2.6"
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-micronaut-commands/build.gradle b/eventuate-tram-micronaut-commands/build.gradle
index f1ea0b26..dae2513e 100644
--- a/eventuate-tram-micronaut-commands/build.gradle
+++ b/eventuate-tram-micronaut-commands/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id "io.spring.dependency-management" version "1.0.6.RELEASE"
 }
 
-apply plugin: PrivateModulePlugin
 
 
 
diff --git a/eventuate-tram-micronaut-consumer-common/build.gradle b/eventuate-tram-micronaut-consumer-common/build.gradle
index a263621a..ebe63824 100644
--- a/eventuate-tram-micronaut-consumer-common/build.gradle
+++ b/eventuate-tram-micronaut-consumer-common/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id "io.spring.dependency-management" version "1.0.6.RELEASE"
 }
 
-apply plugin: PublicModulePlugin
 
 
 
diff --git a/eventuate-tram-micronaut-consumer-jdbc/build.gradle b/eventuate-tram-micronaut-consumer-jdbc/build.gradle
index a6614d54..311290d0 100644
--- a/eventuate-tram-micronaut-consumer-jdbc/build.gradle
+++ b/eventuate-tram-micronaut-consumer-jdbc/build.gradle
@@ -10,7 +10,6 @@ dependencyManagement {
     }
 }
 
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-consumer-jdbc")
diff --git a/eventuate-tram-micronaut-consumer-kafka/build.gradle b/eventuate-tram-micronaut-consumer-kafka/build.gradle
index b31dcc25..87772f8d 100644
--- a/eventuate-tram-micronaut-consumer-kafka/build.gradle
+++ b/eventuate-tram-micronaut-consumer-kafka/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id "io.spring.dependency-management" version "1.0.6.RELEASE"
 }
 
-apply plugin: PublicModulePlugin
 
 
 
diff --git a/eventuate-tram-micronaut-events/build.gradle b/eventuate-tram-micronaut-events/build.gradle
index 2588eb7e..4149be54 100644
--- a/eventuate-tram-micronaut-events/build.gradle
+++ b/eventuate-tram-micronaut-events/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id "io.spring.dependency-management" version "1.0.6.RELEASE"
 }
 
-apply plugin: PublicModulePlugin
 
 
 
diff --git a/eventuate-tram-micronaut-in-memory/build.gradle b/eventuate-tram-micronaut-in-memory/build.gradle
index b15580f6..1380b5b1 100644
--- a/eventuate-tram-micronaut-in-memory/build.gradle
+++ b/eventuate-tram-micronaut-in-memory/build.gradle
@@ -10,7 +10,6 @@ dependencyManagement {
     }
 }
 
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-in-memory")
diff --git a/eventuate-tram-micronaut-jdbc-kafka/build.gradle b/eventuate-tram-micronaut-jdbc-kafka/build.gradle
index 35469295..3e4b1458 100644
--- a/eventuate-tram-micronaut-jdbc-kafka/build.gradle
+++ b/eventuate-tram-micronaut-jdbc-kafka/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile "io.eventuate.messaging.kafka:eventuate-messaging-kafka-micronaut-consumer:$eventuateMessagingKafkaVersion"
@@ -7,4 +6,4 @@ dependencies {
     compile project(":eventuate-tram-micronaut-consumer-common")
     compile project(":eventuate-tram-micronaut-consumer-jdbc")
     compile project(":eventuate-tram-micronaut-consumer-kafka")
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-micronaut-messaging-producer-common/build.gradle b/eventuate-tram-micronaut-messaging-producer-common/build.gradle
index 3959b8ce..06ec13da 100644
--- a/eventuate-tram-micronaut-messaging-producer-common/build.gradle
+++ b/eventuate-tram-micronaut-messaging-producer-common/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id "io.spring.dependency-management" version "1.0.6.RELEASE"
 }
 
-apply plugin: PublicModulePlugin
 
 
 
diff --git a/eventuate-tram-micronaut-messaging/build.gradle b/eventuate-tram-micronaut-messaging/build.gradle
index b89a4478..49643159 100644
--- a/eventuate-tram-micronaut-messaging/build.gradle
+++ b/eventuate-tram-micronaut-messaging/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id "io.spring.dependency-management" version "1.0.6.RELEASE"
 }
 
-apply plugin: PublicModulePlugin
 
 
 
diff --git a/eventuate-tram-micronaut-producer-jdbc/build.gradle b/eventuate-tram-micronaut-producer-jdbc/build.gradle
index aa52b2fe..9a09c02f 100644
--- a/eventuate-tram-micronaut-producer-jdbc/build.gradle
+++ b/eventuate-tram-micronaut-producer-jdbc/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id "io.spring.dependency-management" version "1.0.6.RELEASE"
 }
 
-apply plugin: PublicModulePlugin
 
 
 
diff --git a/eventuate-tram-micronaut-spring-jdbc-optimistic-locking/build.gradle b/eventuate-tram-micronaut-spring-jdbc-optimistic-locking/build.gradle
index 97c5e1a0..563fe918 100644
--- a/eventuate-tram-micronaut-spring-jdbc-optimistic-locking/build.gradle
+++ b/eventuate-tram-micronaut-spring-jdbc-optimistic-locking/build.gradle
@@ -10,7 +10,6 @@ dependencyManagement {
     }
 }
 
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-consumer-common")
diff --git a/eventuate-tram-producer-jdbc/build.gradle b/eventuate-tram-producer-jdbc/build.gradle
index d2a3ddea..3980dc6a 100644
--- a/eventuate-tram-producer-jdbc/build.gradle
+++ b/eventuate-tram-producer-jdbc/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-messaging-producer-common")
diff --git a/eventuate-tram-spring-cloud-sleuth-integration/build.gradle b/eventuate-tram-spring-cloud-sleuth-integration/build.gradle
index 3d97ac14..52957c05 100644
--- a/eventuate-tram-spring-cloud-sleuth-integration/build.gradle
+++ b/eventuate-tram-spring-cloud-sleuth-integration/build.gradle
@@ -6,7 +6,6 @@ buildscript {
             url 'https://repo.spring.io/libs-milestone'
         }
     }
-apply plugin: PublicModulePlugin
 
     dependencies {
         classpath "io.spring.gradle:dependency-management-plugin:$springDependencyManagementPluginVersion"
@@ -31,7 +30,6 @@ dependencyManagement {
     }
 }
 
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-messaging")
@@ -49,4 +47,4 @@ dependencies {
     testCompile "io.eventuate.util:eventuate-util-test:$eventuateUtilVersion"
 
 
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-spring-commands-consumer/build.gradle b/eventuate-tram-spring-commands-consumer/build.gradle
index 59973587..c35f0c04 100644
--- a/eventuate-tram-spring-commands-consumer/build.gradle
+++ b/eventuate-tram-spring-commands-consumer/build.gradle
@@ -1,8 +1,7 @@
-apply plugin: PrivateModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-commands")
     compile project(":eventuate-tram-spring-messaging")
 
     compile "org.springframework.boot:spring-boot-starter:$springBootVersion"
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-spring-commands-producer/build.gradle b/eventuate-tram-spring-commands-producer/build.gradle
index 59973587..c35f0c04 100644
--- a/eventuate-tram-spring-commands-producer/build.gradle
+++ b/eventuate-tram-spring-commands-producer/build.gradle
@@ -1,8 +1,7 @@
-apply plugin: PrivateModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-commands")
     compile project(":eventuate-tram-spring-messaging")
 
     compile "org.springframework.boot:spring-boot-starter:$springBootVersion"
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-spring-commands-starter/build.gradle b/eventuate-tram-spring-commands-starter/build.gradle
index b06fb057..23102329 100644
--- a/eventuate-tram-spring-commands-starter/build.gradle
+++ b/eventuate-tram-spring-commands-starter/build.gradle
@@ -1,6 +1,5 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-spring-messaging-starter")
     compile project(":eventuate-tram-spring-commands")
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-spring-commands/build.gradle b/eventuate-tram-spring-commands/build.gradle
index 59973587..c35f0c04 100644
--- a/eventuate-tram-spring-commands/build.gradle
+++ b/eventuate-tram-spring-commands/build.gradle
@@ -1,8 +1,7 @@
-apply plugin: PrivateModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-commands")
     compile project(":eventuate-tram-spring-messaging")
 
     compile "org.springframework.boot:spring-boot-starter:$springBootVersion"
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-spring-consumer-common/build.gradle b/eventuate-tram-spring-consumer-common/build.gradle
index a93a004b..cffd50e2 100644
--- a/eventuate-tram-spring-consumer-common/build.gradle
+++ b/eventuate-tram-spring-consumer-common/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-consumer-common")
diff --git a/eventuate-tram-spring-consumer-jdbc/build.gradle b/eventuate-tram-spring-consumer-jdbc/build.gradle
index 5a868a34..9bfec5e0 100644
--- a/eventuate-tram-spring-consumer-jdbc/build.gradle
+++ b/eventuate-tram-spring-consumer-jdbc/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-consumer-jdbc")
@@ -6,4 +5,4 @@ dependencies {
     compile "io.eventuate.common:eventuate-common-spring-jdbc:$eventuateCommonVersion"
 
     testCompile "org.springframework.boot:spring-boot-starter-test:$springBootCdcVersion"
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-spring-consumer-kafka/build.gradle b/eventuate-tram-spring-consumer-kafka/build.gradle
index 6f37d549..0ecf7c48 100644
--- a/eventuate-tram-spring-consumer-kafka/build.gradle
+++ b/eventuate-tram-spring-consumer-kafka/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-spring-consumer-common")
diff --git a/eventuate-tram-spring-events-common/build.gradle b/eventuate-tram-spring-events-common/build.gradle
index 668d4118..18e366eb 100644
--- a/eventuate-tram-spring-events-common/build.gradle
+++ b/eventuate-tram-spring-events-common/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-events")
diff --git a/eventuate-tram-spring-events-publisher-starter/build.gradle b/eventuate-tram-spring-events-publisher-starter/build.gradle
index 1c4acb25..5614573e 100644
--- a/eventuate-tram-spring-events-publisher-starter/build.gradle
+++ b/eventuate-tram-spring-events-publisher-starter/build.gradle
@@ -1,6 +1,5 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-spring-messaging-starter")
     compile project(":eventuate-tram-spring-events")
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-spring-events-publisher/build.gradle b/eventuate-tram-spring-events-publisher/build.gradle
index e17e8f31..90c57d44 100644
--- a/eventuate-tram-spring-events-publisher/build.gradle
+++ b/eventuate-tram-spring-events-publisher/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-events")
diff --git a/eventuate-tram-spring-events-starter/build.gradle b/eventuate-tram-spring-events-starter/build.gradle
index d9d15317..5099a615 100644
--- a/eventuate-tram-spring-events-starter/build.gradle
+++ b/eventuate-tram-spring-events-starter/build.gradle
@@ -1,6 +1,5 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-spring-events-publisher-starter")
     compile project(":eventuate-tram-spring-events-subscriber-starter")
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-spring-events-subscriber-starter/build.gradle b/eventuate-tram-spring-events-subscriber-starter/build.gradle
index 1c4acb25..5614573e 100644
--- a/eventuate-tram-spring-events-subscriber-starter/build.gradle
+++ b/eventuate-tram-spring-events-subscriber-starter/build.gradle
@@ -1,6 +1,5 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-spring-messaging-starter")
     compile project(":eventuate-tram-spring-events")
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-spring-events-subscriber/build.gradle b/eventuate-tram-spring-events-subscriber/build.gradle
index e17e8f31..90c57d44 100644
--- a/eventuate-tram-spring-events-subscriber/build.gradle
+++ b/eventuate-tram-spring-events-subscriber/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-events")
diff --git a/eventuate-tram-spring-events/build.gradle b/eventuate-tram-spring-events/build.gradle
index ee995de3..00a69778 100644
--- a/eventuate-tram-spring-events/build.gradle
+++ b/eventuate-tram-spring-events/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-spring-events-publisher")
diff --git a/eventuate-tram-spring-in-memory/build.gradle b/eventuate-tram-spring-in-memory/build.gradle
index dfd09517..217e7a55 100644
--- a/eventuate-tram-spring-in-memory/build.gradle
+++ b/eventuate-tram-spring-in-memory/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-in-memory")
@@ -17,4 +16,4 @@ dependencies {
 
     testCompile "org.springframework.boot:spring-boot-starter-test:$springBootCdcVersion"
 
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-spring-jdbc-kafka/build.gradle b/eventuate-tram-spring-jdbc-kafka/build.gradle
index 928a4d89..822a8833 100644
--- a/eventuate-tram-spring-jdbc-kafka/build.gradle
+++ b/eventuate-tram-spring-jdbc-kafka/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile "io.eventuate.messaging.kafka:eventuate-messaging-kafka-spring-consumer:$eventuateMessagingKafkaVersion"
@@ -7,4 +6,4 @@ dependencies {
     compile project(":eventuate-tram-spring-consumer-common")
     compile project(":eventuate-tram-spring-consumer-jdbc")
     compile project(":eventuate-tram-spring-consumer-kafka")
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-spring-messaging-producer-common/build.gradle b/eventuate-tram-spring-messaging-producer-common/build.gradle
index 85cf034d..1ec640cf 100644
--- a/eventuate-tram-spring-messaging-producer-common/build.gradle
+++ b/eventuate-tram-spring-messaging-producer-common/build.gradle
@@ -1,8 +1,7 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-messaging-producer-common")
     compile project(":eventuate-tram-spring-messaging")
 
     compile "org.springframework.boot:spring-boot-starter:$springBootVersion"
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-spring-messaging-starter/build.gradle b/eventuate-tram-spring-messaging-starter/build.gradle
index b783e8d8..fd10092b 100644
--- a/eventuate-tram-spring-messaging-starter/build.gradle
+++ b/eventuate-tram-spring-messaging-starter/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
 
@@ -8,4 +7,4 @@ dependencies {
     compileOnly project(":eventuate-tram-consumer-rabbitmq")
     compileOnly project(":eventuate-tram-consumer-redis")
 
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-spring-messaging/build.gradle b/eventuate-tram-spring-messaging/build.gradle
index 12e0efdc..e46116b3 100644
--- a/eventuate-tram-spring-messaging/build.gradle
+++ b/eventuate-tram-spring-messaging/build.gradle
@@ -1,7 +1,6 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project (":eventuate-tram-messaging")
 
     compile "org.springframework.boot:spring-boot-starter:$springBootVersion"
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-spring-optimistic-locking/build.gradle b/eventuate-tram-spring-optimistic-locking/build.gradle
index 4f344e72..9ddf100c 100644
--- a/eventuate-tram-spring-optimistic-locking/build.gradle
+++ b/eventuate-tram-spring-optimistic-locking/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project (":eventuate-tram-consumer-common")
@@ -9,4 +8,4 @@ dependencies {
     compile "org.springframework.boot:spring-boot-starter-data-jpa:$springBootCdcVersion"
 
     testCompile "org.springframework.boot:spring-boot-starter-test:$springBootCdcVersion"
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-spring-producer-jdbc/build.gradle b/eventuate-tram-spring-producer-jdbc/build.gradle
index 99b03070..c97ace16 100644
--- a/eventuate-tram-spring-producer-jdbc/build.gradle
+++ b/eventuate-tram-spring-producer-jdbc/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-producer-jdbc")
diff --git a/eventuate-tram-spring-testing-support-cloud-contract/build.gradle b/eventuate-tram-spring-testing-support-cloud-contract/build.gradle
index d1438580..e921e147 100644
--- a/eventuate-tram-spring-testing-support-cloud-contract/build.gradle
+++ b/eventuate-tram-spring-testing-support-cloud-contract/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 buildscript {
     repositories {
diff --git a/eventuate-tram-test-util/build.gradle b/eventuate-tram-test-util/build.gradle
index d2b8e342..2bb071da 100644
--- a/eventuate-tram-test-util/build.gradle
+++ b/eventuate-tram-test-util/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-events")
@@ -6,4 +5,4 @@ dependencies {
 
     compile "io.eventuate.util:eventuate-util-test:$eventuateUtilVersion"
     compile "junit:junit:4.12"
-}
\ No newline at end of file
+}
diff --git a/eventuate-tram-testing-support/build.gradle b/eventuate-tram-testing-support/build.gradle
index d3f97fd0..a53be472 100644
--- a/eventuate-tram-testing-support/build.gradle
+++ b/eventuate-tram-testing-support/build.gradle
@@ -1,4 +1,3 @@
-apply plugin: PublicModulePlugin
 
 dependencies {
     compile project(":eventuate-tram-messaging")
diff --git a/gradle.properties b/gradle.properties
index 7d257146..f7a7e8d8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ bintrayRepoType=defineMe
 bintrayPkgName=eventuate-tram
 bintrayPkgVcsUrl=https://github.com/eventuate-tram/eventuate-tram-core
 
-eventuateMavenRepoUrl=https://dl.bintray.com/eventuateio-oss/eventuate-maven-release,https://dl.bintray.com/eventuateio-oss/eventuate-maven-rc,https://dl.bintray.com/eventuateio-oss/eventuate-maven-milestone,file:///Users/cer/.m2/testdeploy,https://snapshots.repositories.eventuate.io/repository
+eventuateMavenRepoUrl=file:///Users/cer/.m2/testdeploy,https://dl.bintray.com/eventuateio-oss/eventuate-maven-release,https://snapshots.repositories.eventuate.io/repository
 
 eventuatePluginsGradleVersion=0.4.0.BUILD-SNAPSHOT
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 59388a90..fa0aa696 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip