From 21c0ed35521596062c4f79b4489b5394a7d3049c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mathieu?= Date: Fri, 21 Jun 2024 13:55:29 +0200 Subject: [PATCH] chore: use Kestra Platform --- build.gradle | 35 +++++++++++++++++++++++------------ gradle.properties | 4 +--- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index 3c9d2c3..14ea2d9 100644 --- a/build.gradle +++ b/build.gradle @@ -34,17 +34,22 @@ tasks.withType(JavaCompile) { } dependencies { + // Platform + annotationProcessor enforcedPlatform("io.kestra:platform:$kestraVersion") + implementation enforcedPlatform("io.kestra:platform:$kestraVersion") + api enforcedPlatform("io.kestra:platform:$kestraVersion") + // lombok - annotationProcessor "org.projectlombok:lombok:$lombokVersion" - compileOnly "org.projectlombok:lombok:$lombokVersion" + annotationProcessor "org.projectlombok:lombok" + compileOnly "org.projectlombok:lombok:" // kestra annotationProcessor group: "io.kestra", name: "processor", version: kestraVersion compileOnly group: "io.kestra", name: "core", version: kestraVersion // Logs - compileOnly 'org.slf4j:slf4j-api:2.0.13' - compileOnly 'ch.qos.logback:logback-classic:1.5.6' + compileOnly 'org.slf4j:slf4j-api' + compileOnly 'ch.qos.logback:logback-classic' // tika plugins api (group: 'org.apache.tika', name: 'tika-core', version: '2.9.2') { @@ -73,16 +78,17 @@ testlogger { } dependencies { + // Platform + testAnnotationProcessor enforcedPlatform("io.kestra:platform:$kestraVersion") + testImplementation enforcedPlatform("io.kestra:platform:$kestraVersion") + // lombok - testAnnotationProcessor "org.projectlombok:lombok:" + lombokVersion - testCompileOnly 'org.projectlombok:lombok:' + lombokVersion + testAnnotationProcessor "org.projectlombok:lombok" + testCompileOnly 'org.projectlombok:lombok' // micronaut - testAnnotationProcessor platform("io.micronaut.platform:micronaut-platform:$micronautVersion") testAnnotationProcessor "io.micronaut:micronaut-inject-java" testAnnotationProcessor "io.micronaut.validation:micronaut-validation-processor" - - testImplementation platform("io.micronaut.platform:micronaut-platform:$micronautVersion") testImplementation "io.micronaut.test:micronaut-test-junit5" // test deps needed only for to have a runner @@ -95,8 +101,8 @@ dependencies { // test testImplementation "org.junit.jupiter:junit-jupiter-engine" - testImplementation "org.hamcrest:hamcrest:2.2" - testImplementation "org.hamcrest:hamcrest-library:2.2" + testImplementation "org.hamcrest:hamcrest" + testImplementation "org.hamcrest:hamcrest-library" testImplementation "org.junit.jupiter:junit-jupiter-params" } @@ -105,7 +111,7 @@ dependencies { * Allure Reports **********************************************************************************************************************/ dependencies { - testImplementation platform("io.qameta.allure:allure-bom:2.27.0") + testImplementation enforcedPlatform("io.kestra:platform:$kestraVersion") testImplementation "io.qameta.allure:allure-junit5" } @@ -149,6 +155,11 @@ nexusPublishing { } } +tasks.withType(GenerateModuleMetadata).configureEach { + // Suppression this validation error as we want to enforce the Kestra platform + suppressedValidationErrors.add('enforced-platform') +} + jar { manifest { attributes( diff --git a/gradle.properties b/gradle.properties index b80f54c..6b04bf0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,2 @@ version=0.18.0-SNAPSHOT -kestraVersion=[0.17,) -micronautVersion=4.4.3 -lombokVersion=1.18.32 +kestraVersion=[0.18,)