Skip to content

Commit

Permalink
Upgraded Gradle Wrapper, eliminated redundant JavaDoc plugins, and Re…
Browse files Browse the repository at this point in the history
…moved bintray plugin
  • Loading branch information
cer committed Mar 18, 2021
1 parent 580a7f6 commit d4c8fa9
Show file tree
Hide file tree
Showing 62 changed files with 32 additions and 139 deletions.
4 changes: 0 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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) {
Expand Down
18 changes: 0 additions & 18 deletions buildSrc/src/main/groovy/PrivateModulePlugin.groovy

This file was deleted.

27 changes: 0 additions & 27 deletions buildSrc/src/main/groovy/PublicModulePlugin.groovy

This file was deleted.

1 change: 0 additions & 1 deletion eventuate-tram-aggregate-domain-events/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
apply plugin: PublicModulePlugin

dependencies {
compile project(":eventuate-tram-events")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
apply plugin: PrivateModulePlugin

dependencies {
compile project(":eventuate-tram-producer-jdbc")
Expand All @@ -16,4 +15,4 @@ test {
exclude '**/TramCommandsDBBrokerIntegrationCustomDBTest**'
}
forkEvery 1
}
}
3 changes: 1 addition & 2 deletions eventuate-tram-commands/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
apply plugin: PrivateModulePlugin

dependencies {
compile project(":eventuate-tram-messaging")

compile "io.eventuate.common:eventuate-common-json-mapper:$eventuateCommonVersion"
}
}
3 changes: 1 addition & 2 deletions eventuate-tram-common-spring-in-memory/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
apply plugin: PublicModulePlugin

dependencies {
compile project(":eventuate-tram-in-memory")
compile "org.springframework.boot:spring-boot-starter-jdbc:$springBootCdcVersion"
}
}
1 change: 0 additions & 1 deletion eventuate-tram-consumer-activemq/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
apply plugin: PublicModulePlugin

dependencies {
compile project(":eventuate-tram-messaging")
Expand Down
1 change: 0 additions & 1 deletion eventuate-tram-consumer-common/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
apply plugin: PublicModulePlugin

dependencies {
compile project(":eventuate-tram-messaging")
Expand Down
3 changes: 1 addition & 2 deletions eventuate-tram-consumer-jdbc/build.gradle
Original file line number Diff line number Diff line change
@@ -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")
}
}
1 change: 0 additions & 1 deletion eventuate-tram-consumer-kafka/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
apply plugin: PublicModulePlugin

dependencies {
compile project(":eventuate-tram-messaging")
Expand Down
1 change: 0 additions & 1 deletion eventuate-tram-consumer-rabbitmq/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
apply plugin: PublicModulePlugin

dependencies {
compile project(":eventuate-tram-messaging")
Expand Down
1 change: 0 additions & 1 deletion eventuate-tram-consumer-redis/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
apply plugin: PublicModulePlugin

dependencies {
compile project(":eventuate-tram-messaging")
Expand Down
3 changes: 1 addition & 2 deletions eventuate-tram-db-broker-integration-test/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
apply plugin: PublicModulePlugin

dependencies {
compile project(":eventuate-tram-integration-test-common")
Expand All @@ -15,4 +14,4 @@ test {
exclude '**/TramIntegrationCustomDBTest**'
}
forkEvery 1
}
}
1 change: 0 additions & 1 deletion eventuate-tram-events/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
apply plugin: PublicModulePlugin

dependencies {
compile project(":eventuate-tram-messaging")
Expand Down
3 changes: 1 addition & 2 deletions eventuate-tram-in-memory-test/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
apply plugin: PublicModulePlugin

dependencies {
compile project(":eventuate-tram-in-memory")

compile "junit:junit:4.12"
}
}
3 changes: 1 addition & 2 deletions eventuate-tram-in-memory/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
apply plugin: PublicModulePlugin

dependencies {
compile project(":eventuate-tram-messaging")
Expand All @@ -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"
}
}
3 changes: 1 addition & 2 deletions eventuate-tram-integration-test-common/build.gradle
Original file line number Diff line number Diff line change
@@ -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")
}
}
3 changes: 1 addition & 2 deletions eventuate-tram-jdbc-activemq/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
apply plugin: PublicModulePlugin

dependencies {

Expand All @@ -8,4 +7,4 @@ dependencies {
compile project(":eventuate-tram-consumer-activemq")

compile "io.eventuate.messaging.activemq:eventuate-messaging-activemq-spring-consumer:$eventuateMessagingActiveMQVersion"
}
}
3 changes: 1 addition & 2 deletions eventuate-tram-jdbc-rabbitmq/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
apply plugin: PublicModulePlugin

dependencies {
compile "io.eventuate.messaging.rabbitmq:eventuate-messaging-rabbitmq-spring-consumer:$eventuateMessagingRabbitMQVersion"
Expand All @@ -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")
}
}
3 changes: 1 addition & 2 deletions eventuate-tram-jdbc-redis/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
apply plugin: PublicModulePlugin

dependencies {
compile "io.eventuate.messaging.redis:eventuate-messaging-redis-spring-consumer:$eventuateMessagingRedisVersion"
Expand All @@ -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")
}
}
3 changes: 1 addition & 2 deletions eventuate-tram-messaging-producer-common/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
apply plugin: PublicModulePlugin

dependencies {
compile project(":eventuate-tram-messaging")

compile "org.slf4j:slf4j-api:1.7.18"
}
}
3 changes: 1 addition & 2 deletions eventuate-tram-messaging/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
apply plugin: PublicModulePlugin

dependencies {
compile "commons-lang:commons-lang:2.6"
}
}
1 change: 0 additions & 1 deletion eventuate-tram-micronaut-commands/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ plugins {
id "io.spring.dependency-management" version "1.0.6.RELEASE"
}

apply plugin: PrivateModulePlugin



Expand Down
1 change: 0 additions & 1 deletion eventuate-tram-micronaut-consumer-common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ plugins {
id "io.spring.dependency-management" version "1.0.6.RELEASE"
}

apply plugin: PublicModulePlugin



Expand Down
1 change: 0 additions & 1 deletion eventuate-tram-micronaut-consumer-jdbc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencyManagement {
}
}

apply plugin: PublicModulePlugin

dependencies {
compile project(":eventuate-tram-consumer-jdbc")
Expand Down
1 change: 0 additions & 1 deletion eventuate-tram-micronaut-consumer-kafka/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ plugins {
id "io.spring.dependency-management" version "1.0.6.RELEASE"
}

apply plugin: PublicModulePlugin



Expand Down
1 change: 0 additions & 1 deletion eventuate-tram-micronaut-events/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ plugins {
id "io.spring.dependency-management" version "1.0.6.RELEASE"
}

apply plugin: PublicModulePlugin



Expand Down
1 change: 0 additions & 1 deletion eventuate-tram-micronaut-in-memory/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencyManagement {
}
}

apply plugin: PublicModulePlugin

dependencies {
compile project(":eventuate-tram-in-memory")
Expand Down
3 changes: 1 addition & 2 deletions eventuate-tram-micronaut-jdbc-kafka/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
apply plugin: PublicModulePlugin

dependencies {
compile "io.eventuate.messaging.kafka:eventuate-messaging-kafka-micronaut-consumer:$eventuateMessagingKafkaVersion"
Expand All @@ -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")
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ plugins {
id "io.spring.dependency-management" version "1.0.6.RELEASE"
}

apply plugin: PublicModulePlugin



Expand Down
1 change: 0 additions & 1 deletion eventuate-tram-micronaut-messaging/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ plugins {
id "io.spring.dependency-management" version "1.0.6.RELEASE"
}

apply plugin: PublicModulePlugin



Expand Down
1 change: 0 additions & 1 deletion eventuate-tram-micronaut-producer-jdbc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ plugins {
id "io.spring.dependency-management" version "1.0.6.RELEASE"
}

apply plugin: PublicModulePlugin



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencyManagement {
}
}

apply plugin: PublicModulePlugin

dependencies {
compile project(":eventuate-tram-consumer-common")
Expand Down
1 change: 0 additions & 1 deletion eventuate-tram-producer-jdbc/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
apply plugin: PublicModulePlugin

dependencies {
compile project(":eventuate-tram-messaging-producer-common")
Expand Down
4 changes: 1 addition & 3 deletions eventuate-tram-spring-cloud-sleuth-integration/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ buildscript {
url 'https://repo.spring.io/libs-milestone'
}
}
apply plugin: PublicModulePlugin

dependencies {
classpath "io.spring.gradle:dependency-management-plugin:$springDependencyManagementPluginVersion"
Expand All @@ -31,7 +30,6 @@ dependencyManagement {
}
}

apply plugin: PublicModulePlugin

dependencies {
compile project(":eventuate-tram-messaging")
Expand All @@ -49,4 +47,4 @@ dependencies {
testCompile "io.eventuate.util:eventuate-util-test:$eventuateUtilVersion"


}
}
3 changes: 1 addition & 2 deletions eventuate-tram-spring-commands-consumer/build.gradle
Original file line number Diff line number Diff line change
@@ -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"
}
}
3 changes: 1 addition & 2 deletions eventuate-tram-spring-commands-producer/build.gradle
Original file line number Diff line number Diff line change
@@ -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"
}
}
3 changes: 1 addition & 2 deletions eventuate-tram-spring-commands-starter/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
apply plugin: PublicModulePlugin

dependencies {
compile project(":eventuate-tram-spring-messaging-starter")
compile project(":eventuate-tram-spring-commands")
}
}
Loading

0 comments on commit d4c8fa9

Please sign in to comment.