chore(deps): update all java deps

2025-12-19 18:05:41 -05:00 · 2021-12-16 20:38:07 +01:00
parent 25b0e5e188
commit a19df970bf
223 changed files with 411 additions and 370 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -3,25 +3,25 @@ plugins {
    id "java"
    id 'java-library'
    id "idea"
-    id "com.github.johnrengelman.shadow" version "7.0.0"
+    id "com.github.johnrengelman.shadow" version "7.1.1"
    id "application"

    // test
-    id 'com.adarshr.test-logger' version '3.0.0'
+    id 'com.adarshr.test-logger' version '3.1.0'
    id 'org.gradle.test-retry' version '1.3.1'

    // helper
    id "com.github.ben-manes.versions" version "0.39.0"

    // front
-    id 'org.siouan.frontend-jdk11' version '5.3.0' apply false
+    id 'org.siouan.frontend-jdk11' version '6.0.0' apply false

    // release
    id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
    id 'net.researchgate.release' version '2.8.1'
-    id "com.gorylenko.gradle-git-properties" version "2.3.1"
+    id "com.gorylenko.gradle-git-properties" version "2.3.2"
    id 'signing'
-    id 'ru.vyarus.pom' version '2.2.0' apply false
+    id 'ru.vyarus.pom' version '2.2.1' apply false
    id 'ru.vyarus.github-info' version '1.3.0' apply false
 }

@@ -93,26 +93,27 @@ allprojects {
        implementation "io.micrometer:micrometer-core"
        implementation "io.micronaut.micrometer:micronaut-micrometer-registry-prometheus"
        api "io.micronaut:micronaut-http-client"
+        api "io.micronaut.rxjava2:micronaut-rxjava2-http-client"

        // logs
-        implementation "org.slf4j:slf4j-api:1.7.30"
-        implementation "ch.qos.logback:logback-classic:1.2.3"
-        implementation group: 'org.apache.logging.log4j', name: 'log4j-to-slf4j', version: '2.14.1'
+        implementation "org.slf4j:slf4j-api:1.7.32"
+        implementation "ch.qos.logback:logback-classic:1.2.8"
+        implementation group: 'org.apache.logging.log4j', name: 'log4j-to-slf4j', version: '2.16.0'
        implementation group: 'org.slf4j', name: 'jul-to-slf4j', version: '1.7.30'

        // jackson
-        implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.12.3'
-        implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.12.3'
-        implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-parameter-names', version: '2.12.3'
-        implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-guava', version: '2.12.3'
+        implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.0'
+        implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.13.0'
+        implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-parameter-names', version: '2.13.0'
+        implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-guava', version: '2.13.0'

        // kestra
        implementation group: 'com.devskiller.friendly-id', name: 'friendly-id', version: '1.1.0'
-        implementation 'com.github.jknack:handlebars:4.2.0'
-        implementation group: 'net.thisptr', name: 'jackson-jq', version: '1.0.0-preview.20210610'
+        implementation 'com.github.jknack:handlebars:4.3.0'
+        implementation group: 'net.thisptr', name: 'jackson-jq', version: '1.0.0-preview.20210928'

        // exposed utils
-        api group: 'com.google.guava', name: 'guava', version: '30.1.1-jre'
+        api group: 'com.google.guava', name: 'guava', version: '31.0.1-jre'
        api group: 'commons-io', name: 'commons-io', version: '2.11.0'
        api group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
        api "io.swagger.core.v3:swagger-annotations"
@@ -144,7 +145,7 @@ subprojects {
        // hamcrest
        testImplementation 'org.hamcrest:hamcrest:2.2'
        testImplementation 'org.hamcrest:hamcrest-library:2.2'
-        testImplementation group: 'org.exparity', name: 'hamcrest-date', version: '2.0.7'
+        testImplementation group: 'org.exparity', name: 'hamcrest-date', version: '2.0.8'
    }

    test {
@@ -218,6 +219,7 @@ shadowJar {

    archiveClassifier.set(null)
    mergeServiceFiles()
+    zip64 true
 }

 /**********************************************************************************************************************\
--- a/cli/src/main/java/io/kestra/cli/AbstractApiCommand.java
+++ b/cli/src/main/java/io/kestra/cli/AbstractApiCommand.java
@@ -5,6 +5,7 @@ import io.micronaut.http.MutableHttpRequest;
 import io.micronaut.http.client.netty.DefaultHttpClient;
 import picocli.CommandLine;

+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Arrays;
 import java.util.List;
@@ -24,8 +25,8 @@ public abstract class AbstractApiCommand extends AbstractCommand {
        super(withServer);
    }

-    protected DefaultHttpClient client() {
-        return new DefaultHttpClient(server);
+    protected DefaultHttpClient client() throws URISyntaxException {
+        return new DefaultHttpClient(server.toURI());
    }

    protected <T> HttpRequest<T> requestOptions(MutableHttpRequest<T> request) {
--- a/cli/src/main/java/io/kestra/cli/AbstractCommand.java
+++ b/cli/src/main/java/io/kestra/cli/AbstractCommand.java
@@ -25,7 +25,7 @@ import java.text.MessageFormat;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

@CommandLine.Command(
    mixinStandardHelpOptions = true
--- a/cli/src/main/java/io/kestra/cli/VersionProvider.java
+++ b/cli/src/main/java/io/kestra/cli/VersionProvider.java
@@ -4,8 +4,8 @@ import io.micronaut.context.event.StartupEvent;
 import io.micronaut.runtime.event.annotation.EventListener;
 import picocli.CommandLine;

-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;

 class VersionProvider implements CommandLine.IVersionProvider {
    private static io.kestra.core.utils.VersionProvider versionProvider;
--- a/cli/src/main/java/io/kestra/cli/commands/configs/sys/ConfigPropertiesCommand.java
+++ b/cli/src/main/java/io/kestra/cli/commands/configs/sys/ConfigPropertiesCommand.java
@@ -13,7 +13,7 @@ import picocli.CommandLine;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

@CommandLine.Command(
    name = "properties",
--- a/cli/src/main/java/io/kestra/cli/commands/flows/FlowDotCommand.java
+++ b/cli/src/main/java/io/kestra/cli/commands/flows/FlowDotCommand.java
@@ -11,7 +11,7 @@ import lombok.extern.slf4j.Slf4j;
 import picocli.CommandLine;

 import java.nio.file.Path;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

@CommandLine.Command(
    name = "dot",
--- a/cli/src/main/java/io/kestra/cli/commands/flows/FlowTestCommand.java
+++ b/cli/src/main/java/io/kestra/cli/commands/flows/FlowTestCommand.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeoutException;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

@CommandLine.Command(
    name = "test",
--- a/cli/src/main/java/io/kestra/cli/commands/flows/ValidateCommand.java
+++ b/cli/src/main/java/io/kestra/cli/commands/flows/ValidateCommand.java
@@ -8,7 +8,7 @@ import io.kestra.core.serializers.YamlFlowParser;
 import picocli.CommandLine;

 import java.nio.file.Path;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import javax.validation.ConstraintViolationException;

@CommandLine.Command(
--- a/cli/src/main/java/io/kestra/cli/commands/flows/namespaces/FlowNamespaceUpdateCommand.java
+++ b/cli/src/main/java/io/kestra/cli/commands/flows/namespaces/FlowNamespaceUpdateCommand.java
@@ -16,7 +16,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.stream.Collectors;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import javax.validation.ConstraintViolationException;

 import static io.kestra.core.utils.Rethrow.throwFunction;
--- a/cli/src/main/java/io/kestra/cli/commands/plugins/PluginDocCommand.java
+++ b/cli/src/main/java/io/kestra/cli/commands/plugins/PluginDocCommand.java
@@ -14,7 +14,7 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

@CommandLine.Command(
    name = "doc",
--- a/cli/src/main/java/io/kestra/cli/commands/plugins/PluginInstallCommand.java
+++ b/cli/src/main/java/io/kestra/cli/commands/plugins/PluginInstallCommand.java
@@ -15,7 +15,7 @@ import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

@CommandLine.Command(
    name = "install",
--- a/cli/src/main/java/io/kestra/cli/commands/servers/ExecutorCommand.java
+++ b/cli/src/main/java/io/kestra/cli/commands/servers/ExecutorCommand.java
@@ -10,7 +10,7 @@ import io.kestra.core.utils.Await;
 import picocli.CommandLine;

 import java.util.Map;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

@CommandLine.Command(
    name = "executor",
--- a/cli/src/main/java/io/kestra/cli/commands/servers/IndexerCommand.java
+++ b/cli/src/main/java/io/kestra/cli/commands/servers/IndexerCommand.java
@@ -11,7 +11,7 @@ import io.kestra.core.utils.Await;
 import picocli.CommandLine;

 import java.util.Map;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

@CommandLine.Command(
    name = "indexer",
--- a/cli/src/main/java/io/kestra/cli/commands/servers/SchedulerCommand.java
+++ b/cli/src/main/java/io/kestra/cli/commands/servers/SchedulerCommand.java
@@ -10,7 +10,7 @@ import io.kestra.core.utils.Await;
 import picocli.CommandLine;

 import java.util.Map;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

@CommandLine.Command(
    name = "scheduler",
--- a/cli/src/main/java/io/kestra/cli/commands/servers/StandAloneCommand.java
+++ b/cli/src/main/java/io/kestra/cli/commands/servers/StandAloneCommand.java
@@ -16,7 +16,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Map;
 import java.util.Optional;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

@CommandLine.Command(
    name = "standalone",
--- a/cli/src/main/java/io/kestra/cli/commands/servers/WebServerCommand.java
+++ b/cli/src/main/java/io/kestra/cli/commands/servers/WebServerCommand.java
@@ -9,7 +9,7 @@ import io.kestra.core.utils.Await;
 import picocli.CommandLine;

 import java.util.Map;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

@CommandLine.Command(
    name = "webserver",
--- a/cli/src/main/java/io/kestra/cli/commands/servers/WorkerCommand.java
+++ b/cli/src/main/java/io/kestra/cli/commands/servers/WorkerCommand.java
@@ -10,7 +10,7 @@ import io.kestra.core.utils.Await;
 import picocli.CommandLine;

 import java.util.Map;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

@CommandLine.Command(
    name = "worker",
--- a/cli/src/main/java/io/kestra/cli/commands/sys/FlowListenersRestoreCommand.java
+++ b/cli/src/main/java/io/kestra/cli/commands/sys/FlowListenersRestoreCommand.java
@@ -10,7 +10,7 @@ import picocli.CommandLine;
 import java.time.Duration;
 import java.time.ZonedDateTime;
 import java.util.concurrent.atomic.AtomicReference;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

@CommandLine.Command(
    name = "restore-flow-listeners",
--- a/cli/src/main/java/io/kestra/cli/commands/sys/RestoreQueueCommand.java
+++ b/cli/src/main/java/io/kestra/cli/commands/sys/RestoreQueueCommand.java
@@ -6,7 +6,7 @@ import io.micronaut.context.ApplicationContext;
 import lombok.extern.slf4j.Slf4j;
 import picocli.CommandLine;

-import javax.inject.Inject;
+import jakarta.inject.Inject;

@CommandLine.Command(
    name = "restore-queue",
--- a/cli/src/main/java/io/kestra/cli/listeners/DeleteConfigurationApplicationListeners.java
+++ b/cli/src/main/java/io/kestra/cli/listeners/DeleteConfigurationApplicationListeners.java
@@ -10,8 +10,8 @@ import lombok.extern.slf4j.Slf4j;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;

 import static io.kestra.core.utils.Rethrow.throwConsumer;

--- a/cli/src/main/java/io/kestra/cli/plugins/PluginDownloader.java
+++ b/cli/src/main/java/io/kestra/cli/plugins/PluginDownloader.java
@@ -26,8 +26,8 @@ import org.eclipse.aether.transport.http.HttpTransporterFactory;
 import org.eclipse.aether.util.filter.DependencyFilterUtils;

 import io.micronaut.core.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
--- a/cli/src/main/java/io/kestra/cli/services/RestoreQueueService.java
+++ b/cli/src/main/java/io/kestra/cli/services/RestoreQueueService.java
@@ -17,8 +17,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;

@Singleton
 public class RestoreQueueService {
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -13,38 +13,39 @@ processResources.dependsOn copyGradleProperties

 dependencies {
    // log
-    implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
+    implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.8'

    // serializers
-    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-ion', version: '2.12.3'
+    implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-ion', version: '2.13.0'

    // utils
-    implementation group: 'net.jodah', name: 'failsafe', version: '2.4.1'
-    implementation 'com.github.oshi:oshi-core:5.7.3'
+    implementation group: 'net.jodah', name: 'failsafe', version: '2.4.4'
+    implementation 'com.github.oshi:oshi-core:5.8.6'
    implementation 'io.pebbletemplates:pebble:3.1.5'

    // scheduler
-    implementation group: 'com.cronutils', name: 'cron-utils', version: '9.1.5'
+    implementation group: 'com.cronutils', name: 'cron-utils', version: '9.1.6'

    // process
-    implementation ('com.github.docker-java:docker-java:3.2.11') {
+    implementation ('com.github.docker-java:docker-java:3.2.12') {
        exclude group: 'com.github.docker-java', module: 'docker-java-transport-jersey'
    }
-    implementation 'com.github.docker-java:docker-java-transport-httpclient5:3.2.11'
+    implementation 'com.github.docker-java:docker-java-transport-httpclient5:3.2.12'

    // schema
-    implementation group: 'com.github.victools', name: 'jsonschema-generator', version: '4.18.0'
-    implementation group: 'com.github.victools', name: 'jsonschema-module-javax-validation', version: '4.18.0'
-    implementation group: 'com.github.victools', name: 'jsonschema-module-jackson', version: '4.18.0'
-    implementation group: 'com.github.victools', name: 'jsonschema-module-swagger-2', version: '4.18.0'
+    implementation group: 'com.github.victools', name: 'jsonschema-generator', version: '4.21.0'
+    implementation group: 'com.github.victools', name: 'jsonschema-module-javax-validation', version: '4.21.0'
+    implementation group: 'com.github.victools', name: 'jsonschema-module-jackson', version: '4.21.0'
+    implementation group: 'com.github.victools', name: 'jsonschema-module-swagger-2', version: '4.21.0'

    // test
    testImplementation project(':repository-memory')
    testImplementation project(':runner-memory')
    testImplementation project(':storage-local')

-    testImplementation 'org.mockito:mockito-junit-jupiter:3.11.2'
+    testImplementation 'org.mockito:mockito-junit-jupiter:4.2.0'
    testImplementation "io.micronaut:micronaut-http-client"
+    testImplementation "io.micronaut.rxjava2:micronaut-rxjava2-http-client"
    testImplementation "io.micronaut:micronaut-http-server-netty"
    testImplementation "io.micronaut:micronaut-management"
 }
--- a/core/src/main/java/io/kestra/core/contexts/KestraApplicationContext.java
+++ b/core/src/main/java/io/kestra/core/contexts/KestraApplicationContext.java
@@ -4,14 +4,10 @@ import io.kestra.core.plugins.PluginRegistry;
 import io.micronaut.context.ApplicationContextConfiguration;
 import io.micronaut.context.DefaultApplicationContext;
 import io.micronaut.core.annotation.NonNull;
-import io.micronaut.core.annotation.Nullable;
-import io.micronaut.core.io.service.ServiceDefinition;
 import io.micronaut.core.io.service.SoftServiceLoader;
 import io.micronaut.inject.BeanDefinitionReference;

-import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Predicate;

 /**
 * Overload the {@link DefaultApplicationContext} in order to add plugins
@@ -31,15 +27,15 @@ public class KestraApplicationContext extends DefaultApplicationContext {
    }

    @Override
-    protected @NonNull List<BeanDefinitionReference> resolveBeanDefinitionReferences(@Nullable Predicate<BeanDefinitionReference> predicate) {
-        List<BeanDefinitionReference> resolvedBeanReferences = super.resolveBeanDefinitionReferences(predicate);
+    protected @NonNull List<BeanDefinitionReference> resolveBeanDefinitionReferences() {
+        List<BeanDefinitionReference> resolvedBeanReferences = super.resolveBeanDefinitionReferences();

        if (pluginRegistry != null) {
            pluginRegistry
                .getPlugins()
                .forEach(plugin -> {
                    final SoftServiceLoader<BeanDefinitionReference> definitions = SoftServiceLoader.load(BeanDefinitionReference.class, plugin.getClassLoader());
-                    definitions.collectAll(resolvedBeanReferences, reference -> reference.isPresent() && (predicate == null || predicate.test(reference)));
+                    definitions.collectAll(resolvedBeanReferences, BeanDefinitionReference::isPresent);
                });
        }

--- a/core/src/main/java/io/kestra/core/contexts/KestraApplicationContextBuilder.java
+++ b/core/src/main/java/io/kestra/core/contexts/KestraApplicationContextBuilder.java
@@ -22,9 +22,9 @@ import java.util.*;
 */
 public class KestraApplicationContextBuilder implements ApplicationContextConfiguration {
    private ClassLoader classLoader = getClass().getClassLoader();
-    private List<String> environments = new ArrayList<>();
-    private List<String> packages = new ArrayList<>();
-    private Map<String, Object> properties = new LinkedHashMap<>();
+    private final List<String> environments = new ArrayList<>();
+    private final List<String> packages = new ArrayList<>();
+    private final Map<String, Object> properties = new LinkedHashMap<>();
    private PluginRegistry pluginRegistry;

    public KestraApplicationContextBuilder() {
@@ -79,7 +79,6 @@ public class KestraApplicationContextBuilder implements ApplicationContextConfig
        return this;
    }

-
    @SuppressWarnings("MagicNumber")
    public @NonNull ApplicationContext build() {
        DefaultApplicationContext applicationContext = new KestraApplicationContext(this, this.pluginRegistry);
--- a/core/src/main/java/io/kestra/core/contexts/KestraValidator.java
+++ b/core/src/main/java/io/kestra/core/contexts/KestraValidator.java
@@ -1,8 +1,8 @@
 package io.kestra.core.contexts;

-import edu.umd.cs.findbugs.annotations.NonNull;
-import edu.umd.cs.findbugs.annotations.Nullable;
 import io.micronaut.context.annotation.Replaces;
+import io.micronaut.core.annotation.NonNull;
+import io.micronaut.core.annotation.Nullable;
 import io.micronaut.core.beans.BeanIntrospection;
 import io.micronaut.core.beans.BeanIntrospectionReference;
 import io.micronaut.core.beans.exceptions.IntrospectionException;
@@ -30,7 +30,8 @@ public class KestraValidator extends DefaultValidator {
        super(configuration);
    }

-    protected @Nullable BeanIntrospection<Object> getBeanIntrospection(@NonNull Object object) {
+    protected @Nullable
+    BeanIntrospection<Object> getBeanIntrospection(@NonNull Object object) {
        //noinspection ConstantConditions
        if (object == null) {
            return null;
--- a/core/src/main/java/io/kestra/core/docs/DocumentationGenerator.java
+++ b/core/src/main/java/io/kestra/core/docs/DocumentationGenerator.java
@@ -27,8 +27,8 @@ import java.util.*;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;

@Singleton
 public class DocumentationGenerator {
--- a/core/src/main/java/io/kestra/core/docs/JsonSchemaGenerator.java
+++ b/core/src/main/java/io/kestra/core/docs/JsonSchemaGenerator.java
@@ -25,7 +25,7 @@ import java.time.Duration;
 import java.util.*;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;

@Singleton
 public class JsonSchemaGenerator {
--- a/core/src/main/java/io/kestra/core/endpoints/BasicAuthEndpointsFilter.java
+++ b/core/src/main/java/io/kestra/core/endpoints/BasicAuthEndpointsFilter.java
@@ -4,7 +4,7 @@ import io.micronaut.context.annotation.Requires;
 import io.micronaut.core.async.publisher.Publishers;
 import io.micronaut.http.*;
 import io.micronaut.http.annotation.Filter;
-import io.micronaut.http.filter.OncePerRequestHttpServerFilter;
+import io.micronaut.http.filter.HttpServerFilter;
 import io.micronaut.http.filter.ServerFilterChain;
 import io.micronaut.http.filter.ServerFilterPhase;
 import io.micronaut.inject.ExecutableMethod;
@@ -20,7 +20,7 @@ import java.util.Optional;

@Filter("/**")
@Requires(property = "endpoints.all.basic-auth")
-public class BasicAuthEndpointsFilter extends OncePerRequestHttpServerFilter {
+public class BasicAuthEndpointsFilter implements HttpServerFilter {
    private final EndpointBasicAuthConfiguration endpointBasicAuthConfiguration;

    public BasicAuthEndpointsFilter(EndpointBasicAuthConfiguration endpointBasicAuthConfiguration) {
@@ -29,7 +29,7 @@ public class BasicAuthEndpointsFilter extends OncePerRequestHttpServerFilter {

    @SuppressWarnings("rawtypes")
    @Override
-    protected Publisher<MutableHttpResponse<?>> doFilterOnce(HttpRequest<?> request, ServerFilterChain chain) {
+    public Publisher<MutableHttpResponse<?>> doFilter(HttpRequest<?> request, ServerFilterChain chain) {
        Optional<RouteMatch> routeMatch = RouteMatchUtils.findRouteMatch(request);
        if (routeMatch.isPresent() && routeMatch.get() instanceof MethodBasedRouteMatch) {
            ExecutableMethod<?, ?> method = ((MethodBasedRouteMatch<?, ?>) routeMatch.get()).getExecutableMethod();
--- a/core/src/main/java/io/kestra/core/endpoints/SchedulerEndpoint.java
+++ b/core/src/main/java/io/kestra/core/endpoints/SchedulerEndpoint.java
@@ -14,7 +14,7 @@ import java.time.ZonedDateTime;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

@Endpoint(id = "scheduler", defaultSensitive = false)
@Requires(property = "kestra.server-type", pattern = "(SCHEDULER|STANDALONE)")
--- a/core/src/main/java/io/kestra/core/endpoints/WorkerEndpoint.java
+++ b/core/src/main/java/io/kestra/core/endpoints/WorkerEndpoint.java
@@ -13,7 +13,7 @@ import io.kestra.core.runners.Worker;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

@Endpoint(id = "worker", defaultSensitive = false)
@Requires(property = "kestra.server-type", pattern = "(WORKER|STANDALONE)")
--- a/core/src/main/java/io/kestra/core/exceptions/DeserializationException.java
+++ b/core/src/main/java/io/kestra/core/exceptions/DeserializationException.java
@@ -3,6 +3,8 @@ package io.kestra.core.exceptions;
 import com.fasterxml.jackson.databind.exc.InvalidTypeIdException;

 public class DeserializationException extends RuntimeException {
+    private static final long serialVersionUID = 1L;
+
    public DeserializationException(InvalidTypeIdException cause) {
        super(cause);
    }
--- a/core/src/main/java/io/kestra/core/listeners/RetryEvents.java
+++ b/core/src/main/java/io/kestra/core/listeners/RetryEvents.java
@@ -4,7 +4,7 @@ import io.micronaut.retry.event.RetryEvent;
 import io.micronaut.runtime.event.annotation.EventListener;
 import lombok.extern.slf4j.Slf4j;

-import javax.inject.Singleton;
+import jakarta.inject.Singleton;

@Singleton
@Slf4j
--- a/core/src/main/java/io/kestra/core/metrics/GlobalTagsConfigurer.java
+++ b/core/src/main/java/io/kestra/core/metrics/GlobalTagsConfigurer.java
@@ -6,8 +6,8 @@ import io.micronaut.context.annotation.Requires;

 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;

@Singleton
@Requires(beans = MetricConfig.class)
--- a/core/src/main/java/io/kestra/core/metrics/MetricRegistry.java
+++ b/core/src/main/java/io/kestra/core/metrics/MetricRegistry.java
@@ -12,8 +12,8 @@ import io.kestra.core.runners.WorkerTask;
 import io.kestra.core.runners.WorkerTaskResult;
 import io.kestra.core.schedulers.SchedulerExecutionWithTrigger;

-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;

@Singleton
@Slf4j
--- a/core/src/main/java/io/kestra/core/models/validations/ModelValidator.java
+++ b/core/src/main/java/io/kestra/core/models/validations/ModelValidator.java
@@ -4,8 +4,8 @@ import io.micronaut.validation.validator.Validator;

 import java.util.Optional;
 import java.util.Set;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;

--- a/core/src/main/java/io/kestra/core/plugins/PluginRegistry.java
+++ b/core/src/main/java/io/kestra/core/plugins/PluginRegistry.java
@@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.ToString;

-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.util.AbstractMap;
 import java.util.List;
 import java.util.Map;
--- a/core/src/main/java/io/kestra/core/queues/QueueService.java
+++ b/core/src/main/java/io/kestra/core/queues/QueueService.java
@@ -11,7 +11,7 @@ import io.kestra.core.runners.WorkerTask;
 import io.kestra.core.runners.WorkerTaskResult;
 import io.kestra.core.runners.WorkerTaskRunning;

-import javax.inject.Singleton;
+import jakarta.inject.Singleton;

@Singleton
 public class QueueService {
--- a/core/src/main/java/io/kestra/core/repositories/LocalFlowRepositoryLoader.java
+++ b/core/src/main/java/io/kestra/core/repositories/LocalFlowRepositoryLoader.java
@@ -12,8 +12,8 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.stream.Collectors;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import javax.validation.ConstraintViolationException;

@Singleton
--- a/core/src/main/java/io/kestra/core/runners/Indexer.java
+++ b/core/src/main/java/io/kestra/core/runners/Indexer.java
@@ -12,9 +12,9 @@ import io.kestra.core.repositories.TriggerRepositoryInterface;
 import io.micronaut.context.annotation.Requires;

 import java.io.IOException;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;

@Singleton
@Requires(beans = {ExecutionRepositoryInterface.class, LogRepositoryInterface.class, TriggerRepositoryInterface.class})
--- a/core/src/main/java/io/kestra/core/runners/RunContextFactory.java
+++ b/core/src/main/java/io/kestra/core/runners/RunContextFactory.java
@@ -10,8 +10,8 @@ import io.kestra.core.models.tasks.Task;
 import io.kestra.core.models.triggers.AbstractTrigger;

 import java.util.Map;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;

@Singleton
 public class RunContextFactory {
--- a/core/src/main/java/io/kestra/core/runners/RunnerUtils.java
+++ b/core/src/main/java/io/kestra/core/runners/RunnerUtils.java
@@ -34,9 +34,9 @@ import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;

@Singleton
 public class RunnerUtils {
--- a/core/src/main/java/io/kestra/core/runners/StandAloneRunner.java
+++ b/core/src/main/java/io/kestra/core/runners/StandAloneRunner.java
@@ -12,8 +12,8 @@ import io.kestra.core.utils.ExecutorsUtils;
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.concurrent.ExecutorService;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;

@Slf4j
 public class StandAloneRunner implements RunnerInterface, Closeable {
--- a/core/src/main/java/io/kestra/core/runners/VariableRenderer.java
+++ b/core/src/main/java/io/kestra/core/runners/VariableRenderer.java
@@ -23,8 +23,8 @@ import java.io.IOException;
 import java.io.StringWriter;
 import java.io.Writer;
 import java.util.*;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;

@Singleton
 public class VariableRenderer {
--- a/core/src/main/java/io/kestra/core/runners/handlebars/helpers/EvalHelper.java
+++ b/core/src/main/java/io/kestra/core/runners/handlebars/helpers/EvalHelper.java
@@ -14,6 +14,7 @@ public class EvalHelper implements Helper<String> {
        this.variableRenderer = variableRenderer;
    }

+    @SuppressWarnings("unchecked")
    @SneakyThrows
    @Override
    public CharSequence apply(final String value, final Options options) {
--- a/core/src/main/java/io/kestra/core/runners/handlebars/helpers/FirstDefinedEvalHelper.java
+++ b/core/src/main/java/io/kestra/core/runners/handlebars/helpers/FirstDefinedEvalHelper.java
@@ -20,6 +20,7 @@ public class FirstDefinedEvalHelper implements Helper<String> {
        this.variableRenderer = variableRenderer;
    }

+    @SuppressWarnings("unchecked")
    @SneakyThrows
    @Override
    public CharSequence apply(final String value, final Options options) {
--- a/core/src/main/java/io/kestra/core/runners/pebble/Extension.java
+++ b/core/src/main/java/io/kestra/core/runners/pebble/Extension.java
@@ -17,7 +17,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;

 import static com.mitchellbosecke.pebble.operator.BinaryOperatorType.NORMAL;

--- a/core/src/main/java/io/kestra/core/schedulers/AbstractScheduler.java
+++ b/core/src/main/java/io/kestra/core/schedulers/AbstractScheduler.java
@@ -38,8 +38,8 @@ import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;

@Slf4j
@Singleton
--- a/core/src/main/java/io/kestra/core/schedulers/DefaultScheduler.java
+++ b/core/src/main/java/io/kestra/core/schedulers/DefaultScheduler.java
@@ -11,8 +11,8 @@ import lombok.extern.slf4j.Slf4j;

 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;

@Slf4j
@Singleton
--- a/core/src/main/java/io/kestra/core/serializers/DeletedSerializer.java
+++ b/core/src/main/java/io/kestra/core/serializers/DeletedSerializer.java
@@ -9,7 +9,7 @@ import io.kestra.core.models.DeletedInterface;

 import java.util.List;
 import java.util.stream.Collectors;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 /*
@Introspected
@Singleton
--- a/core/src/main/java/io/kestra/core/serializers/ObjectMapperFactory.java
+++ b/core/src/main/java/io/kestra/core/serializers/ObjectMapperFactory.java
@@ -9,9 +9,9 @@ import com.fasterxml.jackson.databind.deser.std.StringDeserializer;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.BeanSerializerModifier;
 import com.fasterxml.jackson.databind.type.TypeFactory;
-import edu.umd.cs.findbugs.annotations.Nullable;
 import io.kestra.core.contexts.KestraClassLoader;
 import io.micronaut.context.annotation.*;
+import io.micronaut.core.annotation.Nullable;
 import io.micronaut.core.reflect.GenericTypeUtils;
 import io.micronaut.core.util.StringUtils;
 import io.micronaut.jackson.JacksonConfiguration;
@@ -21,9 +21,9 @@ import java.text.SimpleDateFormat;
 import java.util.Locale;
 import java.util.Optional;
 import java.util.TimeZone;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;

 /**
 *  hard copy from {link io.micronaut.jackson.{@link io.micronaut.jackson.ObjectMapperFactory}} just to change
--- a/core/src/main/java/io/kestra/core/serializers/YamlFlowParser.java
+++ b/core/src/main/java/io/kestra/core/serializers/YamlFlowParser.java
@@ -16,8 +16,8 @@ import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.stream.Collectors;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import javax.validation.ConstraintViolationException;

@Singleton
--- a/core/src/main/java/io/kestra/core/services/CollectorScheduler.java
+++ b/core/src/main/java/io/kestra/core/services/CollectorScheduler.java
@@ -4,8 +4,8 @@ import io.micronaut.context.annotation.Requires;
 import io.micronaut.scheduling.annotation.Scheduled;
 import lombok.extern.slf4j.Slf4j;

-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;

@Singleton
@Slf4j
--- a/core/src/main/java/io/kestra/core/services/CollectorService.java
+++ b/core/src/main/java/io/kestra/core/services/CollectorService.java
@@ -13,18 +13,18 @@ import io.micronaut.core.annotation.Nullable;
 import io.micronaut.core.type.Argument;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.MutableHttpRequest;
-import io.micronaut.http.client.RxHttpClient;
 import io.micronaut.http.client.annotation.Client;
 import io.micronaut.http.client.exceptions.HttpClientResponseException;
 import io.micronaut.http.hateoas.JsonError;
+import io.micronaut.rxjava2.http.client.RxHttpClient;
 import lombok.extern.slf4j.Slf4j;

 import java.lang.management.ManagementFactory;
 import java.net.URI;
 import java.time.Instant;
 import java.time.ZoneId;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;

@Singleton
@Slf4j
--- a/core/src/main/java/io/kestra/core/services/ConditionService.java
+++ b/core/src/main/java/io/kestra/core/services/ConditionService.java
@@ -17,7 +17,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

 /**
 * Provides business logic to manipulate {@link Condition}
--- a/core/src/main/java/io/kestra/core/services/ExecutionService.java
+++ b/core/src/main/java/io/kestra/core/services/ExecutionService.java
@@ -15,8 +15,8 @@ import io.micronaut.core.annotation.Nullable;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;

 import static io.kestra.core.utils.Rethrow.throwFunction;

--- a/core/src/main/java/io/kestra/core/services/FlowService.java
+++ b/core/src/main/java/io/kestra/core/services/FlowService.java
@@ -16,8 +16,8 @@ import io.kestra.core.utils.ListUtils;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;

 /**
 * Provides business logic to manipulate {@link Flow}
--- a/core/src/main/java/io/kestra/core/services/PluginService.java
+++ b/core/src/main/java/io/kestra/core/services/PluginService.java
@@ -8,8 +8,8 @@ import io.micronaut.context.ApplicationContext;

 import java.util.ArrayList;
 import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;

@Singleton
 public class PluginService {
--- a/core/src/main/java/io/kestra/core/services/TaskDefaultService.java
+++ b/core/src/main/java/io/kestra/core/services/TaskDefaultService.java
@@ -15,9 +15,9 @@ import org.slf4j.Logger;

 import java.util.*;
 import java.util.stream.Collectors;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;

@Singleton
 public class TaskDefaultService {
--- a/core/src/main/java/io/kestra/core/services/WorkerInstanceService.java
+++ b/core/src/main/java/io/kestra/core/services/WorkerInstanceService.java
@@ -7,7 +7,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;

 /**
 * Provides business logic to manipulate {@link WorkerInstance}
--- a/core/src/main/java/io/kestra/core/tasks/debugs/Echo.java
+++ b/core/src/main/java/io/kestra/core/tasks/debugs/Echo.java
@@ -1,5 +1,6 @@
 package io.kestra.core.tasks.debugs;

+import io.micronaut.core.annotation.NonNull;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
--- a/core/src/main/java/io/kestra/core/tasks/flows/Template.java
+++ b/core/src/main/java/io/kestra/core/tasks/flows/Template.java
@@ -35,8 +35,8 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiFunction;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;

--- a/core/src/main/java/io/kestra/core/utils/ExecutorsUtils.java
+++ b/core/src/main/java/io/kestra/core/utils/ExecutorsUtils.java
@@ -5,8 +5,8 @@ import io.micrometer.core.instrument.binder.jvm.ExecutorServiceMetrics;

 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;

@Singleton
 public class ExecutorsUtils {
--- a/core/src/main/java/io/kestra/core/utils/RetryUtils.java
+++ b/core/src/main/java/io/kestra/core/utils/RetryUtils.java
@@ -16,7 +16,7 @@ import java.util.List;
 import java.util.function.BiPredicate;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;

@Singleton
 public class RetryUtils {
--- a/core/src/main/java/io/kestra/core/utils/ThreadMainFactoryBuilder.java
+++ b/core/src/main/java/io/kestra/core/utils/ThreadMainFactoryBuilder.java
@@ -3,8 +3,8 @@ package io.kestra.core.utils;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;

 import java.util.concurrent.ThreadFactory;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;

@Singleton
 public class ThreadMainFactoryBuilder {
--- a/core/src/main/java/io/kestra/core/utils/ThreadUncaughtExceptionHandlers.java
+++ b/core/src/main/java/io/kestra/core/utils/ThreadUncaughtExceptionHandlers.java
@@ -4,8 +4,8 @@ import io.micronaut.context.ApplicationContext;
 import lombok.extern.slf4j.Slf4j;

 import java.lang.Thread.UncaughtExceptionHandler;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;

@Slf4j
@Singleton
--- a/core/src/main/java/io/kestra/core/utils/UriProvider.java
+++ b/core/src/main/java/io/kestra/core/utils/UriProvider.java
@@ -7,7 +7,7 @@ import io.kestra.core.models.flows.Flow;

 import java.net.URI;
 import io.micronaut.core.annotation.Nullable;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;

@Singleton
 public class UriProvider {
--- a/core/src/main/java/io/kestra/core/utils/VersionProvider.java
+++ b/core/src/main/java/io/kestra/core/utils/VersionProvider.java
@@ -9,8 +9,8 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Stream;
 import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;

@Singleton
 public class VersionProvider {
--- a/core/src/main/java/io/kestra/core/validations/ValidationFactory.java
+++ b/core/src/main/java/io/kestra/core/validations/ValidationFactory.java
@@ -11,7 +11,7 @@ import io.micronaut.validation.validator.constraints.ConstraintValidator;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;

@Factory
 public class ValidationFactory {
--- a/core/src/test/java/io/kestra/core/docs/ClassPluginDocumentationTest.java
+++ b/core/src/test/java/io/kestra/core/docs/ClassPluginDocumentationTest.java
@@ -13,7 +13,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;

-import javax.inject.Inject;
+import jakarta.inject.Inject;

 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
--- a/core/src/test/java/io/kestra/core/docs/DocumentationGeneratorTest.java
+++ b/core/src/test/java/io/kestra/core/docs/DocumentationGeneratorTest.java
@@ -16,7 +16,7 @@ import java.nio.file.Paths;
 import java.util.List;
 import java.util.Objects;

-import javax.inject.Inject;
+import jakarta.inject.Inject;

 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
--- a/core/src/test/java/io/kestra/core/docs/JsonSchemaGeneratorTest.java
+++ b/core/src/test/java/io/kestra/core/docs/JsonSchemaGeneratorTest.java
@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;

-import javax.inject.Inject;
+import jakarta.inject.Inject;

 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
--- a/core/src/test/java/io/kestra/core/endpoints/BasicAuthEndpointsFilterTest.java
+++ b/core/src/test/java/io/kestra/core/endpoints/BasicAuthEndpointsFilterTest.java
@@ -7,9 +7,9 @@ import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
 import io.micronaut.http.HttpStatus;
 import io.micronaut.http.MutableHttpRequest;
-import io.micronaut.http.client.RxHttpClient;
 import io.micronaut.http.client.exceptions.HttpClientResponseException;
 import io.micronaut.runtime.server.EmbeddedServer;
+import io.micronaut.rxjava2.http.client.RxHttpClient;
 import org.junit.jupiter.api.Test;

 import java.util.Map;
--- a/core/src/test/java/io/kestra/core/models/conditions/types/DateTimeBetweenConditionTest.java
+++ b/core/src/test/java/io/kestra/core/models/conditions/types/DateTimeBetweenConditionTest.java
@@ -12,7 +12,7 @@ import org.junit.jupiter.params.provider.MethodSource;

 import java.time.ZonedDateTime;
 import java.util.stream.Stream;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
--- a/core/src/test/java/io/kestra/core/models/conditions/types/DayWeekConditionTest.java
+++ b/core/src/test/java/io/kestra/core/models/conditions/types/DayWeekConditionTest.java
@@ -14,7 +14,7 @@ import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.ZonedDateTime;
 import java.util.stream.Stream;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
--- a/core/src/test/java/io/kestra/core/models/conditions/types/DayWeekInMonthConditionTest.java
+++ b/core/src/test/java/io/kestra/core/models/conditions/types/DayWeekInMonthConditionTest.java
@@ -13,7 +13,7 @@ import org.junit.jupiter.params.provider.MethodSource;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.util.stream.Stream;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
--- a/core/src/test/java/io/kestra/core/models/conditions/types/ExecutionFlowConditionTest.java
+++ b/core/src/test/java/io/kestra/core/models/conditions/types/ExecutionFlowConditionTest.java
@@ -8,7 +8,7 @@ import io.kestra.core.models.flows.Flow;
 import io.kestra.core.services.ConditionService;
 import io.kestra.core.utils.TestsUtils;

-import javax.inject.Inject;
+import jakarta.inject.Inject;

 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
--- a/core/src/test/java/io/kestra/core/models/conditions/types/ExecutionNamespaceConditionTest.java
+++ b/core/src/test/java/io/kestra/core/models/conditions/types/ExecutionNamespaceConditionTest.java
@@ -8,7 +8,7 @@ import io.kestra.core.models.flows.Flow;
 import io.kestra.core.services.ConditionService;
 import io.kestra.core.utils.TestsUtils;

-import javax.inject.Inject;
+import jakarta.inject.Inject;

 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
--- a/core/src/test/java/io/kestra/core/models/conditions/types/ExecutionStatusConditionTest.java
+++ b/core/src/test/java/io/kestra/core/models/conditions/types/ExecutionStatusConditionTest.java
@@ -11,7 +11,7 @@ import io.kestra.core.utils.TestsUtils;

 import java.util.Collections;

-import javax.inject.Inject;
+import jakarta.inject.Inject;

 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
--- a/core/src/test/java/io/kestra/core/models/conditions/types/HasRetryAttemptConditionTest.java
+++ b/core/src/test/java/io/kestra/core/models/conditions/types/HasRetryAttemptConditionTest.java
@@ -13,7 +13,7 @@ import org.junit.jupiter.api.Test;

 import java.util.Collections;
 import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
--- a/core/src/test/java/io/kestra/core/models/conditions/types/MultipleConditionTest.java
+++ b/core/src/test/java/io/kestra/core/models/conditions/types/MultipleConditionTest.java
@@ -11,7 +11,7 @@ import io.kestra.core.utils.TestsUtils;
 import io.kestra.runner.memory.MemoryMultipleConditionStorage;

 import java.util.Collections;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
--- a/core/src/test/java/io/kestra/core/models/conditions/types/NotConditionTest.java
+++ b/core/src/test/java/io/kestra/core/models/conditions/types/NotConditionTest.java
@@ -17,7 +17,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Stream;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
--- a/core/src/test/java/io/kestra/core/models/conditions/types/OrConditionTest.java
+++ b/core/src/test/java/io/kestra/core/models/conditions/types/OrConditionTest.java
@@ -16,7 +16,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Stream;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
--- a/core/src/test/java/io/kestra/core/models/conditions/types/VariableConditionTest.java
+++ b/core/src/test/java/io/kestra/core/models/conditions/types/VariableConditionTest.java
@@ -8,7 +8,7 @@ import io.kestra.core.models.flows.Flow;
 import io.kestra.core.services.ConditionService;
 import io.kestra.core.utils.TestsUtils;

-import javax.inject.Inject;
+import jakarta.inject.Inject;

 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
--- a/core/src/test/java/io/kestra/core/models/conditions/types/WeekendConditionTest.java
+++ b/core/src/test/java/io/kestra/core/models/conditions/types/WeekendConditionTest.java
@@ -14,7 +14,7 @@ import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.ZonedDateTime;
 import java.util.stream.Stream;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
--- a/core/src/test/java/io/kestra/core/models/flows/FlowTest.java
+++ b/core/src/test/java/io/kestra/core/models/flows/FlowTest.java
@@ -11,7 +11,7 @@ import io.kestra.core.utils.TestsUtils;
 import java.io.File;
 import java.net.URL;
 import java.util.Optional;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import javax.validation.ConstraintViolationException;

 import static org.hamcrest.MatcherAssert.assertThat;
--- a/core/src/test/java/io/kestra/core/models/hierarchies/FlowGraphTest.java
+++ b/core/src/test/java/io/kestra/core/models/hierarchies/FlowGraphTest.java
@@ -14,7 +14,7 @@ import java.net.URL;
 import java.util.List;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
--- a/core/src/test/java/io/kestra/core/models/triggers/types/ScheduleTest.java
+++ b/core/src/test/java/io/kestra/core/models/triggers/types/ScheduleTest.java
@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;

-import javax.inject.Inject;
+import jakarta.inject.Inject;

 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
--- a/core/src/test/java/io/kestra/core/repositories/AbstractFlowRepositoryTest.java
+++ b/core/src/test/java/io/kestra/core/repositories/AbstractFlowRepositoryTest.java
@@ -21,9 +21,9 @@ import io.kestra.core.tasks.scripts.Bash;
 import io.kestra.core.utils.IdUtils;
 import io.kestra.core.utils.TestsUtils;

-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import javax.validation.ConstraintViolationException;
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -56,11 +56,11 @@ public abstract class AbstractFlowRepositoryTest {
        FlowListener.reset();
    }

-    private static Flow.FlowBuilder builder() {
+    private static Flow.FlowBuilder<?, ?> builder() {
        return builder(IdUtils.create(), "test");
    }

-    private static Flow.FlowBuilder builder(String flowId, String taskId) {
+    private static Flow.FlowBuilder<?, ?> builder(String flowId, String taskId) {
        return Flow.builder()
            .id(flowId)
            .namespace("io.kestra.unittest")
@@ -295,6 +295,41 @@ public abstract class AbstractFlowRepositoryTest {
        assertThat(FlowListener.getEmits().stream().filter(r -> r.getType() == CrudEventType.DELETE).count(), is(1L));
    }

+
+    @Test
+    void removeTriggerDelete() throws InterruptedException {
+        CountDownLatch countDownLatch = new CountDownLatch(1);
+
+        triggerQueue.receive(trigger -> {
+            assertThat(trigger, is(nullValue()));
+            countDownLatch.countDown();
+        });
+
+        String flowId = IdUtils.create();
+
+        Flow flow = Flow.builder()
+            .id(flowId)
+            .namespace("io.kestra.unittest")
+            .triggers(Collections.singletonList(AbstractSchedulerTest.UnitTest.builder()
+                .id("sleep")
+                .type(AbstractSchedulerTest.UnitTest.class.getName())
+                .build()))
+            .tasks(Collections.singletonList(Return.builder().id("test").type(Return.class.getName()).format("test").build()))
+            .build();
+
+        Flow save = flowRepository.create(flow);
+
+        assertThat(flowRepository.findById(flow.getNamespace(), flow.getId()).isPresent(), is(true));
+
+        flowRepository.delete(save);
+        countDownLatch.await();
+
+        assertThat(FlowListener.getEmits().size(), is(2));
+        assertThat(FlowListener.getEmits().stream().filter(r -> r.getType() == CrudEventType.CREATE).count(), is(1L));
+        assertThat(FlowListener.getEmits().stream().filter(r -> r.getType() == CrudEventType.DELETE).count(), is(1L));
+    }
+
+
    @Singleton
    public static class FlowListener implements ApplicationEventListener<CrudEvent<Flow>> {
        private static List<CrudEvent<Flow>> emits = new ArrayList<>();
--- a/core/src/test/java/io/kestra/core/repositories/AbstractTemplateRepositoryTest.java
+++ b/core/src/test/java/io/kestra/core/repositories/AbstractTemplateRepositoryTest.java
@@ -14,8 +14,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;

 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
--- a/core/src/test/java/io/kestra/core/runners/AbstractMemoryRunnerTest.java
+++ b/core/src/test/java/io/kestra/core/runners/AbstractMemoryRunnerTest.java
@@ -7,7 +7,7 @@ import io.kestra.core.repositories.LocalFlowRepositoryLoader;
 import io.kestra.runner.memory.MemoryRunner;
 import org.junit.jupiter.api.BeforeEach;

-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.IOException;
 import java.net.URISyntaxException;

--- a/core/src/test/java/io/kestra/core/runners/ExecutionServiceTest.java
+++ b/core/src/test/java/io/kestra/core/runners/ExecutionServiceTest.java
@@ -10,7 +10,7 @@ import io.kestra.core.tasks.debugs.Return;
 import org.junit.jupiter.api.Test;

 import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
--- a/core/src/test/java/io/kestra/core/runners/FlowListenersTest.java
+++ b/core/src/test/java/io/kestra/core/runners/FlowListenersTest.java
@@ -13,7 +13,7 @@ import java.util.Collections;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;

 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
--- a/core/src/test/java/io/kestra/core/runners/FlowTriggerCaseTest.java
+++ b/core/src/test/java/io/kestra/core/runners/FlowTriggerCaseTest.java
@@ -10,9 +10,9 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicReference;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;

 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
--- a/core/src/test/java/io/kestra/core/runners/FlowTriggerTest.java
+++ b/core/src/test/java/io/kestra/core/runners/FlowTriggerTest.java
@@ -2,7 +2,7 @@ package io.kestra.core.runners;

 import org.junit.jupiter.api.Test;

-import javax.inject.Inject;
+import jakarta.inject.Inject;

 public class FlowTriggerTest extends AbstractMemoryRunnerTest {
    @Inject
--- a/core/src/test/java/io/kestra/core/runners/InputsTest.java
+++ b/core/src/test/java/io/kestra/core/runners/InputsTest.java
@@ -8,7 +8,7 @@ import io.kestra.core.models.flows.State;
 import io.kestra.core.repositories.FlowRepositoryInterface;
 import io.kestra.core.storages.StorageInterface;

-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
--- a/core/src/test/java/io/kestra/core/runners/MultipleConditionTriggerCaseTest.java
+++ b/core/src/test/java/io/kestra/core/runners/MultipleConditionTriggerCaseTest.java
@@ -14,9 +14,9 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;

 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
--- a/core/src/test/java/io/kestra/core/runners/MultipleConditionTriggerTest.java
+++ b/core/src/test/java/io/kestra/core/runners/MultipleConditionTriggerTest.java
@@ -3,7 +3,7 @@ package io.kestra.core.runners;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import org.junit.jupiter.api.Test;

-import javax.inject.Inject;
+import jakarta.inject.Inject;

@MicronautTest
 public class MultipleConditionTriggerTest extends AbstractMemoryRunnerTest {
--- a/core/src/test/java/io/kestra/core/runners/RestartCaseTest.java
+++ b/core/src/test/java/io/kestra/core/runners/RestartCaseTest.java
@@ -11,9 +11,9 @@ import io.kestra.core.services.ExecutionService;

 import java.time.Duration;
 import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;

 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
--- a/core/src/test/java/io/kestra/core/runners/RestartTest.java
+++ b/core/src/test/java/io/kestra/core/runners/RestartTest.java
@@ -2,7 +2,7 @@ package io.kestra.core.runners;

 import org.junit.jupiter.api.Test;

-import javax.inject.Inject;
+import jakarta.inject.Inject;

 public class RestartTest extends AbstractMemoryRunnerTest {
    @Inject
--- a/Show More
+++ b/Show More