From 4feb91c6fbb29bc2b22f0af6e3f700200ff314fe Mon Sep 17 00:00:00 2001 From: Florian Hussonnois Date: Thu, 18 Apr 2024 09:04:40 +0200 Subject: [PATCH] build(gradle): use gradle configurations for micronaut deps --- build.gradle | 30 ++++++++++++++++-------------- cli/build.gradle | 3 +++ core/build.gradle | 1 + jdbc-h2/build.gradle | 4 ++++ jdbc-mysql/build.gradle | 4 ++++ jdbc-postgres/build.gradle | 4 ++++ jdbc/build.gradle | 4 ++++ model/build.gradle | 1 - processor/build.gradle | 14 -------------- repository-memory/build.gradle | 4 ++++ runner-memory/build.gradle | 4 ++++ storage-local/build.gradle | 4 ++++ webserver/build.gradle | 4 ++++ 13 files changed, 52 insertions(+), 29 deletions(-) diff --git a/build.gradle b/build.gradle index 2071e193cb..c57f5cbf6a 100644 --- a/build.gradle +++ b/build.gradle @@ -66,6 +66,7 @@ allprojects { configurations { developmentOnly // for dependencies that are needed for development only + micronaut } // @@ -99,6 +100,7 @@ allprojects { } } + // dependencies dependencies { // lombok @@ -111,18 +113,18 @@ allprojects { annotationProcessor "io.micronaut.validation:micronaut-validation-processor" implementation platform("io.micronaut.platform:micronaut-platform:$micronautVersion") - implementation "io.micronaut:micronaut-inject" - implementation "io.micronaut.validation:micronaut-validation" - implementation "io.micronaut.beanvalidation:micronaut-hibernate-validator" - implementation "io.micronaut:micronaut-runtime" - implementation "io.micronaut:micronaut-retry" - implementation "io.micronaut:micronaut-jackson-databind" - implementation "io.micronaut.data:micronaut-data-model" - implementation "io.micronaut:micronaut-management" - implementation "io.micrometer:micrometer-core" - implementation "io.micronaut.micrometer:micronaut-micrometer-registry-prometheus" - implementation "io.micronaut:micronaut-http-client" - implementation "io.micronaut.reactor:micronaut-reactor-http-client" + micronaut "io.micronaut:micronaut-inject" + micronaut "io.micronaut.validation:micronaut-validation" + micronaut "io.micronaut.beanvalidation:micronaut-hibernate-validator" + micronaut "io.micronaut:micronaut-runtime" + micronaut "io.micronaut:micronaut-retry" + micronaut "io.micronaut:micronaut-jackson-databind" + micronaut "io.micronaut.data:micronaut-data-model" + micronaut "io.micronaut:micronaut-management" + micronaut "io.micrometer:micrometer-core" + micronaut "io.micronaut.micrometer:micronaut-micrometer-registry-prometheus" + micronaut "io.micronaut:micronaut-http-client" + micronaut "io.micronaut.reactor:micronaut-reactor-http-client" // logs implementation "org.slf4j:slf4j-api" @@ -249,7 +251,7 @@ run.jvmArgs( **********************************************************************************************************************/ jar { manifest { - attributes ( + attributes( "Main-Class": mainClassName, "X-Kestra-Name": project.name, "X-Kestra-Title": project.name, @@ -277,7 +279,7 @@ shadowJar.dependsOn 'ui:assembleFrontend' def executableDir = file("${buildDir}/executable") def executable = file("${buildDir}/executable/${project.name}-${project.version}") -task writeExecutableJar() { +task writeExecutableJar() { group "build" description "Write an executable jar from shadow jar" dependsOn = [shadowJar] diff --git a/cli/build.gradle b/cli/build.gradle index 21a5dda464..200df06269 100644 --- a/cli/build.gradle +++ b/cli/build.gradle @@ -1,3 +1,6 @@ +configurations { + implementation.extendsFrom(micronaut) +} dependencies { // micronaut implementation "info.picocli:picocli" diff --git a/core/build.gradle b/core/build.gradle index 6579116ed7..b6144f028c 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -1,5 +1,6 @@ configurations { tests + implementation.extendsFrom(micronaut) } task copyGradleProperties(type: Copy) { diff --git a/jdbc-h2/build.gradle b/jdbc-h2/build.gradle index a7ccd497c1..10d4a1157f 100644 --- a/jdbc-h2/build.gradle +++ b/jdbc-h2/build.gradle @@ -1,5 +1,9 @@ publishSonatypePublicationPublicationToSonatypeRepository.enabled = false +configurations { + implementation.extendsFrom(micronaut) +} + dependencies { implementation project(":core") implementation project(":jdbc") diff --git a/jdbc-mysql/build.gradle b/jdbc-mysql/build.gradle index 0bde46a24a..ee2366c9d8 100644 --- a/jdbc-mysql/build.gradle +++ b/jdbc-mysql/build.gradle @@ -1,5 +1,9 @@ publishSonatypePublicationPublicationToSonatypeRepository.enabled = false + configurations { + compileClasspath.extendsFrom(micronaut) + } + dependencies { implementation project(":core") implementation project(":jdbc") diff --git a/jdbc-postgres/build.gradle b/jdbc-postgres/build.gradle index b423b97b2d..75fad8130d 100644 --- a/jdbc-postgres/build.gradle +++ b/jdbc-postgres/build.gradle @@ -1,5 +1,9 @@ publishSonatypePublicationPublicationToSonatypeRepository.enabled = false +configurations { + implementation.extendsFrom(micronaut) +} + dependencies { implementation project(":core") implementation project(":jdbc") diff --git a/jdbc/build.gradle b/jdbc/build.gradle index 1986e9b87a..74dd480809 100644 --- a/jdbc/build.gradle +++ b/jdbc/build.gradle @@ -1,3 +1,7 @@ +configurations { + implementation.extendsFrom(micronaut) +} + dependencies { implementation project(":core") diff --git a/model/build.gradle b/model/build.gradle index a725676cff..c52bbb8bd4 100644 --- a/model/build.gradle +++ b/model/build.gradle @@ -8,5 +8,4 @@ dependencies { api 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' api 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310' api 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8' - } diff --git a/processor/build.gradle b/processor/build.gradle index 63148f1499..7f0335b524 100644 --- a/processor/build.gradle +++ b/processor/build.gradle @@ -1,17 +1,3 @@ -configurations { - tests -} - -task copyGradleProperties(type: Copy) { - group = "build" - shouldRunAfter compileJava - - from '../gradle.properties' - into 'src/main/resources' -} - -processResources.dependsOn copyGradleProperties - dependencies { // Kestra api project(':model') diff --git a/repository-memory/build.gradle b/repository-memory/build.gradle index d296e3ce1b..f0c569db7a 100644 --- a/repository-memory/build.gradle +++ b/repository-memory/build.gradle @@ -1,3 +1,7 @@ +configurations { + implementation.extendsFrom(micronaut) +} + dependencies { implementation project(":core") diff --git a/runner-memory/build.gradle b/runner-memory/build.gradle index 1b7ee74a7c..863a560609 100644 --- a/runner-memory/build.gradle +++ b/runner-memory/build.gradle @@ -1,3 +1,7 @@ +configurations { + implementation.extendsFrom(micronaut) +} + dependencies { implementation project(":core") diff --git a/storage-local/build.gradle b/storage-local/build.gradle index def0563670..846415411e 100644 --- a/storage-local/build.gradle +++ b/storage-local/build.gradle @@ -1,3 +1,7 @@ +configurations { + implementation.extendsFrom(micronaut) +} + dependencies { annotationProcessor project(":processor") implementation project(":core") diff --git a/webserver/build.gradle b/webserver/build.gradle index d5d499e0d2..3241fa5e39 100644 --- a/webserver/build.gradle +++ b/webserver/build.gradle @@ -6,6 +6,10 @@ if (rootProject.name == "kestra") { } } +configurations { + implementation.extendsFrom(micronaut) +} + dependencies { annotationProcessor "io.micronaut.openapi:micronaut-openapi"