feat: Micronaut 4

kestra-io · Jan 30, 2024 · 9e8f089 · 9e8f089
1 parent dcf0a8d
commit 9e8f089
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 19 deletions.
diff --git a/build.gradle b/build.gradle
@@ -14,6 +14,7 @@ plugins {
 def isBuildSnapshot = version.toString().endsWith("-SNAPSHOT")
 
 repositories {
+    mavenLocal()
     mavenCentral()
     if (isBuildSnapshot) {
         maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
@@ -31,32 +32,27 @@ tasks.withType(JavaCompile) {
     options.compilerArgs.add("-parameters")
 }
 
-configurations.all {
-    resolutionStrategy {
-        force("org.slf4j:slf4j-api:1.7.36")
-    }
-}
-
 dependencies {
     // lombok
     annotationProcessor "org.projectlombok:lombok:$lombokVersion"
     compileOnly "org.projectlombok:lombok:$lombokVersion"
 
     // micronaut
-    annotationProcessor platform("io.micronaut:micronaut-bom:$micronautVersion")
+    annotationProcessor platform("io.micronaut.platform:micronaut-platform:$micronautVersion")
     annotationProcessor "io.micronaut:micronaut-inject-java"
-    annotationProcessor "io.micronaut:micronaut-validation"
-    compileOnly platform("io.micronaut:micronaut-bom:$micronautVersion")
+    annotationProcessor "io.micronaut.validation:micronaut-validation-processor"
+
+    compileOnly platform("io.micronaut.platform:micronaut-platform:$micronautVersion")
     compileOnly "io.micronaut:micronaut-inject"
-    compileOnly "io.micronaut:micronaut-validation"
+    compileOnly "io.micronaut.validation:micronaut-validation"
 
     // kestra
     compileOnly group: "io.kestra", name: "core", version: kestraVersion
     implementation group: "io.kestra.plugin", name: "plugin-script", version: kestraVersion
 
     // git
-    api 'org.eclipse.jgit:org.eclipse.jgit:6.6.0.202305301015-r'
-    api 'org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:6.6.0.202305301015-r'
+    api 'org.eclipse.jgit:org.eclipse.jgit:6.8.0.202311291450-r'
+    api 'org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:6.8.0.202311291450-r'
 }
 
 
@@ -77,10 +73,18 @@ testlogger {
 }
 
 dependencies {
-    testAnnotationProcessor platform("io.micronaut:micronaut-bom:$micronautVersion")
+    // lombok
+    testAnnotationProcessor "org.projectlombok:lombok:" + lombokVersion
+    testCompileOnly 'org.projectlombok:lombok:' + lombokVersion
+
+    // micronaut
+    testAnnotationProcessor platform("io.micronaut.platform:micronaut-platform:$micronautVersion")
     testAnnotationProcessor "io.micronaut:micronaut-inject-java"
-    testImplementation platform("io.micronaut:micronaut-bom:$micronautVersion")
+    testAnnotationProcessor "io.micronaut.validation:micronaut-validation-processor"
+
+    testImplementation platform("io.micronaut.platform:micronaut-platform:$micronautVersion")
     testImplementation "io.micronaut.test:micronaut-test-junit5"
+    testImplementation "io.micronaut.validation:micronaut-validation"
 
     // test deps needed only for to have a runner
     testImplementation group: "io.kestra", name: "core", version: kestraVersion

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
 version=0.15.0-SNAPSHOT
 kestraVersion=[0.15,)
-micronautVersion=3.10.1
+micronautVersion=4.2.2
 lombokVersion=1.18.30
diff --git a/src/main/java/io/kestra/plugin/git/Clone.java b/src/main/java/io/kestra/plugin/git/Clone.java
@@ -12,8 +12,8 @@
 import org.eclipse.jgit.api.Git;
 import org.slf4j.Logger;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 import java.nio.file.Path;
 
 @SuperBuilder(toBuilder = true)

diff --git a/src/main/java/io/kestra/plugin/git/Push.java b/src/main/java/io/kestra/plugin/git/Push.java
@@ -25,7 +25,7 @@
 import org.eclipse.jgit.lib.ObjectId;
 import org.slf4j.Logger;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.io.File;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;

diff --git a/src/main/java/io/kestra/plugin/git/Sync.java b/src/main/java/io/kestra/plugin/git/Sync.java
@@ -12,6 +12,7 @@
 import io.kestra.core.storages.StorageInterface;
 import io.kestra.core.utils.KestraIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -21,7 +22,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 
-import javax.validation.constraints.NotNull;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.net.URI;