Skip to content

Commit

Permalink
feat: Micronaut 4
Browse files Browse the repository at this point in the history
  • Loading branch information
loicmathieu committed Jan 29, 2024
1 parent 9757da5 commit 4838ae9
Show file tree
Hide file tree
Showing 12 changed files with 30 additions and 36 deletions.
29 changes: 17 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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/" }
Expand All @@ -31,24 +32,21 @@ 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"
compileOnly "io.micronaut:micronaut-http-client"
compileOnly "io.micronaut.rxjava2:micronaut-rxjava2"

// kestra
compileOnly group: "io.kestra", name: "core", version: kestraVersion
Expand All @@ -73,9 +71,16 @@ 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"

// test deps needed only for to have a runner
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=0.15.0-SNAPSHOT
kestraVersion=[0.15,)
micronautVersion=3.10.1
micronautVersion=4.2.2
lombokVersion=1.18.30
7 changes: 2 additions & 5 deletions src/main/java/io/kestra/plugin/dbt/cli/AbstractDbt.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import io.kestra.core.models.annotations.PluginProperty;
import io.kestra.core.models.tasks.*;
import io.kestra.core.runners.RunContext;
import io.kestra.core.tasks.PluginUtilsService;
import io.kestra.plugin.dbt.ResultParser;
import io.kestra.plugin.scripts.exec.scripts.models.DockerOptions;
import io.kestra.plugin.scripts.exec.scripts.models.RunnerType;
Expand All @@ -24,12 +23,10 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;

@SuperBuilder
@ToString
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/kestra/plugin/dbt/cli/DbtCLI.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;

@SuperBuilder
@ToString
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/kestra/plugin/dbt/cli/Setup.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;

@SuperBuilder
@ToString
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import java.net.URI;
import java.net.URISyntaxException;
import java.time.Duration;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

@SuperBuilder
@ToString
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import lombok.extern.jackson.Jacksonized;

import java.util.List;
import javax.validation.Valid;
import jakarta.validation.Valid;

@Value
@Jacksonized
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import lombok.extern.jackson.Jacksonized;

import java.util.List;
import javax.validation.Valid;
import jakarta.validation.Valid;

@Value
@Jacksonized
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/io/kestra/plugin/dbt/cloud/TriggerRun.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.kestra.plugin.dbt.cloud;

import io.kestra.core.exceptions.IllegalVariableEvaluationException;
import io.kestra.core.models.annotations.Example;
import io.kestra.core.models.annotations.Plugin;
import io.kestra.core.models.annotations.PluginProperty;
Expand All @@ -20,7 +19,7 @@
import java.net.URI;
import java.time.Duration;
import java.util.*;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

@SuperBuilder
@ToString
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/kestra/plugin/dbt/cloud/models/Job.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import java.util.ArrayList;
import java.util.List;
import javax.validation.Valid;
import jakarta.validation.Valid;

@Value
@Jacksonized
Expand Down
7 changes: 0 additions & 7 deletions src/main/java/io/kestra/plugin/dbt/cloud/models/Status.java
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
package io.kestra.plugin.dbt.cloud.models;

import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.v3.oas.annotations.media.Schema;
import io.micronaut.validation.Validated;
import lombok.Value;
import lombok.experimental.SuperBuilder;
import lombok.extern.jackson.Jacksonized;

import javax.validation.Valid;
import javax.validation.constraints.*;

@Value
@Jacksonized
@SuperBuilder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import java.time.ZonedDateTime;
import java.util.List;
import javax.validation.Valid;
import jakarta.validation.Valid;

@Value
@Jacksonized
Expand Down

0 comments on commit 4838ae9

Please sign in to comment.