chore(system): remove unused deleted column in logs and metrics

.github/CONTRIBUTING.md

@@ -63,9 +63,9 @@ You can also build it from a terminal using `./gradlew build`, the Gradle wrappe
   - Configure the following environment variables:
     - `MICRONAUT_ENVIRONMENTS`: can be set to any string and will load a custom configuration file in `cli/src/main/resources/application-{env}.yml`.
     - `KESTRA_PLUGINS_PATH`: is the path where you will save plugins as Jar and will be load on startup.
-  - See the screenshot below for an example: ![Intellij IDEA Configuration ](./assets/run-app.png)
+  - See the screenshot below for an example: ![Intellij IDEA Configuration ](run-app.png)
   - If you encounter **JavaScript memory heap out** error during startup, configure `NODE_OPTIONS` environment variable with some large value.
-      - Example `NODE_OPTIONS: --max-old-space-size=4096` or `NODE_OPTIONS: --max-old-space-size=8192` ![Intellij IDEA Configuration ](./assets/node_option_env_var.png)
+      - Example `NODE_OPTIONS: --max-old-space-size=4096` or `NODE_OPTIONS: --max-old-space-size=8192` ![Intellij IDEA Configuration ](node_option_env_var.png)
 - The server starts by default on port 8080 and is reachable on `http://localhost:8080`
 
 If you want to launch all tests, you need Python and some packages installed on your machine, on Ubuntu you can install them with:

.github/pull_request_template.md

@@ -12,7 +12,7 @@ _Example: Replaces legacy scroll directive with the new API._
 ### 🔗 Related Issue
 
 Which issue does this PR resolve? Use [GitHub Keywords](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests#linking-a-pull-request-to-an-issue) to automatically link the pull request to the issue.  
-_Example: Closes https://github.com/kestra-io/kestra/issues/ISSUE_NUMBER._
+_Example: Closes https://github.com/kestra-io/kestra/issues/12345._
 
 ### 🎨 Frontend Checklist
 

build.gradle

@@ -21,7 +21,7 @@ plugins {
 
     // test
     id "com.adarshr.test-logger" version "4.0.0"
-    id "org.sonarqube" version "7.2.2.6593"
+    id "org.sonarqube" version "7.2.1.6560"
     id 'jacoco-report-aggregation'
 
     // helper
@@ -171,23 +171,13 @@ allprojects {
 subprojects {subProj ->
 
     if (subProj.name != 'platform' && subProj.name != 'jmh-benchmarks') {
-
         apply plugin: "com.adarshr.test-logger"
-        apply plugin: 'jacoco'
 
         java {
             sourceCompatibility = targetJavaVersion
             targetCompatibility = targetJavaVersion
         }
 
-        configurations {
-            agent {
-                canBeResolved = true
-                canBeConsumed = true
-            }
-            mockitoAgent
-        }
-
         dependencies {
             // Platform
             testAnnotationProcessor enforcedPlatform(project(":platform"))
@@ -206,9 +196,6 @@ subprojects {subProj ->
             testImplementation "org.junit.jupiter:junit-jupiter-params"
             testImplementation "org.junit-pioneer:junit-pioneer"
             testImplementation 'org.mockito:mockito-junit-jupiter'
-            mockitoAgent("org.mockito:mockito-core:5.21.0") {
-                transitive = false // just the core
-            }
 
             // hamcrest
             testImplementation 'org.hamcrest:hamcrest'
@@ -217,17 +204,9 @@ subprojects {subProj ->
 
             //assertj
             testImplementation 'org.assertj:assertj-core'
-
-            agent "org.aspectj:aspectjweaver:1.9.25.1"
-
-            testImplementation platform("io.qameta.allure:allure-bom")
-            testImplementation "io.qameta.allure:allure-junit5"
         }
 
         def commonTestConfig = { Test t ->
-            t.ignoreFailures = true
-            t.finalizedBy jacocoTestReport
-
             // set Xmx for test workers
             t.maxHeapSize = '4g'
 
@@ -253,52 +232,6 @@ subprojects {subProj ->
 //            }
         }
 
-        tasks.register('integrationTest', Test) { Test t ->
-            description = 'Runs integration tests'
-            group = 'verification'
-
-            useJUnitPlatform {
-                includeTags 'integration'
-            }
-
-            testClassesDirs = sourceSets.test.output.classesDirs
-            classpath = sourceSets.test.runtimeClasspath
-
-            reports {
-                junitXml.required = true
-                junitXml.outputPerTestCase = true
-                junitXml.mergeReruns = true
-                junitXml.includeSystemErrLog = true
-                junitXml.outputLocation = layout.buildDirectory.dir("test-results/test")
-            }
-
-            // Integration tests typically not parallel (but you can enable)
-            maxParallelForks = 1
-            commonTestConfig(t)
-        }
-
-        tasks.register('unitTest', Test) { Test t ->
-            description = 'Runs unit tests'
-            group = 'verification'
-
-            useJUnitPlatform {
-                excludeTags 'flaky', 'integration'
-            }
-
-            testClassesDirs = sourceSets.test.output.classesDirs
-            classpath = sourceSets.test.runtimeClasspath
-
-            reports {
-                junitXml.required = true
-                junitXml.outputPerTestCase = true
-                junitXml.mergeReruns = true
-                junitXml.includeSystemErrLog = true
-                junitXml.outputLocation = layout.buildDirectory.dir("test-results/test")
-            }
-
-            commonTestConfig(t)
-        }
-
         tasks.register('flakyTest', Test) { Test t ->
             group = 'verification'
             description = 'Runs tests tagged @Flaky but does not fail the build.'
@@ -306,6 +239,7 @@ subprojects {subProj ->
             useJUnitPlatform {
                 includeTags 'flaky'
             }
+            ignoreFailures = true
 
             reports {
                 junitXml.required = true
@@ -315,13 +249,10 @@ subprojects {subProj ->
                 junitXml.outputLocation = layout.buildDirectory.dir("test-results/flakyTest")
             }
             commonTestConfig(t)
+
         }
 
-        // test task (default)
-        tasks.named('test', Test) { Test t ->
-            group = 'verification'
-            description = 'Runs all non-flaky tests.'
-
+        test {
             useJUnitPlatform {
                 excludeTags 'flaky'
             }
@@ -332,15 +263,10 @@ subprojects {subProj ->
                 junitXml.includeSystemErrLog = true
                 junitXml.outputLocation = layout.buildDirectory.dir("test-results/test")
             }
-            commonTestConfig(t)
-            jvmArgs = [
-                "-javaagent:${configurations.agent.singleFile}",
-                "-javaagent:${configurations.mockitoAgent.singleFile}"
-            ]
-        }
+            commonTestConfig(it)
 
-        tasks.named('check') {
-            dependsOn(tasks.named('test'))// default behaviour
+
+            finalizedBy(tasks.named('flakyTest'))
         }
 
         testlogger {
@@ -356,25 +282,83 @@ subprojects {subProj ->
     }
 }
 
+/**********************************************************************************************************************\
+ * End-to-End Tests
+ **********************************************************************************************************************/
+def e2eTestsCheck = tasks.register('e2eTestsCheck') {
+    group = 'verification'
+    description = "Runs the 'check' task for all e2e-tests modules"
+    doFirst {
+        project.ext.set("e2e-tests", true)
+    }
+}
+
+subprojects {
+    // Add e2e-tests modules check tasks to e2eTestsCheck
+    if (project.name.startsWith("e2e-tests")) {
+        test {
+            onlyIf {
+                project.hasProperty("e2e-tests")
+            }
+        }
+    }
+
+    afterEvaluate {
+        // Add e2e-tests modules check tasks to e2eTestsCheck
+        if (project.name.startsWith("e2e-tests")) {
+            e2eTestsCheck.configure {
+                finalizedBy(check)
+            }
+        }
+    }
+}
+
+/**********************************************************************************************************************\
+ * Allure Reports
+ **********************************************************************************************************************/
+subprojects {
+    if (it.name != 'platform' && it.name != 'jmh-benchmarks') {
+        dependencies {
+            testImplementation platform("io.qameta.allure:allure-bom")
+            testImplementation "io.qameta.allure:allure-junit5"
+        }
+
+        configurations {
+            agent {
+                canBeResolved = true
+                canBeConsumed = true
+            }
+        }
+
+        dependencies {
+            agent "org.aspectj:aspectjweaver:1.9.25.1"
+        }
+
+        test {
+            jvmArgs = ["-javaagent:${configurations.agent.singleFile}"]
+        }
+    }
+}
+
+/**********************************************************************************************************************\
+ * Jacoco
+ **********************************************************************************************************************/
+subprojects {
+    if (it.name != 'platform' && it.name != 'jmh-benchmarks') {
+        apply plugin: 'jacoco'
+
+        test {
+            finalizedBy jacocoTestReport
+        }
+
+        jacocoTestReport {
+            dependsOn test
+        }
+    }
+}
+
 tasks.named('check') {
     dependsOn tasks.named('testCodeCoverageReport', JacocoReport)
-    finalizedBy jacocoTestReport
-}
-
-tasks.register('unitTest') {
-    // No jacocoTestReport here, because it depends by default on :test,
-    // and that would make :test being run twice in our CI.
-    // In practice the report will be generated later in the CI by :check.
-}
-
-tasks.register('integrationTest') {
-    dependsOn tasks.named('testCodeCoverageReport', JacocoReport)
-    finalizedBy jacocoTestReport
-}
-
-tasks.register('flakyTest') {
-    dependsOn tasks.named('testCodeCoverageReport', JacocoReport)
-    finalizedBy jacocoTestReport
 }
 
 tasks.named('testCodeCoverageReport') {

cli/src/main/java/io/kestra/cli/AbstractCommand.java

@@ -42,7 +42,7 @@ import picocli.CommandLine.Option;
 @Introspected
 public abstract class AbstractCommand implements Callable<Integer> {
     @Inject
-    protected ApplicationContext applicationContext;
+    private ApplicationContext applicationContext;
 
     @Inject
     private EndpointDefaultConfiguration endpointConfiguration;

cli/src/main/java/io/kestra/cli/commands/flows/FlowCommand.java

@@ -18,8 +18,7 @@ import picocli.CommandLine;
         FlowDotCommand.class,
         FlowExportCommand.class,
         FlowUpdateCommand.class,
-        FlowUpdatesCommand.class,
-        FlowsSyncFromSourceCommand.class
+        FlowUpdatesCommand.class
     }
 )
 @Slf4j

cli/src/main/java/io/kestra/cli/commands/flows/FlowsSyncFromSourceCommand.java

@@ -1,55 +0,0 @@
-package io.kestra.cli.commands.flows;
-
-import io.kestra.cli.AbstractApiCommand;
-import io.kestra.cli.services.TenantIdSelectorService;
-import io.kestra.core.models.flows.FlowWithSource;
-import io.kestra.core.models.flows.GenericFlow;
-import io.kestra.core.repositories.FlowRepositoryInterface;
-import jakarta.inject.Inject;
-import java.util.List;
-import lombok.extern.slf4j.Slf4j;
-import picocli.CommandLine;
-
-@CommandLine.Command(
-    name = "syncFromSource",
-    description = "Update a single flow",
-    mixinStandardHelpOptions = true
-)
-@Slf4j
-public class FlowsSyncFromSourceCommand extends AbstractApiCommand {
-
-    @Inject
-    private TenantIdSelectorService tenantService;
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public Integer call() throws Exception {
-        super.call();
-
-        FlowRepositoryInterface repository = applicationContext.getBean(FlowRepositoryInterface.class);
-        String tenant = tenantService.getTenantId(tenantId);
-
-        List<FlowWithSource> persistedFlows = repository.findAllWithSource(tenant);
-
-        int count = 0;
-        for (FlowWithSource persistedFlow : persistedFlows) {
-            // Ensure exactly one trailing newline. We need this new line
-            // because when we update a flow from its source,
-            // we don't update it if no change is detected.
-            // The goal here is to force an update from the source for every flows
-            GenericFlow flow = GenericFlow.fromYaml(tenant,persistedFlow.getSource() + System.lineSeparator());
-            repository.update(flow, persistedFlow);
-            stdOut("- %s.%s".formatted(flow.getNamespace(), flow.getId()));
-            count++;
-        }
-        stdOut("%s flow(s) successfully updated!".formatted(count));
-
-        return 0;
-    }
-
-    protected boolean loadExternalPlugins() {
-        return true;
-    }
-
-
-}

cli/src/main/java/io/kestra/cli/commands/migrations/metadata/MetadataMigrationService.java

@@ -81,7 +81,7 @@ public class MetadataMigrationService {
             }));
     }
 
-    public void nsFilesMigration(boolean verbose) throws IOException {
+    public void nsFilesMigration() throws IOException {
         this.namespacesPerTenant().entrySet().stream()
             .flatMap(namespacesForTenant -> namespacesForTenant.getValue().stream().map(namespace -> Map.entry(namespacesForTenant.getKey(), namespace)))
             .flatMap(throwFunction(namespaceForTenant -> {
@@ -92,9 +92,6 @@ public class MetadataMigrationService {
             .forEach(throwConsumer(nsFileMetadata -> {
                 if (namespaceFileMetadataRepository.findByPath(nsFileMetadata.getTenantId(), nsFileMetadata.getNamespace(), nsFileMetadata.getPath()).isEmpty()) {
                     namespaceFileMetadataRepository.save(nsFileMetadata);
-                    if (verbose) {
-                        System.out.println("Migrated namespace file metadata: " + nsFileMetadata.getNamespace() + " - " + nsFileMetadata.getPath());
-                    }
                 }
             }));
     }

cli/src/main/java/io/kestra/cli/commands/migrations/metadata/NsFilesMetadataMigrationCommand.java

@@ -15,14 +15,11 @@ public class NsFilesMetadataMigrationCommand extends AbstractCommand {
     @Inject
     private Provider<MetadataMigrationService> metadataMigrationServiceProvider;
 
-    @CommandLine.Option(names = {"-lm", "--log-migrations"}, description = "Log all files that are migrated", defaultValue = "false")
-    public boolean logMigrations = false;
-
     @Override
     public Integer call() throws Exception {
         super.call();
         try {
-            metadataMigrationServiceProvider.get().nsFilesMigration(logMigrations);
+            metadataMigrationServiceProvider.get().nsFilesMigration();
         } catch (Exception e) {
             System.err.println("❌ Namespace Files Metadata migration failed: " + e.getMessage());
             e.printStackTrace();

cli/src/main/resources/application.yml

@@ -137,6 +137,11 @@ flyway:
       # We must ignore missing migrations as we delete some wrong or not used anymore migrations
       ignore-migration-patterns: "*:missing,*:future"
       out-of-order: true
+      properties:
+        flyway:
+          postgresql:
+            transactional:
+              lock: false
     mysql:
       enabled: true
       locations:

cli/src/test/java/io/kestra/cli/commands/flows/FlowsSyncFromSourceCommandTest.java

@@ -1,73 +0,0 @@
-package io.kestra.cli.commands.flows;
-
-import static io.kestra.core.tenant.TenantService.MAIN_TENANT;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import io.kestra.core.models.flows.Flow;
-import io.kestra.core.repositories.FlowRepositoryInterface;
-import io.micronaut.configuration.picocli.PicocliRunner;
-import io.micronaut.context.ApplicationContext;
-import io.micronaut.context.env.Environment;
-import io.micronaut.runtime.server.EmbeddedServer;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.net.URL;
-import java.util.List;
-import org.junit.jupiter.api.Test;
-
-class FlowsSyncFromSourceCommandTest {
-    @Test
-    void updateAllFlowsFromSource()  {
-        URL directory = FlowUpdatesCommandTest.class.getClassLoader().getResource("flows");
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        System.setOut(new PrintStream(out));
-        try (ApplicationContext ctx = ApplicationContext.run(Environment.CLI, Environment.TEST)) {
-
-            EmbeddedServer embeddedServer = ctx.getBean(EmbeddedServer.class);
-            embeddedServer.start();
-
-            String[] args = {
-                "--plugins",
-                "/tmp", // pass this arg because it can cause failure
-                "--server",
-                embeddedServer.getURL().toString(),
-                "--user",
-                "myuser:pass:word",
-                "--delete",
-                directory.getPath(),
-            };
-            PicocliRunner.call(FlowUpdatesCommand.class, ctx, args);
-
-            assertThat(out.toString()).contains("successfully updated !");
-            out.reset();
-
-            FlowRepositoryInterface repository = ctx.getBean(FlowRepositoryInterface.class);
-            List<Flow> flows = repository.findAll(MAIN_TENANT);
-            for (Flow flow : flows) {
-                assertThat(flow.getRevision()).isEqualTo(1);
-            }
-
-            args = new String[]{
-                "--plugins",
-                "/tmp", // pass this arg because it can cause failure
-                "--server",
-                embeddedServer.getURL().toString(),
-                "--user",
-                "myuser:pass:word"
-
-            };
-            PicocliRunner.call(FlowsSyncFromSourceCommand.class, ctx, args);
-
-            assertThat(out.toString()).contains("4 flow(s) successfully updated!");
-            assertThat(out.toString()).contains("- io.kestra.outsider.quattro");
-            assertThat(out.toString()).contains("- io.kestra.cli.second");
-            assertThat(out.toString()).contains("- io.kestra.cli.third");
-            assertThat(out.toString()).contains("- io.kestra.cli.first");
-
-            flows = repository.findAll(MAIN_TENANT);
-            for (Flow flow : flows) {
-                assertThat(flow.getRevision()).isEqualTo(2);
-            }
-        }
-    }
-}

cli/src/test/java/io/kestra/cli/commands/plugins/PluginDocCommandTest.java

@@ -4,6 +4,7 @@ import io.micronaut.configuration.picocli.PicocliRunner;
 import io.micronaut.context.ApplicationContext;
 import io.micronaut.context.env.Environment;
 import org.apache.commons.io.FileUtils;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
@@ -14,6 +15,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -23,8 +25,7 @@ class PluginDocCommandTest {
 
     @Test
     void run() throws IOException, URISyntaxException {
-        var testDirectoryName = PluginListCommandTest.class.getSimpleName();
-        Path pluginsPath = Files.createTempDirectory(testDirectoryName + "_pluginsPath_");
+        Path pluginsPath = Files.createTempDirectory(PluginListCommandTest.class.getSimpleName());
         pluginsPath.toFile().deleteOnExit();
 
         FileUtils.copyFile(
@@ -33,7 +34,7 @@ class PluginDocCommandTest {
             new File(URI.create("file://" + pluginsPath.toAbsolutePath() + "/" + PLUGIN_TEMPLATE_TEST))
         );
 
-        Path docPath = Files.createTempDirectory(testDirectoryName + "_docPath_");
+        Path docPath = Files.createTempDirectory(PluginInstallCommandTest.class.getSimpleName());
         docPath.toFile().deleteOnExit();
 
         try (ApplicationContext ctx = ApplicationContext.run(Environment.CLI, Environment.TEST)) {
@@ -42,9 +43,9 @@ class PluginDocCommandTest {
 
             List<Path> files = Files.list(docPath).toList();
 
-            assertThat(files.stream().map(path -> path.getFileName().toString())).contains("plugin-template-test");
-            // don't know why, but sometimes there is an addition "plugin-notifications" directory present
-            var directory = files.stream().filter(path -> "plugin-template-test".equals(path.getFileName().toString())).findFirst().get().toFile();
+            assertThat(files.size()).isEqualTo(1);
+            assertThat(files.getFirst().getFileName().toString()).isEqualTo("plugin-template-test");
+            var directory = files.getFirst().toFile();
             assertThat(directory.isDirectory()).isTrue();
             assertThat(directory.listFiles().length).isEqualTo(3);
 

core/build.gradle

@@ -24,9 +24,6 @@ dependencies {
     // reactor
     api "io.projectreactor:reactor-core"
 
-    // awaitility
-    api "org.awaitility:awaitility"
-
     // micronaut
     api "io.micronaut.data:micronaut-data-model"
     implementation "io.micronaut:micronaut-http-server-netty"

core/src/main/java/io/kestra/core/assets/AssetManagerFactory.java

@@ -1,25 +0,0 @@
-package io.kestra.core.assets;
-
-import io.kestra.core.models.assets.Asset;
-import io.kestra.core.runners.AssetEmitter;
-import jakarta.inject.Singleton;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Singleton
-public class AssetManagerFactory {
-    public AssetEmitter of(boolean enabled) {
-        return new AssetEmitter() {
-            @Override
-            public void upsert(Asset asset) {
-                throw new UnsupportedOperationException();
-            }
-
-            @Override
-            public List<Asset> outputs() {
-                return new ArrayList<>();
-            }
-        };
-    }
-}

core/src/main/java/io/kestra/core/assets/AssetService.java

@@ -1,31 +0,0 @@
-package io.kestra.core.assets;
-
-import io.kestra.core.models.assets.Asset;
-import io.kestra.core.models.assets.AssetIdentifier;
-import io.kestra.core.models.assets.AssetUser;
-import io.kestra.core.queues.QueueException;
-import io.micronaut.context.annotation.Secondary;
-import jakarta.inject.Singleton;
-
-import java.util.List;
-
-public interface AssetService {
-
-    void asyncUpsert(AssetUser assetUser, Asset asset) throws QueueException;
-
-    void assetLineage(AssetUser assetUser, List<AssetIdentifier> inputs, List<AssetIdentifier> outputs) throws QueueException;
-
-    @Singleton
-    @Secondary
-    class NoopAssetService implements AssetService {
-        @Override
-        public void asyncUpsert(AssetUser assetUser, Asset asset) throws QueueException {
-            // no-op
-        }
-
-        @Override
-        public void assetLineage(AssetUser assetUser, List<AssetIdentifier> inputs, List<AssetIdentifier> outputs) {
-            // no-op
-        }
-    }
-}

core/src/main/java/io/kestra/core/docs/JsonSchemaGenerator.java

@@ -22,7 +22,6 @@ import com.github.victools.jsonschema.module.swagger2.Swagger2Module;
 import com.google.common.collect.ImmutableMap;
 import io.kestra.core.models.annotations.Plugin;
 import io.kestra.core.models.annotations.PluginProperty;
-import io.kestra.core.models.assets.Asset;
 import io.kestra.core.models.conditions.Condition;
 import io.kestra.core.models.conditions.ScheduleCondition;
 import io.kestra.core.models.dashboards.DataFilter;
@@ -43,12 +42,13 @@ import io.kestra.core.plugins.PluginRegistry;
 import io.kestra.core.plugins.RegisteredPlugin;
 import io.kestra.core.serializers.JacksonMapper;
 import io.micronaut.core.annotation.Nullable;
-import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.lang.reflect.*;
 import java.time.*;
@@ -64,7 +64,7 @@ import static io.kestra.core.serializers.JacksonMapper.MAP_TYPE_REFERENCE;
 @Singleton
 @Slf4j
 public class JsonSchemaGenerator {
-
+    
     private static final List<Class<?>> TYPES_RESOLVED_AS_STRING = List.of(Duration.class, LocalTime.class, LocalDate.class, LocalDateTime.class, ZonedDateTime.class, OffsetDateTime.class, OffsetTime.class);
     private static final List<Class<?>> SUBTYPE_RESOLUTION_EXCLUSION_FOR_PLUGIN_SCHEMA = List.of(Task.class, AbstractTrigger.class);
 
@@ -277,10 +277,10 @@ public class JsonSchemaGenerator {
             .with(Option.DEFINITION_FOR_MAIN_SCHEMA)
             .with(Option.PLAIN_DEFINITION_KEYS)
             .with(Option.ALLOF_CLEANUP_AT_THE_END);
-
-        // HACK: Registered a custom JsonUnwrappedDefinitionProvider prior to the JacksonModule
+            
+        // HACK: Registered a custom JsonUnwrappedDefinitionProvider prior to the JacksonModule 
         // to be able to return an CustomDefinition with an empty node when the ResolvedType can't be found.
-        builder.forTypesInGeneral().withCustomDefinitionProvider(new JsonUnwrappedDefinitionProvider() {
+        builder.forTypesInGeneral().withCustomDefinitionProvider(new JsonUnwrappedDefinitionProvider(){
             @Override
             public CustomDefinition provideCustomSchemaDefinition(ResolvedType javaType, SchemaGenerationContext context) {
                 try {
@@ -299,9 +299,7 @@ public class JsonSchemaGenerator {
         }
 
         // default value
-        builder.forFields()
-            .withIgnoreCheck(fieldScope -> fieldScope.getAnnotation(Hidden.class) != null)
-            .withDefaultResolver(this::defaults);
+        builder.forFields().withDefaultResolver(this::defaults);
 
         // def name
         builder.forTypesInGeneral()
@@ -322,7 +320,7 @@ public class JsonSchemaGenerator {
         // inline some type
         builder.forTypesInGeneral()
             .withCustomDefinitionProvider(new CustomDefinitionProviderV2() {
-
+                
                 @Override
                 public CustomDefinition provideCustomSchemaDefinition(ResolvedType javaType, SchemaGenerationContext context) {
                     if (javaType.isInstanceOf(Map.class) || javaType.isInstanceOf(Enum.class)) {
@@ -590,8 +588,7 @@ public class JsonSchemaGenerator {
         // The `const` property is used by editors for auto-completion based on that schema.
         builder.forTypesInGeneral().withTypeAttributeOverride((collectedTypeAttributes, scope, context) -> {
             final Class<?> pluginType = scope.getType().getErasedType();
-            Plugin pluginAnnotation = pluginType.getAnnotation(Plugin.class);
-            if (pluginAnnotation != null) {
+            if (pluginType.getAnnotation(Plugin.class) != null) {
                 ObjectNode properties = (ObjectNode) collectedTypeAttributes.get("properties");
                 if (properties != null) {
                     properties.set("type", context.getGeneratorConfig().createObjectNode()
@@ -766,14 +763,6 @@ public class JsonSchemaGenerator {
                         consumer.accept(typeContext.resolve(clz));
                     }
                 }).toList();
-        } else if (declaredType.getErasedType() == Asset.class) {
-            return getRegisteredPlugins()
-                .stream()
-                .flatMap(registeredPlugin -> registeredPlugin.getAssets().stream())
-                .filter(p -> allowedPluginTypes.isEmpty() || allowedPluginTypes.contains(p.getName()))
-                .filter(Predicate.not(io.kestra.core.models.Plugin::isInternal))
-                .map(typeContext::resolve)
-                .toList();
         }
 
         return null;
@@ -820,9 +809,9 @@ public class JsonSchemaGenerator {
         // we don't return base properties unless specified with @PluginProperty and hidden is false
         builder
             .forFields()
-            .withIgnoreCheck(fieldScope -> (base != null &&
+            .withIgnoreCheck(fieldScope -> base != null &&
                 (fieldScope.getAnnotation(PluginProperty.class) == null || fieldScope.getAnnotation(PluginProperty.class).hidden()) &&
-                fieldScope.getDeclaringType().getTypeName().equals(base.getName())) || fieldScope.getAnnotation(Hidden.class) != null
+                fieldScope.getDeclaringType().getTypeName().equals(base.getName())
             );
 
         SchemaGeneratorConfig schemaGeneratorConfig = builder.build();

core/src/main/java/io/kestra/core/models/DeletedInterface.java

@@ -1,5 +0,0 @@
-package io.kestra.core.models;
-
-public interface DeletedInterface {
-    boolean isDeleted();
-}

core/src/main/java/io/kestra/core/models/QueryFilter.java

@@ -103,48 +103,12 @@ public record QueryFilter(
                 return List.of(Op.EQUALS, Op.NOT_EQUALS, Op.IN, Op.NOT_IN, Op.CONTAINS);
             }
         },
-        METADATA("metadata") {
-            @Override
-            public List<Op> supportedOp() {
-                return List.of(Op.EQUALS, Op.NOT_EQUALS, Op.IN, Op.NOT_IN, Op.CONTAINS);
-            }
-        },
         FLOW_ID("flowId") {
             @Override
             public List<Op> supportedOp() {
                 return List.of(Op.EQUALS, Op.NOT_EQUALS, Op.CONTAINS, Op.STARTS_WITH, Op.ENDS_WITH, Op.REGEX, Op.IN, Op.NOT_IN, Op.PREFIX);
             }
         },
-        FLOW_REVISION("flowRevision") {
-            @Override
-            public List<Op> supportedOp() {
-                return List.of(Op.EQUALS, Op.NOT_EQUALS, Op.IN, Op.NOT_IN);
-            }
-        },
-        ID("id") {
-            @Override
-            public List<Op> supportedOp() {
-                return List.of(Op.EQUALS, Op.NOT_EQUALS, Op.CONTAINS, Op.STARTS_WITH, Op.ENDS_WITH, Op.REGEX);
-            }
-        },
-        ASSET_ID("assetId") {
-            @Override
-            public List<Op> supportedOp() {
-                return List.of(Op.EQUALS, Op.NOT_EQUALS, Op.CONTAINS, Op.STARTS_WITH, Op.ENDS_WITH, Op.REGEX);
-            }
-        },
-        TYPE("type") {
-            @Override
-            public List<Op> supportedOp() {
-                return List.of(Op.EQUALS, Op.NOT_EQUALS, Op.CONTAINS, Op.STARTS_WITH, Op.ENDS_WITH, Op.REGEX);
-            }
-        },
-        CREATED("created") {
-            @Override
-            public List<Op> supportedOp() {
-                return List.of(Op.GREATER_THAN_OR_EQUAL_TO, Op.GREATER_THAN, Op.LESS_THAN_OR_EQUAL_TO, Op.LESS_THAN, Op.EQUALS, Op.NOT_EQUALS);
-            }
-        },
         UPDATED("updated") {
             @Override
             public List<Op> supportedOp() {
@@ -187,30 +151,12 @@ public record QueryFilter(
                 return List.of(Op.EQUALS, Op.NOT_EQUALS, Op.CONTAINS, Op.STARTS_WITH, Op.ENDS_WITH, Op.IN, Op.NOT_IN);
             }
         },
-        TRIGGER_STATE("triggerState"){
-            @Override
-            public List<Op> supportedOp() {
-                return List.of(Op.EQUALS, Op.NOT_EQUALS);
-            }
-        },
         EXECUTION_ID("executionId") {
             @Override
             public List<Op> supportedOp() {
                 return List.of(Op.EQUALS, Op.NOT_EQUALS, Op.CONTAINS, Op.STARTS_WITH, Op.ENDS_WITH, Op.IN, Op.NOT_IN);
             }
         },
-        TASK_ID("taskId") {
-            @Override
-            public List<Op> supportedOp() {
-                return List.of(Op.EQUALS, Op.NOT_EQUALS, Op.CONTAINS, Op.STARTS_WITH, Op.ENDS_WITH, Op.IN, Op.NOT_IN);
-            }
-        },
-        TASK_RUN_ID("taskRunId") {
-            @Override
-            public List<Op> supportedOp() {
-                return List.of(Op.EQUALS, Op.NOT_EQUALS, Op.CONTAINS, Op.STARTS_WITH, Op.ENDS_WITH, Op.IN, Op.NOT_IN);
-            }
-        },
         CHILD_FILTER("childFilter") {
             @Override
             public List<Op> supportedOp() {
@@ -325,7 +271,7 @@ public record QueryFilter(
             @Override
             public List<Field> supportedField() {
                 return List.of(Field.QUERY, Field.SCOPE, Field.NAMESPACE, Field.WORKER_ID, Field.FLOW_ID,
-                    Field.START_DATE, Field.END_DATE, Field.TRIGGER_ID, Field.TRIGGER_STATE
+                    Field.START_DATE, Field.END_DATE, Field.TRIGGER_ID
                 );
             }
         },
@@ -360,34 +306,6 @@ public record QueryFilter(
                     Field.UPDATED
                 );
             }
-        },
-        ASSET {
-            @Override
-            public List<Field> supportedField() {
-                return List.of(
-                    Field.QUERY,
-                    Field.ID,
-                    Field.TYPE,
-                    Field.NAMESPACE,
-                    Field.METADATA,
-                    Field.UPDATED
-                );
-            }
-        },
-        ASSET_USAGE {
-            @Override
-            public List<Field> supportedField() {
-                return List.of(
-                    Field.ASSET_ID,
-                    Field.NAMESPACE,
-                    Field.FLOW_ID,
-                    Field.FLOW_REVISION,
-                    Field.EXECUTION_ID,
-                    Field.TASK_ID,
-                    Field.TASK_RUN_ID,
-                    Field.CREATED
-                );
-            }
         };
 
         public abstract List<Field> supportedField();

core/src/main/java/io/kestra/core/models/SoftDeletable.java

@@ -0,0 +1,18 @@
+package io.kestra.core.models;
+
+/**
+ * This interface marks entities that implement a soft deletion mechanism.
+ * Soft deletion is based on a <code>deleted</code> field that is set to <code>true</code> when the entity is deleted.
+ * Physical deletion either never occurs or occurs in a dedicated purge mechanism.
+ */
+public interface SoftDeletable<T> {
+    /**
+     * Whether en entity is deleted or not.
+     */
+    boolean isDeleted();
+
+    /**
+     * Delete the current entity: set its <code>deleted</code> field to <code>true</code>.
+     */
+    T toDeleted();
+}

core/src/main/java/io/kestra/core/models/assets/Asset.java

@@ -1,111 +0,0 @@
-package io.kestra.core.models.assets;
-
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import io.kestra.core.models.DeletedInterface;
-import io.kestra.core.models.HasUID;
-import io.kestra.core.models.Plugin;
-import io.kestra.core.utils.IdUtils;
-import io.swagger.v3.oas.annotations.Hidden;
-import jakarta.annotation.Nullable;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Pattern;
-import jakarta.validation.constraints.Size;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-import java.time.Instant;
-import java.util.*;
-
-@Getter
-@NoArgsConstructor
-public abstract class Asset implements HasUID, DeletedInterface, Plugin {
-    @Hidden
-    @Pattern(regexp = "^[a-z0-9][a-z0-9_-]*")
-    protected String tenantId;
-
-    @Pattern(regexp = "^[a-z0-9][a-z0-9._-]*")
-    @Size(min = 1, max = 150)
-    protected String namespace;
-
-    @NotBlank
-    @Pattern(regexp = "^[a-zA-Z0-9][a-zA-Z0-9._-]*")
-    @Size(min = 1, max = 150)
-    protected String id;
-
-    @NotBlank
-    protected String type;
-
-    protected String displayName;
-
-    protected String description;
-
-    protected Map<String, Object> metadata;
-
-    @Nullable
-    @Hidden
-    private Instant created;
-
-    @Nullable
-    @Hidden
-    private Instant updated;
-
-    @Hidden
-    private boolean deleted;
-
-    public Asset(
-        String tenantId,
-        String namespace,
-        String id,
-        String type,
-        String displayName,
-        String description,
-        Map<String, Object> metadata,
-        Instant created,
-        Instant updated,
-        boolean deleted
-    ) {
-        this.tenantId = tenantId;
-        this.namespace = namespace;
-        this.id = id;
-        this.type = type;
-        this.displayName = displayName;
-        this.description = description;
-        this.metadata = Optional.ofNullable(metadata).map(HashMap::new).orElse(new HashMap<>());
-        Instant now = Instant.now();
-        this.created = Optional.ofNullable(created).orElse(now);
-        this.updated = Optional.ofNullable(updated).orElse(now);
-        this.deleted = deleted;
-    }
-
-    public <T extends Asset> T toUpdated() {
-        if (this.created == null) {
-            this.created = Instant.now();
-        }
-        this.updated = Instant.now();
-        return (T) this;
-    }
-
-    public Asset toDeleted() {
-        this.deleted = true;
-        return this;
-    }
-
-    @JsonAnySetter
-    public void setMetadata(String name, Object value) {
-        metadata.put(name, value);
-    }
-
-    @Override
-    public String uid() {
-        return Asset.uid(tenantId, id);
-    }
-
-    public static String uid(String tenantId, String id) {
-        return IdUtils.fromParts(tenantId, id);
-    }
-
-    public Asset withTenantId(String tenantId) {
-        this.tenantId = tenantId;
-        return this;
-    }
-}

core/src/main/java/io/kestra/core/models/assets/AssetIdentifier.java

@@ -1,19 +0,0 @@
-package io.kestra.core.models.assets;
-
-import io.kestra.core.utils.IdUtils;
-import io.swagger.v3.oas.annotations.Hidden;
-
-public record AssetIdentifier(@Hidden String tenantId, @Hidden String namespace, String id){
-
-    public AssetIdentifier withTenantId(String tenantId) {
-        return new AssetIdentifier(tenantId, this.namespace, this.id);
-    }
-
-    public String uid() {
-        return IdUtils.fromParts(tenantId, id);
-    }
-
-    public static AssetIdentifier of(Asset asset) {
-        return new AssetIdentifier(asset.getTenantId(), asset.getNamespace(), asset.getId());
-    }
-}

core/src/main/java/io/kestra/core/models/assets/AssetUser.java

@@ -1,18 +0,0 @@
-package io.kestra.core.models.assets;
-
-import io.kestra.core.models.HasUID;
-import io.kestra.core.models.flows.FlowId;
-import io.kestra.core.utils.IdUtils;
-
-/**
- * Represents an entity that used an asset
- */
-public record AssetUser(String tenantId, String namespace, String flowId, Integer flowRevision, String executionId, String taskId, String taskRunId) implements HasUID {
-    public String uid() {
-        return IdUtils.fromParts(tenantId, namespace, flowId, String.valueOf(flowRevision), executionId, taskRunId);
-    }
-
-    public FlowId toFlowId() {
-        return FlowId.of(tenantId, namespace, flowId, flowRevision);
-    }
-}

core/src/main/java/io/kestra/core/models/assets/AssetsDeclaration.java

@@ -1,22 +0,0 @@
-package io.kestra.core.models.assets;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import io.micronaut.core.annotation.Introspected;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-import java.util.Optional;
-
-@Getter
-public class AssetsDeclaration extends AssetsInOut {
-    private boolean enableAuto;
-
-    @JsonCreator
-    public AssetsDeclaration(Boolean enableAuto, List<AssetIdentifier> inputs, List<Asset> outputs) {
-        super(inputs, outputs);
-
-        this.enableAuto = Optional.ofNullable(enableAuto).orElse(false);
-    }
-}

core/src/main/java/io/kestra/core/models/assets/AssetsInOut.java

@@ -1,21 +0,0 @@
-package io.kestra.core.models.assets;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import lombok.Getter;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
-@Getter
-public class AssetsInOut {
-    private List<AssetIdentifier> inputs;
-
-    private List<Asset> outputs;
-
-    @JsonCreator
-    public AssetsInOut(List<AssetIdentifier> inputs, List<Asset> outputs) {
-        this.inputs = Optional.ofNullable(inputs).orElse(Collections.emptyList());
-        this.outputs = Optional.ofNullable(outputs).orElse(Collections.emptyList());
-    }
-}

core/src/main/java/io/kestra/core/models/assets/Custom.java

@@ -1,32 +0,0 @@
-package io.kestra.core.models.assets;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import io.kestra.core.models.annotations.Plugin;
-import io.swagger.v3.oas.annotations.Hidden;
-import lombok.Builder;
-import lombok.NoArgsConstructor;
-
-import java.time.Instant;
-import java.util.Map;
-
-@NoArgsConstructor
-@Plugin
-@Hidden
-public class Custom extends Asset {
-    @Builder
-    @JsonCreator
-    public Custom(
-        String tenantId,
-        String namespace,
-        String id,
-        String type,
-        String displayName,
-        String description,
-        Map<String, Object> metadata,
-        Instant created,
-        Instant updated,
-        boolean deleted
-    ) {
-        super(tenantId, namespace, id, type, displayName, description, metadata, created, updated, deleted);
-    }
-}

core/src/main/java/io/kestra/core/models/assets/External.java

@@ -1,32 +0,0 @@
-package io.kestra.core.models.assets;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import io.kestra.core.models.annotations.Plugin;
-import io.swagger.v3.oas.annotations.Hidden;
-import lombok.Builder;
-import lombok.NoArgsConstructor;
-
-import java.time.Instant;
-import java.util.Map;
-
-@NoArgsConstructor
-@Plugin
-public class External extends Asset {
-    public static final String ASSET_TYPE = External.class.getName();
-
-    @Builder
-    @JsonCreator
-    public External(
-        String tenantId,
-        String namespace,
-        String id,
-        String displayName,
-        String description,
-        Map<String, Object> metadata,
-        Instant created,
-        Instant updated,
-        boolean deleted
-    ) {
-        super(tenantId, namespace, id, ASSET_TYPE, displayName, description, metadata, created, updated, deleted);
-    }
-}

core/src/main/java/io/kestra/core/models/dashboards/Dashboard.java

@@ -1,7 +1,7 @@
 package io.kestra.core.models.dashboards;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.kestra.core.models.DeletedInterface;
+import io.kestra.core.models.SoftDeletable;
 import io.kestra.core.models.HasUID;
 import io.kestra.core.models.dashboards.charts.Chart;
 import io.kestra.core.utils.IdUtils;
@@ -26,7 +26,7 @@ import java.util.Objects;
 @NoArgsConstructor
 @Introspected
 @ToString
-public class Dashboard implements HasUID, DeletedInterface {
+public class Dashboard implements HasUID, SoftDeletable<Dashboard> {
     @Hidden
     @Pattern(regexp = "^[a-z0-9][a-z0-9_-]*")
     private String tenantId;
@@ -71,6 +71,7 @@ public class Dashboard implements HasUID, DeletedInterface {
         );
     }
 
+    @Override
     public Dashboard toDeleted() {
         return this.toBuilder()
             .deleted(true)

core/src/main/java/io/kestra/core/models/executions/Execution.java

@@ -11,7 +11,7 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Streams;
 import io.kestra.core.debug.Breakpoint;
 import io.kestra.core.exceptions.InternalException;
-import io.kestra.core.models.DeletedInterface;
+import io.kestra.core.models.SoftDeletable;
 import io.kestra.core.models.Label;
 import io.kestra.core.models.TenantInterface;
 import io.kestra.core.models.flows.Flow;
@@ -53,7 +53,7 @@ import java.util.zip.CRC32;
 @AllArgsConstructor
 @ToString
 @EqualsAndHashCode
-public class Execution implements DeletedInterface, TenantInterface {
+public class Execution implements SoftDeletable<Execution>, TenantInterface {
 
     @With
     @Hidden
@@ -1111,7 +1111,7 @@ public class Execution implements DeletedInterface, TenantInterface {
             .toList();
     }
 
-
+    @Override
     public Execution toDeleted() {
         return this.toBuilder()
             .deleted(true)

core/src/main/java/io/kestra/core/models/executions/LogEntry.java

@@ -1,7 +1,6 @@
 package io.kestra.core.models.executions;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import io.kestra.core.models.DeletedInterface;
 import io.kestra.core.models.TenantInterface;
 import io.kestra.core.models.flows.FlowInterface;
 import io.kestra.core.models.triggers.AbstractTrigger;
@@ -22,7 +21,7 @@ import java.util.stream.Stream;
 
 @Value
 @Builder(toBuilder = true)
-public class LogEntry implements DeletedInterface, TenantInterface {
+public class LogEntry implements TenantInterface {
     @Hidden
     @Pattern(regexp = "^[a-z0-9][a-z0-9_-]*")
     String tenantId;
@@ -57,10 +56,6 @@ public class LogEntry implements DeletedInterface, TenantInterface {
 
     String message;
 
-    @NotNull
-    @Builder.Default
-    boolean deleted = false;
-
     @Nullable
     ExecutionKind executionKind;
 

core/src/main/java/io/kestra/core/models/executions/MetricEntry.java

@@ -1,7 +1,6 @@
 package io.kestra.core.models.executions;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import io.kestra.core.models.DeletedInterface;
 import io.kestra.core.models.TenantInterface;
 import io.kestra.core.models.executions.metrics.Counter;
 import io.kestra.core.models.executions.metrics.Gauge;
@@ -18,7 +17,7 @@ import jakarta.validation.constraints.Pattern;
 
 @Value
 @Builder(toBuilder = true)
-public class MetricEntry implements DeletedInterface, TenantInterface {
+public class MetricEntry implements TenantInterface {
     @Hidden
     @Pattern(regexp = "^[a-z0-9][a-z0-9_-]*")
     String tenantId;
@@ -54,10 +53,6 @@ public class MetricEntry implements DeletedInterface, TenantInterface {
     @Nullable
     Map<String, String> tags;
 
-    @NotNull
-    @Builder.Default
-    boolean deleted = false;
-
     @Nullable
     ExecutionKind executionKind;
 

core/src/main/java/io/kestra/core/models/executions/TaskRun.java

@@ -2,7 +2,6 @@ package io.kestra.core.models.executions;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.kestra.core.models.TenantInterface;
-import io.kestra.core.models.assets.AssetsInOut;
 import io.kestra.core.models.flows.State;
 import io.kestra.core.models.tasks.ResolvedTask;
 import io.kestra.core.models.tasks.retrys.AbstractRetry;
@@ -58,10 +57,6 @@ public class TaskRun implements TenantInterface {
     @Schema(implementation = Object.class)
     Variables outputs;
 
-    @With
-    @Nullable
-    AssetsInOut assets;
-
     @NotNull
     State state;
 
@@ -92,7 +87,6 @@ public class TaskRun implements TenantInterface {
             this.value,
             this.attempts,
             this.outputs,
-            this.assets,
             this.state.withState(state),
             this.iteration,
             this.dynamic,
@@ -120,7 +114,6 @@ public class TaskRun implements TenantInterface {
             this.value,
             newAttempts,
             this.outputs,
-            this.assets,
             this.state.withState(state),
             this.iteration,
             this.dynamic,
@@ -144,7 +137,6 @@ public class TaskRun implements TenantInterface {
             this.value,
             newAttempts,
             this.outputs,
-            this.assets,
             this.state.withState(State.Type.FAILED),
             this.iteration,
             this.dynamic,
@@ -164,7 +156,6 @@ public class TaskRun implements TenantInterface {
             .value(this.getValue())
             .attempts(this.getAttempts())
             .outputs(this.getOutputs())
-            .assets(this.getAssets())
             .state(state == null ? this.getState() : state)
             .iteration(this.getIteration())
             .build();
@@ -194,11 +185,15 @@ public class TaskRun implements TenantInterface {
     }
 
     public TaskRunAttempt lastAttempt() {
-        if (this.attempts == null || this.attempts.isEmpty()) {
+        if (this.attempts == null) {
             return null;
         }
 
-        return this.attempts.getLast();
+        return this
+            .attempts
+            .stream()
+            .reduce((a, b) -> b)
+            .orElse(null);
     }
 
     public TaskRun onRunningResend() {
@@ -247,7 +242,6 @@ public class TaskRun implements TenantInterface {
             ", parentTaskRunId=" + this.getParentTaskRunId() +
             ", state=" + this.getState().getCurrent().toString() +
             ", outputs=" + this.getOutputs() +
-            ", assets=" + this.getAssets() +
             ", attempts=" + this.getAttempts() +
             ")";
     }
@@ -270,7 +264,8 @@ public class TaskRun implements TenantInterface {
      * @return The next retry date, null if maxAttempt || maxDuration is reached
      */
     public Instant nextRetryDate(AbstractRetry retry, Execution execution) {
-        if (this.attempts == null || this.attempts.isEmpty() || retry.getMaxAttempts() != null && execution.getMetadata().getAttemptNumber() >= retry.getMaxAttempts()) {
+        if (retry.getMaxAttempts() != null && execution.getMetadata().getAttemptNumber() >= retry.getMaxAttempts()) {
+
             return null;
         }
         Instant base = this.lastAttempt().getState().maxDate();

core/src/main/java/io/kestra/core/models/flows/Flow.java

@@ -342,6 +342,7 @@ public class Flow extends AbstractFlow implements HasUID {
         }
     }
 
+    @Override
     public Flow toDeleted() {
         return this.toBuilder()
             .revision(this.revision + 1)

core/src/main/java/io/kestra/core/models/flows/FlowForExecution.java

@@ -58,4 +58,9 @@ public class FlowForExecution extends AbstractFlow {
     public String getSource() {
         return null;
     }
+
+    @Override
+    public FlowForExecution toDeleted() {
+        throw new UnsupportedOperationException("Can't delete a FlowForExecution");
+    }
 }

core/src/main/java/io/kestra/core/models/flows/FlowInterface.java

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.kestra.core.models.DeletedInterface;
+import io.kestra.core.models.SoftDeletable;
 import io.kestra.core.models.HasSource;
 import io.kestra.core.models.HasUID;
 import io.kestra.core.models.Label;
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
  * The base interface for FLow.
  */
 @JsonDeserialize(as = GenericFlow.class)
-public interface FlowInterface extends FlowId, DeletedInterface, TenantInterface, HasUID, HasSource {
+public interface FlowInterface extends FlowId, SoftDeletable<FlowInterface>, TenantInterface, HasUID, HasSource {
 
     Pattern YAML_REVISION_MATCHER = Pattern.compile("(?m)^revision: \\d+\n?");
 

core/src/main/java/io/kestra/core/models/flows/GenericFlow.java

@@ -96,4 +96,9 @@ public class GenericFlow extends AbstractFlow implements HasUID {
     public List<GenericTrigger> getTriggers() {
         return Optional.ofNullable(triggers).orElse(List.of());
     }
+
+    @Override
+    public FlowInterface toDeleted() {
+        throw new UnsupportedOperationException("Can't delete a GenericFlow");
+    }
 }

core/src/main/java/io/kestra/core/models/flows/State.java

@@ -148,11 +148,6 @@ public class State {
         return this.current.isTerminated();
     }
 
-    @JsonIgnore
-    public boolean canBeRestarted() {
-        return this.current.isTerminated() || this.current.isPaused();
-    }
-
     @JsonIgnore
     public boolean isTerminatedNoFail() {
         return this.current.isTerminatedNoFail();

core/src/main/java/io/kestra/core/models/kv/PersistedKvMetadata.java

@@ -1,6 +1,6 @@
 package io.kestra.core.models.kv;
 
-import io.kestra.core.models.DeletedInterface;
+import io.kestra.core.models.SoftDeletable;
 import io.kestra.core.models.HasUID;
 import io.kestra.core.models.TenantInterface;
 import io.kestra.core.storages.kv.KVEntry;
@@ -22,7 +22,7 @@ import java.util.Optional;
 @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
 @ToString
 @EqualsAndHashCode
-public class PersistedKvMetadata implements DeletedInterface, TenantInterface, HasUID {
+public class PersistedKvMetadata implements SoftDeletable<PersistedKvMetadata>, TenantInterface, HasUID {
     @With
     @Hidden
     @Pattern(regexp = "^[a-z0-9][a-z0-9_-]*")
@@ -83,6 +83,7 @@ public class PersistedKvMetadata implements DeletedInterface, TenantInterface, H
         return this.toBuilder().updated(Instant.now()).last(true).build();
     }
 
+    @Override
     public PersistedKvMetadata toDeleted() {
         return this.toBuilder().updated(Instant.now()).deleted(true).build();
     }

core/src/main/java/io/kestra/core/models/namespaces/Namespace.java

@@ -17,8 +17,4 @@ public class Namespace implements NamespaceInterface {
     @NotNull
     @Pattern(regexp="^[a-z0-9][a-z0-9._-]*")
     protected String id;
-
-    @NotNull
-    @Builder.Default
-    boolean deleted = false;
 }

core/src/main/java/io/kestra/core/models/namespaces/NamespaceInterface.java

@@ -1,9 +1,8 @@
 package io.kestra.core.models.namespaces;
 
-import io.kestra.core.models.DeletedInterface;
 import io.kestra.core.models.HasUID;
 
-public interface NamespaceInterface extends DeletedInterface, HasUID {
+public interface NamespaceInterface extends HasUID {
     String getId();
 
 

core/src/main/java/io/kestra/core/models/namespaces/files/NamespaceFileMetadata.java

@@ -2,8 +2,8 @@ package io.kestra.core.models.namespaces.files;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.kestra.core.models.DeletedInterface;
 import io.kestra.core.models.HasUID;
+import io.kestra.core.models.SoftDeletable;
 import io.kestra.core.models.TenantInterface;
 import io.kestra.core.storages.FileAttributes;
 import io.kestra.core.storages.NamespaceFile;
@@ -24,7 +24,7 @@ import java.time.Instant;
 @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
 @ToString
 @EqualsAndHashCode
-public class NamespaceFileMetadata implements DeletedInterface, TenantInterface, HasUID {
+public class NamespaceFileMetadata implements SoftDeletable<NamespaceFileMetadata>, TenantInterface, HasUID {
     @With
     @Hidden
     @Pattern(regexp = "^[a-z0-9][a-z0-9_-]*")
@@ -116,6 +116,7 @@ public class NamespaceFileMetadata implements DeletedInterface, TenantInterface,
         return this.toBuilder().updated(saveDate).last(true).build();
     }
 
+    @Override
     public NamespaceFileMetadata toDeleted() {
         return this.toBuilder().deleted(true).updated(Instant.now()).build();
     }

core/src/main/java/io/kestra/core/models/tasks/Task.java

@@ -5,13 +5,11 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import io.kestra.core.exceptions.IllegalVariableEvaluationException;
 import io.kestra.core.models.annotations.Plugin;
 import io.kestra.core.models.annotations.PluginProperty;
-import io.kestra.core.models.assets.AssetsDeclaration;
 import io.kestra.core.models.executions.TaskRun;
 import io.kestra.core.models.property.Property;
 import io.kestra.core.models.tasks.retrys.AbstractRetry;
 import io.kestra.core.runners.RunContext;
 import io.kestra.plugin.core.flow.WorkingDirectory;
-import jakarta.annotation.Nullable;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Size;
 import lombok.Builder;
@@ -80,11 +78,6 @@ abstract public class Task implements TaskInterface {
     @Valid
     private Cache taskCache;
 
-    @PluginProperty(hidden = true, group = PluginProperty.CORE_GROUP)
-    @Valid
-    @Nullable
-    private Property<AssetsDeclaration> assets;
-
     public Optional<Task> findById(String id) {
         if (this.getId().equals(id)) {
             return Optional.of(this);

core/src/main/java/io/kestra/core/models/tasks/runners/TaskLogLineMatcher.java

@@ -1,13 +1,10 @@
 package io.kestra.core.models.tasks.runners;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.kestra.core.exceptions.IllegalVariableEvaluationException;
-import io.kestra.core.models.assets.Asset;
 import io.kestra.core.models.executions.AbstractMetricEntry;
-import io.kestra.core.queues.QueueException;
-import io.kestra.core.runners.AssetEmitter;
 import io.kestra.core.runners.RunContext;
 import io.kestra.core.serializers.JacksonMapper;
+import jakarta.inject.Singleton;
 import org.slf4j.Logger;
 import org.slf4j.event.Level;
 import org.slf4j.spi.LoggingEventBuilder;
@@ -21,7 +18,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import static io.kestra.core.runners.RunContextLogger.ORIGINAL_TIMESTAMP_KEY;
-import static io.kestra.core.utils.Rethrow.throwConsumer;
 
 /**
  * Service for matching and capturing structured data from task execution logs.
@@ -80,18 +76,6 @@ public class TaskLogLineMatcher {
                 }
             });
         }
-
-        if (match.assets() != null) {
-            try {
-                AssetEmitter assetEmitter = runContext.assets();
-                match.assets().forEach(throwConsumer(assetEmitter::upsert));
-            } catch (IllegalVariableEvaluationException e) {
-                logger.warn("Unable to get asset emitter for log '{}'", data, e);
-            } catch (QueueException e) {
-                logger.warn("Unable to emit asset for log '{}'", data, e);
-            }
-        }
-
         return match;
     }
 
@@ -110,9 +94,8 @@ public class TaskLogLineMatcher {
     public record TaskLogMatch(
         Map<String, Object> outputs,
         List<AbstractMetricEntry<?>> metrics,
-        List<LogLine> logs,
-        List<Asset> assets
-        ) {
+        List<LogLine> logs
+    ) {
         @Override
         public Map<String, Object> outputs() {
             return Optional.ofNullable(outputs).orElse(Map.of());

core/src/main/java/io/kestra/core/models/templates/Template.java

@@ -7,8 +7,8 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
 import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
-import io.kestra.core.models.DeletedInterface;
 import io.kestra.core.models.HasUID;
+import io.kestra.core.models.SoftDeletable;
 import io.kestra.core.models.TenantInterface;
 import io.kestra.core.models.tasks.Task;
 import io.kestra.core.models.validations.ManualConstraintViolation;
@@ -35,7 +35,7 @@ import jakarta.validation.constraints.Pattern;
 @Introspected
 @ToString
 @EqualsAndHashCode
-public class Template implements DeletedInterface, TenantInterface, HasUID {
+public class Template implements SoftDeletable<Template>, TenantInterface, HasUID {
     private static final ObjectMapper YAML_MAPPER = JacksonMapper.ofYaml().copy()
         .setAnnotationIntrospector(new JacksonAnnotationIntrospector() {
             @Override
@@ -141,6 +141,7 @@ public class Template implements DeletedInterface, TenantInterface, HasUID {
         }
     }
 
+    @Override
     public Template toDeleted() {
         return new Template(
             this.tenantId,

core/src/main/java/io/kestra/core/models/triggers/AbstractTrigger.java

@@ -6,10 +6,8 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.kestra.core.models.Label;
 import io.kestra.core.models.annotations.Plugin;
 import io.kestra.core.models.annotations.PluginProperty;
-import io.kestra.core.models.assets.AssetsDeclaration;
 import io.kestra.core.models.conditions.Condition;
 import io.kestra.core.models.flows.State;
-import io.kestra.core.models.property.Property;
 import io.kestra.core.models.tasks.WorkerGroup;
 import io.kestra.core.serializers.ListOrMapOfLabelDeserializer;
 import io.kestra.core.serializers.ListOrMapOfLabelSerializer;
@@ -90,9 +88,6 @@ abstract public class AbstractTrigger implements TriggerInterface {
     )
     private boolean allowConcurrent = false;
 
-    @PluginProperty(hidden = true, group = PluginProperty.CORE_GROUP)
-    private Property<AssetsDeclaration> assets;
-
     /**
      * For backward compatibility: we rename minLogLevel to logLevel.
      * @deprecated use {@link #logLevel} instead

core/src/main/java/io/kestra/core/plugins/DefaultPluginRegistry.java

@@ -1,7 +1,6 @@
 package io.kestra.core.plugins;
 
 import io.kestra.core.models.Plugin;
-import io.kestra.core.models.assets.Asset;
 import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotNull;
 import org.slf4j.Logger;

core/src/main/java/io/kestra/core/plugins/PluginModule.java

@@ -2,7 +2,6 @@ package io.kestra.core.plugins;
 
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import io.kestra.core.app.AppPluginInterface;
-import io.kestra.core.models.assets.Asset;
 import io.kestra.core.models.conditions.Condition;
 import io.kestra.core.models.dashboards.DataFilter;
 import io.kestra.core.models.dashboards.DataFilterKPI;
@@ -12,7 +11,6 @@ import io.kestra.core.models.tasks.Task;
 import io.kestra.core.models.tasks.logs.LogExporter;
 import io.kestra.core.models.tasks.runners.TaskRunner;
 import io.kestra.core.models.triggers.AbstractTrigger;
-import io.kestra.core.plugins.serdes.AssetDeserializer;
 import io.kestra.core.plugins.serdes.PluginDeserializer;
 import io.kestra.core.secret.SecretPluginInterface;
 import io.kestra.core.storages.StorageInterface;
@@ -47,6 +45,5 @@ public class PluginModule extends SimpleModule {
         addDeserializer(SecretPluginInterface.class, new PluginDeserializer<>());
         addDeserializer(AppPluginInterface.class, new PluginDeserializer<>());
         addDeserializer(LogExporter.class, new PluginDeserializer<>());
-        addDeserializer(Asset.class, new AssetDeserializer());
     }
 }

core/src/main/java/io/kestra/core/plugins/PluginScanner.java

@@ -3,7 +3,6 @@ package io.kestra.core.plugins;
 import io.kestra.core.app.AppBlockInterface;
 import io.kestra.core.app.AppPluginInterface;
 import io.kestra.core.models.Plugin;
-import io.kestra.core.models.assets.Asset;
 import io.kestra.core.models.conditions.Condition;
 import io.kestra.core.models.dashboards.DataFilter;
 import io.kestra.core.models.dashboards.DataFilterKPI;
@@ -109,7 +108,6 @@ public class PluginScanner {
         List<Class<? extends StorageInterface>> storages = new ArrayList<>();
         List<Class<? extends SecretPluginInterface>> secrets = new ArrayList<>();
         List<Class<? extends TaskRunner<?>>> taskRunners = new ArrayList<>();
-        List<Class<? extends Asset>> assets = new ArrayList<>();
         List<Class<? extends AppPluginInterface>> apps = new ArrayList<>();
         List<Class<? extends AppBlockInterface>> appBlocks = new ArrayList<>();
         List<Class<? extends Chart<?>>> charts = new ArrayList<>();
@@ -157,10 +155,6 @@ public class PluginScanner {
                         //noinspection unchecked
                         taskRunners.add((Class<? extends TaskRunner<?>>) runner.getClass());
                     }
-                    case Asset asset -> {
-                        log.debug("Loading Asset plugin: '{}'", plugin.getClass());
-                        assets.add(asset.getClass());
-                    }
                     case AppPluginInterface app -> {
                         log.debug("Loading App plugin: '{}'", plugin.getClass());
                         apps.add(app.getClass());
@@ -229,7 +223,6 @@ public class PluginScanner {
             .conditions(conditions)
             .storages(storages)
             .secrets(secrets)
-            .assets(assets)
             .apps(apps)
             .appBlocks(appBlocks)
             .taskRunners(taskRunners)

core/src/main/java/io/kestra/core/plugins/RegisteredPlugin.java

@@ -3,7 +3,6 @@ package io.kestra.core.plugins;
 import io.kestra.core.app.AppBlockInterface;
 import io.kestra.core.app.AppPluginInterface;
 import io.kestra.core.models.annotations.PluginSubGroup;
-import io.kestra.core.models.assets.Asset;
 import io.kestra.core.models.conditions.Condition;
 import io.kestra.core.models.dashboards.DataFilter;
 import io.kestra.core.models.dashboards.DataFilterKPI;
@@ -40,7 +39,6 @@ public class RegisteredPlugin {
     public static final String STORAGES_GROUP_NAME = "storages";
     public static final String SECRETS_GROUP_NAME = "secrets";
     public static final String TASK_RUNNERS_GROUP_NAME = "task-runners";
-    public static final String ASSETS_GROUP_NAME = "assets";
     public static final String APPS_GROUP_NAME = "apps";
     public static final String APP_BLOCKS_GROUP_NAME = "app-blocks";
     public static final String CHARTS_GROUP_NAME = "charts";
@@ -58,7 +56,6 @@ public class RegisteredPlugin {
     private final List<Class<? extends StorageInterface>> storages;
     private final List<Class<? extends SecretPluginInterface>> secrets;
     private final List<Class<? extends TaskRunner<?>>> taskRunners;
-    private final List<Class<? extends Asset>> assets;
     private final List<Class<? extends AppPluginInterface>> apps;
     private final List<Class<? extends AppBlockInterface>> appBlocks;
     private final List<Class<? extends Chart<?>>> charts;
@@ -77,7 +74,6 @@ public class RegisteredPlugin {
             !storages.isEmpty() ||
             !secrets.isEmpty() ||
             !taskRunners.isEmpty() ||
-            !assets.isEmpty()  ||
             !apps.isEmpty()  ||
             !appBlocks.isEmpty() ||
             !charts.isEmpty() ||
@@ -149,10 +145,6 @@ public class RegisteredPlugin {
             return AppPluginInterface.class;
         }
 
-        if (this.getAssets().stream().anyMatch(r -> r.getName().equals(cls))) {
-            return Asset.class;
-        }
-
         if (this.getLogExporters().stream().anyMatch(r -> r.getName().equals(cls))) {
             return LogExporter.class;
         }
@@ -188,7 +180,6 @@ public class RegisteredPlugin {
         result.put(STORAGES_GROUP_NAME, Arrays.asList(this.getStorages().toArray(Class[]::new)));
         result.put(SECRETS_GROUP_NAME, Arrays.asList(this.getSecrets().toArray(Class[]::new)));
         result.put(TASK_RUNNERS_GROUP_NAME, Arrays.asList(this.getTaskRunners().toArray(Class[]::new)));
-        result.put(ASSETS_GROUP_NAME, Arrays.asList(this.getAssets().toArray(Class[]::new)));
         result.put(APPS_GROUP_NAME, Arrays.asList(this.getApps().toArray(Class[]::new)));
         result.put(APP_BLOCKS_GROUP_NAME, Arrays.asList(this.getAppBlocks().toArray(Class[]::new)));
         result.put(CHARTS_GROUP_NAME, Arrays.asList(this.getCharts().toArray(Class[]::new)));
@@ -368,12 +359,6 @@ public class RegisteredPlugin {
             b.append("] ");
         }
 
-        if (!this.getAssets().isEmpty()) {
-            b.append("[Assets: ");
-            b.append(this.getAssets().stream().map(Class::getName).collect(Collectors.joining(", ")));
-            b.append("] ");
-        }
-
         if (!this.getApps().isEmpty()) {
             b.append("[Apps: ");
             b.append(this.getApps().stream().map(Class::getName).collect(Collectors.joining(", ")));

core/src/main/java/io/kestra/core/plugins/notifications/ExecutionInterface.java

@@ -1,25 +0,0 @@
-package io.kestra.core.plugins.notifications;
-
-import io.kestra.core.models.property.Property;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.Map;
-
-public interface ExecutionInterface {
-    @Schema(
-        title = "The execution id to use",
-        description = "Default is the current execution, " +
-            "change it to {{ trigger.executionId }} if you use this task with a Flow trigger to use the original execution."
-    )
-    Property<String> getExecutionId();
-
-    @Schema(
-        title = "Custom fields to be added on notification"
-    )
-    Property<Map<String, Object>> getCustomFields();
-
-    @Schema(
-        title = "Custom message to be added on notification"
-    )
-    Property<String> getCustomMessage();
-}

core/src/main/java/io/kestra/core/plugins/notifications/ExecutionService.java

@@ -1,140 +0,0 @@
-package io.kestra.core.plugins.notifications;
-
-import io.kestra.core.exceptions.IllegalVariableEvaluationException;
-import io.kestra.core.models.executions.Execution;
-import io.kestra.core.models.executions.TaskRun;
-import io.kestra.core.models.flows.State;
-import io.kestra.core.models.property.Property;
-import io.kestra.core.models.tasks.retrys.Exponential;
-import io.kestra.core.repositories.ExecutionRepositoryInterface;
-import io.kestra.core.runners.DefaultRunContext;
-import io.kestra.core.runners.RunContext;
-import io.kestra.core.serializers.JacksonMapper;
-import io.kestra.core.utils.ListUtils;
-import io.kestra.core.utils.RetryUtils;
-import io.kestra.core.utils.UriProvider;
-
-import java.time.Duration;
-import java.util.*;
-
-public final class ExecutionService {
-    private ExecutionService() {}
-
-    public static Execution findExecution(RunContext runContext, Property<String> executionId) throws IllegalVariableEvaluationException, NoSuchElementException {
-        ExecutionRepositoryInterface executionRepository = ((DefaultRunContext) runContext).getApplicationContext().getBean(ExecutionRepositoryInterface.class);
-
-        RetryUtils.Instance<Execution, NoSuchElementException> retryInstance = RetryUtils
-            .of(Exponential.builder()
-                    .delayFactor(2.0)
-                    .interval(Duration.ofSeconds(1))
-                    .maxInterval(Duration.ofSeconds(15))
-                    .maxAttempts(-1)
-                    .maxDuration(Duration.ofMinutes(10))
-                    .build(),
-                runContext.logger()
-            );
-
-        var executionRendererId = runContext.render(executionId).as(String.class).orElse(null);
-        var flowTriggerExecutionState = getOptionalFlowTriggerExecutionState(runContext);
-
-        var flowVars = (Map<String, String>) runContext.getVariables().get("flow");
-        var isCurrentExecution = isCurrentExecution(runContext, executionRendererId);
-        if (isCurrentExecution) {
-            runContext.logger().info("Loading execution data for the current execution.");
-        }
-
-        return retryInstance.run(
-            NoSuchElementException.class,
-            () -> executionRepository.findById(flowVars.get("tenantId"), executionRendererId)
-                .filter(foundExecution -> isExecutionInTheWantedState(foundExecution, isCurrentExecution, flowTriggerExecutionState))
-                .orElseThrow(() -> new NoSuchElementException("Unable to find execution '" + executionRendererId + "'"))
-
-        );
-    }
-
-    /**
-     * ExecutionRepository can be out of sync in ElasticSearch stack, with this filter we try to mitigate that
-     *
-     * @param execution                 the Execution we fetched from ExecutionRepository
-     * @param isCurrentExecution        true if this *Execution Task is configured to send a notification for the current Execution
-     * @param flowTriggerExecutionState the Execution State that triggered the Flow trigger, if any
-     * @return true if we think we fetched the right Execution data for our usecase
-     */
-    public static boolean isExecutionInTheWantedState(Execution execution, boolean isCurrentExecution, Optional<String> flowTriggerExecutionState) {
-        if (isCurrentExecution) {
-            // we don't wait for current execution to be terminated as it could not be possible as long as this task is running
-            return true;
-        }
-
-        if (flowTriggerExecutionState.isPresent()) {
-            // we were triggered by a Flow trigger that can be, for example: PAUSED
-            if (flowTriggerExecutionState.get().equals(State.Type.RUNNING.toString())) {
-                // RUNNING special case: we take the first state we got
-                return true;
-            } else {
-                // to handle the case where the ExecutionRepository is out of sync in ElasticSearch stack,
-                // we try to match an Execution with the same state
-                return execution.getState().getCurrent().name().equals(flowTriggerExecutionState.get());
-            }
-        } else {
-            return execution.getState().getCurrent().isTerminated();
-        }
-    }
-
-    public static Map<String, Object> executionMap(RunContext runContext, ExecutionInterface executionInterface) throws IllegalVariableEvaluationException {
-        Execution execution = findExecution(runContext, executionInterface.getExecutionId());
-        UriProvider uriProvider = ((DefaultRunContext) runContext).getApplicationContext().getBean(UriProvider.class);
-
-        Map<String, Object> templateRenderMap = new HashMap<>();
-        templateRenderMap.put("duration", execution.getState().humanDuration());
-        templateRenderMap.put("startDate", execution.getState().getStartDate());
-        templateRenderMap.put("link", uriProvider.executionUrl(execution));
-        templateRenderMap.put("execution", JacksonMapper.toMap(execution));
-
-        runContext.render(executionInterface.getCustomMessage())
-            .as(String.class)
-            .ifPresent(s -> templateRenderMap.put("customMessage", s));
-
-        final Map<String, Object> renderedCustomFields = runContext.render(executionInterface.getCustomFields()).asMap(String.class, Object.class);
-        if (!renderedCustomFields.isEmpty()) {
-            templateRenderMap.put("customFields", renderedCustomFields);
-        }
-
-        var isCurrentExecution = isCurrentExecution(runContext, execution.getId());
-
-        List<TaskRun> taskRuns;
-
-        if (isCurrentExecution) {
-            taskRuns = execution.getTaskRunList();
-        } else {
-            taskRuns = execution.getTaskRunList().stream()
-                .filter(t -> (execution.hasFailed() ? State.Type.FAILED : State.Type.SUCCESS).equals(t.getState().getCurrent()))
-                .toList();
-        }
-
-        if (!ListUtils.isEmpty(taskRuns)) {
-            TaskRun lastTaskRun = taskRuns.getLast();
-            templateRenderMap.put("firstFailed", State.Type.FAILED.equals(lastTaskRun.getState().getCurrent()) ? lastTaskRun : false);
-            templateRenderMap.put("lastTask", lastTaskRun);
-        }
-
-        return templateRenderMap;
-    }
-
-    /**
-     * if there is a state, we assume this is a Flow trigger with type: {@link io.kestra.plugin.core.trigger.Flow.Output}
-     *
-     * @return the state of the execution that triggered the Flow trigger, or empty if another usecase/trigger
-     */
-    private static Optional<String> getOptionalFlowTriggerExecutionState(RunContext runContext) {
-        var triggerVar = Optional.ofNullable(
-            runContext.getVariables().get("trigger")
-        );
-        return triggerVar.map(trigger -> ((Map<String, String>) trigger).get("state"));
-    }
-
-    private static boolean isCurrentExecution(RunContext runContext, String executionId) {
-        var executionVars = (Map<String, String>) runContext.getVariables().get("execution");
-        return executionId.equals(executionVars.get("id"));
-    }
-}

core/src/main/java/io/kestra/core/plugins/serdes/AssetDeserializer.java

@@ -1,16 +0,0 @@
-package io.kestra.core.plugins.serdes;
-
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import io.kestra.core.models.Plugin;
-import io.kestra.core.models.assets.Asset;
-import io.kestra.core.models.assets.Custom;
-
-/**
- * Specific {@link JsonDeserializer} for deserializing {@link Asset}.
- */
-public final class AssetDeserializer extends PluginDeserializer<Asset> {
-    @Override
-    protected Class<? extends Plugin> fallbackClass() {
-        return Custom.class;
-    }
-}

core/src/main/java/io/kestra/core/plugins/serdes/PluginDeserializer.java

@@ -12,7 +12,6 @@ import io.kestra.core.models.dashboards.charts.DataChart;
 import io.kestra.core.plugins.DefaultPluginRegistry;
 import io.kestra.core.plugins.PluginRegistry;
 import io.kestra.core.serializers.JacksonMapper;
-import io.micronaut.context.exceptions.NoSuchBeanException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,7 +28,7 @@ import java.util.Optional;
  * The {@link PluginDeserializer} uses the {@link PluginRegistry} to found the plugin class corresponding to
  * a plugin type.
  */
-public class PluginDeserializer<T extends Plugin> extends JsonDeserializer<T> {
+public final class PluginDeserializer<T extends Plugin> extends JsonDeserializer<T> {
 
     private static final Logger log = LoggerFactory.getLogger(PluginDeserializer.class);
 
@@ -73,7 +72,7 @@ public class PluginDeserializer<T extends Plugin> extends JsonDeserializer<T> {
                 // By default, if no plugin-registry is configured retrieve
                 // the one configured from the static Kestra's context.
                 pluginRegistry = KestraContext.getContext().getPluginRegistry();
-            } catch (IllegalStateException | NoSuchBeanException ignore) {
+            } catch (IllegalStateException ignore) {
                 // This error can only happen if the KestraContext is not initialized (i.e. in unit tests).
                 log.error("No plugin registry was initialized. Use default implementation.");
                 pluginRegistry = DefaultPluginRegistry.getOrCreate();
@@ -93,10 +92,6 @@ public class PluginDeserializer<T extends Plugin> extends JsonDeserializer<T> {
                 identifier
             );
             pluginType = pluginRegistry.findClassByIdentifier(identifier);
-
-            if (pluginType == null) {
-                pluginType = fallbackClass();
-            }
         }
 
         if (pluginType == null) {
@@ -157,8 +152,4 @@ public class PluginDeserializer<T extends Plugin> extends JsonDeserializer<T> {
 
         return isVersioningSupported && version != null && !version.isEmpty() ? type + ":" + version : type;
     }
-
-    protected Class<? extends Plugin> fallbackClass() {
-        return null;
-    }
 }

core/src/main/java/io/kestra/core/repositories/KvMetadataRepositoryInterface.java

@@ -36,7 +36,7 @@ public interface KvMetadataRepositoryInterface extends SaveRepositoryInterface<P
     );
 
     default PersistedKvMetadata delete(PersistedKvMetadata persistedKvMetadata) throws IOException {
-        return this.save(persistedKvMetadata.toBuilder().deleted(true).build());
+        return this.save(persistedKvMetadata.toDeleted());
     }
 
     /**

core/src/main/java/io/kestra/core/runners/AssetEmitter.java

@@ -1,12 +0,0 @@
-package io.kestra.core.runners;
-
-import io.kestra.core.models.assets.Asset;
-import io.kestra.core.queues.QueueException;
-
-import java.util.List;
-
-public interface AssetEmitter {
-    void upsert(Asset asset) throws QueueException;
-
-    List<Asset> outputs();
-}

core/src/main/java/io/kestra/core/runners/DefaultRunContext.java

@@ -6,13 +6,11 @@ import com.google.common.base.CaseFormat;
 import com.google.common.collect.ImmutableMap;
 import io.kestra.core.exceptions.IllegalVariableEvaluationException;
 import io.kestra.core.metrics.MetricRegistry;
-import io.kestra.core.models.assets.AssetsDeclaration;
 import io.kestra.core.models.Plugin;
 import io.kestra.core.models.executions.AbstractMetricEntry;
 import io.kestra.core.models.property.Property;
 import io.kestra.core.models.tasks.Task;
 import io.kestra.core.models.triggers.AbstractTrigger;
-import io.kestra.core.assets.AssetManagerFactory;
 import io.kestra.core.plugins.PluginConfigurations;
 import io.kestra.core.services.KVStoreService;
 import io.kestra.core.storages.Storage;
@@ -56,7 +54,6 @@ public class DefaultRunContext extends RunContext {
     private MetricRegistry meterRegistry;
     private VersionProvider version;
     private KVStoreService kvStoreService;
-    private AssetManagerFactory assetManagerFactory;
     private Optional<String> secretKey;
     private WorkingDir workingDir;
     private Validator validator;
@@ -76,8 +73,6 @@ public class DefaultRunContext extends RunContext {
     private Task task;
     private AbstractTrigger trigger;
 
-    private volatile AssetEmitter assetEmitter;
-
     private final AtomicBoolean isInitialized = new AtomicBoolean(false);
 
 
@@ -166,7 +161,6 @@ public class DefaultRunContext extends RunContext {
             this.secretKey = applicationContext.getProperty("kestra.encryption.secret-key", String.class);
             this.validator = applicationContext.getBean(Validator.class);
             this.localPath = applicationContext.getBean(LocalPathFactory.class).createLocalPath(this);
-            this.assetManagerFactory = applicationContext.getBean(AssetManagerFactory.class);
         }
     }
 
@@ -543,23 +537,6 @@ public class DefaultRunContext extends RunContext {
         return flow != null ? flow.get("tenantId") : null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public TaskRunInfo taskRunInfo() {
-        Optional<Map<String, Object>> maybeTaskRunMap = Optional.ofNullable(this.getVariables().get("taskrun"))
-            .map(Map.class::cast);
-        return new TaskRunInfo(
-            (String) this.getVariables().get("executionId"),
-            (String) this.getVariables().get("taskId"),
-            maybeTaskRunMap.map(m -> (String) m.get("id"))
-                .orElse(null),
-            maybeTaskRunMap.map(m -> (String) m.get("value"))
-                .orElse(null)
-        );
-    }
-
     /**
      * {@inheritDoc}
      */
@@ -568,7 +545,12 @@ public class DefaultRunContext extends RunContext {
     public FlowInfo flowInfo() {
         Map<String, Object> flow = (Map<String, Object>) this.getVariables().get("flow");
         // normally only tests should not have the flow variable
-        return flow == null ? new FlowInfo(null, null, null, null) : FlowInfo.from(flow);
+        return flow == null ? new FlowInfo(null, null, null, null) : new FlowInfo(
+            (String) flow.get("tenantId"),
+            (String) flow.get("namespace"),
+            (String) flow.get("id"),
+            (Integer) flow.get("revision")
+        );
     }
 
     /**
@@ -612,25 +594,6 @@ public class DefaultRunContext extends RunContext {
         return new AclCheckerImpl(this.applicationContext, flowInfo());
     }
 
-    @Override
-    public AssetEmitter assets() throws IllegalVariableEvaluationException {
-        if (this.assetEmitter == null) {
-            synchronized (this) {
-                if (this.assetEmitter == null) {
-                    this.assetEmitter = assetManagerFactory.of(
-                        Optional.ofNullable(task).map(Task::getAssets)
-                            .or(() -> Optional.ofNullable(trigger).map(AbstractTrigger::getAssets))
-                            .flatMap(throwFunction(asset -> this.render(asset).as(AssetsDeclaration.class)))
-                            .map(AssetsDeclaration::isEnableAuto)
-                            .orElse(false)
-                    );
-                }
-            }
-        }
-
-        return this.assetEmitter;
-    }
-
     @Override
     public LocalPath localPath() {
         return localPath;

core/src/main/java/io/kestra/core/runners/RunContext.java

@@ -143,8 +143,6 @@ public abstract class RunContext implements PropertyContext {
     @Deprecated(forRemoval = true)
     public abstract String tenantId();
 
-    public abstract TaskRunInfo taskRunInfo();
-
     public abstract FlowInfo flowInfo();
 
     /**
@@ -192,19 +190,7 @@ public abstract class RunContext implements PropertyContext {
      */
     public abstract LocalPath localPath();
 
-    public record TaskRunInfo(String executionId, String taskId, String taskRunId, Object value) {
-
-    }
-
     public record FlowInfo(String tenantId, String namespace, String id, Integer revision) {
-        public static FlowInfo from(Map<String, Object> flowInfoMap) {
-            return new FlowInfo(
-                (String) flowInfoMap.get("tenantId"),
-                (String) flowInfoMap.get("namespace"),
-                (String) flowInfoMap.get("id"),
-                (Integer) flowInfoMap.get("revision")
-            );
-        }
     }
 
     /**
@@ -220,11 +206,6 @@ public abstract class RunContext implements PropertyContext {
      */
     public abstract AclChecker acl();
 
-    /**
-     * Get access to the Assets handler.
-     */
-    public abstract AssetEmitter assets() throws IllegalVariableEvaluationException;
-
     /**
      * Clone this run context for a specific plugin.
      * @return a new run context with the plugin configuration of the given plugin.

core/src/main/java/io/kestra/core/runners/WorkerTaskResult.java

@@ -21,7 +21,8 @@ public class WorkerTaskResult implements HasUID {
     List<TaskRun> dynamicTaskRuns;
 
     public WorkerTaskResult(TaskRun taskRun) {
-        this(taskRun, new ArrayList<>(1)); // there are usually very few dynamic task runs, so we init the list with a capacity of 1
+        this.taskRun = taskRun;
+        this.dynamicTaskRuns = new ArrayList<>();
     }
 
     /**

core/src/main/java/io/kestra/core/runners/pebble/functions/AbstractFileFunction.java

@@ -1,6 +1,5 @@
 package io.kestra.core.runners.pebble.functions;
 
-import com.cronutils.utils.VisibleForTesting;
 import io.kestra.core.runners.LocalPath;
 import io.kestra.core.runners.LocalPathFactory;
 import io.kestra.core.services.NamespaceService;
@@ -156,11 +155,31 @@ abstract class AbstractFileFunction implements Function {
     }
 
     private String checkIfFileFromAllowedNamespaceAndReturnIt(URI path, String tenantId, String fromNamespace) {
+        // Extract namespace from the path, it should be of the form: kestra:///({tenantId}/){namespace}/{flowId}/executions/{executionId}/tasks/{taskId}/{taskRunId}/{fileName}'
+        // To extract the namespace, we must do it step by step as tenantId, namespace and taskId can contain the words 'executions' and 'tasks'
+        String namespace = path.toString().substring(KESTRA_SCHEME.length());
+        if (!EXECUTION_FILE.matcher(namespace).matches()) {
+            throw new IllegalArgumentException("Unable to read the file '" + path + "' as it is not an execution file");
+        }
+
+        // 1. remove the tenantId if existing
+        if (tenantId != null) {
+            namespace = namespace.substring(tenantId.length() + 1);
+        }
+        // 2. remove everything after tasks
+        namespace = namespace.substring(0, namespace.lastIndexOf("/tasks/"));
+        // 3. remove everything after executions
+        namespace = namespace.substring(0, namespace.lastIndexOf("/executions/"));
+        // 4. remove the flowId
+        namespace = namespace.substring(0, namespace.lastIndexOf('/'));
+        // 5. replace '/' with '.'
+        namespace = namespace.replace("/", ".");
 
-        String namespace = extractNamespace(path);
         namespaceService.checkAllowedNamespace(tenantId, namespace, tenantId, fromNamespace);
+
         return namespace;
     }
+
     private String checkEnabledLocalFileAndReturnNamespace(Map<String, Object> args, Map<String, String> flow) {
         if (!enableFileProtocol) {
             throw new SecurityException("The file:// protocol has been disabled inside the Kestra configuration.");
@@ -181,24 +200,4 @@ abstract class AbstractFileFunction implements Function {
         }
         return Optional.ofNullable(customNs).orElse(flow.get(NAMESPACE));
     }
-
-    @VisibleForTesting
-    String extractNamespace( URI path){
-        // Extract namespace from the path, it should be of the form: kestra:///{namespace}/{flowId}/executions/{executionId}/tasks/{taskId}/{taskRunId}/{fileName}'
-        // To extract the namespace, we must do it step by step as namespace and taskId can contain the words 'executions' and 'tasks'
-        String namespace = path.toString().substring(KESTRA_SCHEME.length());
-        if (!EXECUTION_FILE.matcher(namespace).matches()) {
-            throw new IllegalArgumentException("Unable to read the file '" + path + "' as it is not an execution file");
-        }
-        // 1. remove everything after tasks
-        namespace = namespace.substring(0, namespace.lastIndexOf("/tasks/"));
-        // 2. remove everything after executions
-        namespace = namespace.substring(0, namespace.lastIndexOf("/executions/"));
-        // 3. remove the flowId
-        namespace = namespace.substring(0, namespace.lastIndexOf('/'));
-        // 4. replace '/' with '.'
-        namespace = namespace.replace("/", ".");
-
-        return namespace;
-    }
 }

core/src/main/java/io/kestra/core/services/ExecutionService.java

@@ -187,7 +187,7 @@ public class ExecutionService {
     }
 
     public Execution restart(final Execution execution, @Nullable Integer revision) throws Exception {
-        if (!execution.getState().canBeRestarted()) {
+        if (!(execution.getState().isTerminated() || execution.getState().isPaused())) {
             throw new IllegalStateException("Execution must be terminated to be restarted, " +
                 "current state is '" + execution.getState().getCurrent() + "' !"
             );

core/src/main/java/io/kestra/core/test/TestSuite.java

@@ -1,7 +1,7 @@
 package io.kestra.core.test;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.kestra.core.models.DeletedInterface;
+import io.kestra.core.models.SoftDeletable;
 import io.kestra.core.models.HasSource;
 import io.kestra.core.models.HasUID;
 import io.kestra.core.models.TenantInterface;
@@ -25,7 +25,7 @@ import java.util.List;
 @ToString
 @EqualsAndHashCode
 @TestSuiteValidation
-public class TestSuite implements HasUID, TenantInterface, DeletedInterface, HasSource {
+public class TestSuite implements HasUID, TenantInterface, SoftDeletable<TestSuite>, HasSource {
 
     @NotNull
     @NotBlank
@@ -85,10 +85,6 @@ public class TestSuite implements HasUID, TenantInterface, DeletedInterface, Has
             );
     }
 
-    public TestSuite delete() {
-        return this.toBuilder().deleted(true).build();
-    }
-
     public TestSuite disable() {
         var disabled = true;
         return this.toBuilder()
@@ -120,4 +116,9 @@ public class TestSuite implements HasUID, TenantInterface, DeletedInterface, Has
 
         return yamlSource + String.format("\ndisabled: %s", disabled);
     }
+
+    @Override
+    public TestSuite toDeleted() {
+        return toBuilder().deleted(true).build();
+    }
 }

core/src/main/java/io/kestra/core/test/TestSuiteRunEntity.java

@@ -1,6 +1,6 @@
 package io.kestra.core.test;
 
-import io.kestra.core.models.DeletedInterface;
+import io.kestra.core.models.SoftDeletable;
 import io.kestra.core.models.HasUID;
 import io.kestra.core.models.TenantInterface;
 import io.kestra.core.test.flow.UnitTestResult;
@@ -24,7 +24,7 @@ public record TestSuiteRunEntity(
     String flowId,
     TestState state,
     List<UnitTestResult> results
-) implements DeletedInterface, TenantInterface, HasUID {
+) implements SoftDeletable<TestSuiteRunEntity>, TenantInterface, HasUID {
 
     public static TestSuiteRunEntity create(String tenantId, TestSuiteUid testSuiteUid, TestSuiteRunResult testSuiteRunResult) {
         return new TestSuiteRunEntity(
@@ -43,23 +43,6 @@ public record TestSuiteRunEntity(
         );
     }
 
-    public TestSuiteRunEntity delete() {
-        return new TestSuiteRunEntity(
-            this.uid,
-            this.id,
-            this.tenantId,
-            true,
-            this.startDate,
-            this.endDate,
-            this.testSuiteId,
-            this.testSuiteUid,
-            this.namespace,
-            this.flowId,
-            this.state,
-            this.results
-        );
-    }
-
     /**
      * only used for backup
      * @param newTenantId the tenant to migrate to
@@ -86,6 +69,24 @@ public record TestSuiteRunEntity(
         return this.deleted;
     }
 
+    @Override
+    public TestSuiteRunEntity toDeleted() {
+        return new TestSuiteRunEntity(
+            this.uid,
+            this.id,
+            this.tenantId,
+            true,
+            this.startDate,
+            this.endDate,
+            this.testSuiteId,
+            this.testSuiteUid,
+            this.namespace,
+            this.flowId,
+            this.state,
+            this.results
+        );
+    }
+
     @Override
     public String getTenantId() {
         return this.tenantId;

core/src/main/java/io/kestra/core/test/flow/TaskFixture.java

@@ -1,6 +1,5 @@
 package io.kestra.core.test.flow;
 
-import io.kestra.core.models.assets.Asset;
 import io.kestra.core.models.flows.State;
 import io.kestra.core.models.property.Property;
 import jakarta.validation.constraints.NotNull;
@@ -9,7 +8,6 @@ import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
 import java.util.Map;
 
 @Getter
@@ -27,7 +25,5 @@ public class TaskFixture {
 
     private Map<String, Object> outputs;
 
-    private List<Asset> assets;
-
     private Property<String> description;
 }

core/src/main/java/io/kestra/core/utils/ListUtils.java

@@ -70,12 +70,4 @@ public class ListUtils {
             .map(Object::toString)
             .toList();
     }
-
-    public static <T> List<List<T>> partition(List<T> list, int size) {
-        List<List<T>> parts = new ArrayList<>();
-        for (int i = 0; i < list.size(); i += size) {
-            parts.add(list.subList(i, Math.min(i + size, list.size())));
-        }
-        return parts;
-    }
 }

core/src/main/java/io/kestra/core/validations/validator/FlowValidator.java

@@ -19,7 +19,15 @@ import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -147,8 +155,6 @@ public class FlowValidator implements ConstraintValidator<FlowValidation, Flow>
             .map(task -> task.getId())
             .collect(Collectors.toList());
 
-        violations.addAll(assetsViolations(allTasks));
-
         if (!invalidTasks.isEmpty()) {
             violations.add("Invalid output reference: use outputs[key-name] instead of outputs.key-name — keys with dashes require bracket notation, offending tasks:" +
                 " [" + String.join(", ", invalidTasks) + "]");
@@ -175,12 +181,6 @@ public class FlowValidator implements ConstraintValidator<FlowValidation, Flow>
         }
     }
 
-    protected List<String> assetsViolations(List<Task> allTasks) {
-        return allTasks.stream().filter(task -> task.getAssets() != null)
-            .map(taskWithAssets -> "Task '" + taskWithAssets.getId() + "' can't have any `assets` because assets are only available in Enterprise Edition.")
-            .toList();
-    }
-
     private static boolean checkObjectFieldsWithPatterns(Object object, List<Pattern> patterns) {
         if (object == null) {
             return true;

core/src/main/java/io/kestra/plugin/core/execution/SetVariables.java

@@ -15,7 +15,6 @@ import lombok.experimental.SuperBuilder;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Collections;
 
 @SuperBuilder
 @ToString
@@ -63,24 +62,14 @@ public class SetVariables extends Task implements ExecutionUpdatableTask {
     public Execution update(Execution execution, RunContext runContext) throws Exception {
         Map<String, Object> renderedVars = runContext.render(this.variables).asMap(String.class, Object.class);
         boolean renderedOverwrite = runContext.render(overwrite).as(Boolean.class).orElseThrow();
-
-        Map<String, Object> currentVariables =
-            execution.getVariables() == null ? Collections.emptyMap() : execution.getVariables();
-
         if (!renderedOverwrite) {
             // check that none of the new variables already exist
-            List<String> duplicated = renderedVars.keySet().stream()
-                .filter(currentVariables::containsKey)
-                .toList();
-
+            List<String> duplicated = renderedVars.keySet().stream().filter(key -> execution.getVariables().containsKey(key)).toList();
             if (!duplicated.isEmpty()) {
-                throw new IllegalArgumentException(
-                    "`overwrite` is set to false and the following variables already exist: " +
-                    String.join(",", duplicated)
-                );
+                throw new IllegalArgumentException("`overwrite` is set to false and the following variables already exist: " + String.join(",", duplicated));
             }
         }
 
-        return execution.withVariables(MapUtils.deepMerge(currentVariables, renderedVars));
+        return execution.withVariables(MapUtils.deepMerge(execution.getVariables(), renderedVars));
     }
 }

core/src/main/java/io/kestra/plugin/core/trigger/Webhook.java

@@ -183,7 +183,6 @@ public class Webhook extends AbstractTrigger implements TriggerOutput<Webhook.Ou
             .flowId(flow.getId())
             .flowRevision(flow.getRevision())
             .inputs(inputs)
-            .variables(flow.getVariables())
             .state(new State())
             .trigger(ExecutionTrigger.of(
                 this,

core/src/test/java/io/kestra/core/contexts/KestraContextTest.java

@@ -1,14 +1,16 @@
 package io.kestra.core.contexts;
 
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import io.kestra.core.junit.annotations.KestraTest;
+import io.micronaut.context.ApplicationContext;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 
+import java.util.Map;
 import java.util.Optional;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@MicronautTest
+@KestraTest
 class KestraContextTest {
 
     @Inject

core/src/test/java/io/kestra/core/contexts/MavenPluginRepositoryConfigTest.java

@@ -1,7 +1,8 @@
 package io.kestra.core.contexts;
 
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import io.kestra.core.junit.annotations.KestraTest;
 import jakarta.inject.Inject;
+import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -9,7 +10,7 @@ import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@MicronautTest(environments = "maven")
+@KestraTest(environments = "maven")
 class MavenPluginRepositoryConfigTest {
 
     @Inject

core/src/test/java/io/kestra/core/docs/ClassPluginDocumentationTest.java

@@ -103,7 +103,7 @@ class ClassPluginDocumentationTest {
             PluginClassAndMetadata<AbstractTrigger> metadata = PluginClassAndMetadata.create(scan, Schedule.class, AbstractTrigger.class, null);
             ClassPluginDocumentation<? extends AbstractTrigger> doc = ClassPluginDocumentation.of(jsonSchemaGenerator, metadata, scan.version(), true);
 
-            assertThat(doc.getDefs()).hasSize(23);
+            assertThat(doc.getDefs().size()).isEqualTo(20);
             assertThat(doc.getDocLicense()).isNull();
 
             assertThat(((Map<String, Object>) doc.getDefs().get("io.kestra.core.models.tasks.WorkerGroup")).get("type")).isEqualTo("object");
@@ -142,9 +142,9 @@ class ClassPluginDocumentationTest {
             ClassPluginDocumentation<? extends DynamicPropertyExampleTask> doc = ClassPluginDocumentation.of(jsonSchemaGenerator, metadata, scan.version(), true);
 
             assertThat(doc.getCls()).isEqualTo("io.kestra.core.models.property.DynamicPropertyExampleTask");
-            assertThat(doc.getDefs()).hasSize(9);
+            assertThat(doc.getDefs()).hasSize(6);
             Map<String, Object> properties = (Map<String, Object>) doc.getPropertiesSchema().get("properties");
-            assertThat(properties).hasSize(22);
+            assertThat(properties).hasSize(21);
 
             Map<String, Object> number = (Map<String, Object>) properties.get("number");
             assertThat(number.get("anyOf")).isNotNull();

core/src/test/java/io/kestra/core/docs/DocumentationGeneratorTest.java

@@ -10,7 +10,7 @@ import io.kestra.plugin.core.debug.Return;
 import io.kestra.plugin.core.flow.Dag;
 import io.kestra.plugin.core.flow.Subflow;
 import io.kestra.plugin.core.state.Set;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import io.kestra.core.junit.annotations.KestraTest;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.parallel.ExecutionMode;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@MicronautTest
+@KestraTest
 @Execution(ExecutionMode.SAME_THREAD)
 class DocumentationGeneratorTest {
     @Inject

core/src/test/java/io/kestra/core/docs/JsonSchemaGeneratorTest.java

@@ -47,6 +47,7 @@ import static org.hamcrest.Matchers.*;
 @KestraTest
 class JsonSchemaGeneratorTest {
 
+
     @Inject
     JsonSchemaGenerator jsonSchemaGenerator;
 
@@ -345,7 +346,7 @@ class JsonSchemaGeneratorTest {
     void pluginSchemaShouldNotResolveTaskAndTriggerSubtypes() {
         Map<String, Object> generate = jsonSchemaGenerator.properties(null, TaskWithSubTaskAndSubTrigger.class);
         var definitions = (Map<String, Map<String, Object>>) generate.get("$defs");
-        assertThat(definitions.size(), is(30));
+        assertThat(definitions.size(), is(27));
     }
 
     @SuppressWarnings("unchecked")

core/src/test/java/io/kestra/core/models/LabelTest.java

@@ -2,7 +2,6 @@ package io.kestra.core.models;
 
 import io.kestra.core.junit.annotations.KestraTest;
 import io.kestra.core.models.validations.ModelValidator;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import jakarta.inject.Inject;
 import jakarta.validation.ConstraintViolationException;
 import org.junit.jupiter.api.Test;
@@ -13,7 +12,7 @@ import java.util.Optional;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@MicronautTest
+@KestraTest
 class LabelTest {
     @Inject
     private ModelValidator modelValidator;

core/src/test/java/io/kestra/core/models/property/PropertyTest.java

@@ -5,21 +5,26 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import io.kestra.core.context.TestRunContextFactory;
 import io.kestra.core.exceptions.IllegalVariableEvaluationException;
+import io.kestra.core.junit.annotations.KestraTest;
 import io.kestra.core.serializers.FileSerde;
 import io.kestra.core.serializers.JacksonMapper;
+import io.kestra.core.storages.Namespace;
+import io.kestra.core.storages.NamespaceFile;
 import io.kestra.core.storages.StorageInterface;
+import io.kestra.plugin.core.namespace.Version;
 import io.micronaut.core.annotation.Introspected;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import jakarta.inject.Inject;
 import jakarta.validation.ConstraintViolationException;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 import org.junit.jupiter.api.Test;
 import org.slf4j.event.Level;
 import reactor.core.publisher.Flux;
 
 import java.io.FileInputStream;
+import java.io.IOException;
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -32,7 +37,7 @@ import static java.util.Map.entry;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-@MicronautTest
+@KestraTest
 class PropertyTest {
 
     @Inject

core/src/test/java/io/kestra/core/models/property/URIFetcherTest.java

@@ -1,11 +1,12 @@
 package io.kestra.core.models.property;
 
+import io.kestra.core.junit.annotations.KestraTest;
 import io.kestra.core.runners.*;
 import io.kestra.core.storages.Namespace;
 import io.kestra.core.storages.NamespaceFactory;
+import io.kestra.core.storages.StorageContext;
 import io.kestra.core.storages.StorageInterface;
 import io.kestra.core.utils.IdUtils;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
@@ -27,7 +28,7 @@ import static io.kestra.core.tenant.TenantService.MAIN_TENANT;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-@MicronautTest
+@KestraTest
 class URIFetcherTest {
     @Inject
     private StorageInterface storage;

core/src/test/java/io/kestra/core/models/triggers/StatefulTriggerInterfaceTest.java

@@ -1,8 +1,9 @@
 package io.kestra.core.models.triggers;
 
+import io.kestra.core.junit.annotations.KestraTest;
+import io.kestra.core.models.TenantInterface;
 import io.kestra.core.models.flows.Flow;
 import io.kestra.core.runners.RunContextFactory;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 
@@ -16,7 +17,7 @@ import static io.kestra.core.models.triggers.StatefulTriggerService.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 
-@MicronautTest
+@KestraTest
 class StatefulTriggerInterfaceTest {
     @Inject
     RunContextFactory runContextFactory;

core/src/test/java/io/kestra/core/models/triggers/multipleflows/AbstractMultipleConditionStorageTest.java

@@ -4,7 +4,6 @@ import com.google.common.collect.ImmutableMap;
 import io.kestra.core.junit.annotations.KestraTest;
 import io.kestra.core.models.property.Property;
 import io.kestra.core.utils.TestsUtils;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.jupiter.api.Test;
 import io.kestra.plugin.core.condition.ExecutionFlow;
@@ -24,7 +23,7 @@ import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@MicronautTest(transactional = false)
+@KestraTest
 public abstract class AbstractMultipleConditionStorageTest {
     private static final String NAMESPACE = "io.kestra.unit";
 

core/src/test/java/io/kestra/core/plugins/AdditionalPluginTest.java

@@ -15,11 +15,13 @@ import jakarta.inject.Inject;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
+import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.Matchers.is;
 
 @KestraTest(startRunner = true)
 class AdditionalPluginTest {
@@ -41,7 +43,7 @@ class AdditionalPluginTest {
     void shouldResolveAdditionalPluginSubtypes() {
         Map<String, Object> generate = jsonSchemaGenerator.properties(null, AdditionalPluginTest.AdditionalPluginTestTask.class);
         var definitions = (Map<String, Map<String, Object>>) generate.get("$defs");
-        assertThat(definitions).hasSize(10);
+        assertThat(definitions).hasSize(7);
         assertThat(definitions).containsKey("io.kestra.core.plugins.AdditionalPluginTest-AdditionalPluginTest1");
         assertThat(definitions).containsKey("io.kestra.core.plugins.AdditionalPluginTest-AdditionalPluginTest2");
     }

core/src/test/java/io/kestra/core/plugins/PluginConfigurationTest.java

@@ -1,15 +1,17 @@
 package io.kestra.core.plugins;
 
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import io.kestra.core.junit.annotations.KestraTest;
 import jakarta.inject.Inject;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.IntStream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@MicronautTest
+@KestraTest
 class PluginConfigurationTest {
 
     @Inject

core/src/test/java/io/kestra/core/plugins/serdes/PluginDeserializerTest.java

@@ -95,4 +95,4 @@ class PluginDeserializerTest {
 
     public record TestPlugin(String type) implements Plugin {
     }
-}
+}

core/src/test/java/io/kestra/core/reporter/reports/AbstractFeatureUsageReportTest.java

@@ -1,7 +1,7 @@
 package io.kestra.core.reporter.reports;
 
+import io.kestra.core.junit.annotations.KestraTest;
 import io.kestra.core.reporter.Reportable;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 
@@ -11,7 +11,7 @@ import java.time.ZoneId;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@MicronautTest
+@KestraTest
 public abstract class AbstractFeatureUsageReportTest {
 
     @Inject

core/src/test/java/io/kestra/core/reporter/reports/AbstractServiceUsageReportTest.java

@@ -1,5 +1,6 @@
 package io.kestra.core.reporter.reports;
 
+import io.kestra.core.junit.annotations.KestraTest;
 import io.kestra.core.models.collectors.ServiceUsage;
 import io.kestra.core.reporter.Reportable;
 import io.kestra.core.repositories.ServiceInstanceRepositoryInterface;
@@ -7,7 +8,6 @@ import io.kestra.core.server.Service;
 import io.kestra.core.server.ServiceInstance;
 import io.kestra.core.server.ServiceType;
 import io.kestra.core.utils.IdUtils;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-@MicronautTest
+@KestraTest
 public abstract class AbstractServiceUsageReportTest {
 
     @Inject

core/src/test/java/io/kestra/core/reporter/reports/PluginMetricReportTest.java

@@ -1,10 +1,10 @@
 package io.kestra.core.reporter.reports;
 
+import io.kestra.core.junit.annotations.KestraTest;
 import io.kestra.core.metrics.MetricRegistry;
 import io.kestra.plugin.core.http.Trigger;
 import io.kestra.plugin.core.log.Log;
 import io.kestra.plugin.core.trigger.Schedule;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 
@@ -13,7 +13,7 @@ import java.time.Instant;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@MicronautTest
+@KestraTest
 class PluginMetricReportTest {
     
     @Inject

core/src/test/java/io/kestra/core/reporter/reports/SystemInformationReportTest.java

@@ -1,9 +1,9 @@
 package io.kestra.core.reporter.reports;
 
+import io.kestra.core.junit.annotations.KestraTest;
 import io.kestra.core.models.Setting;
 import io.kestra.core.repositories.SettingRepositoryInterface;
 import io.micronaut.test.annotation.MockBean;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 import jakarta.validation.ConstraintViolationException;
@@ -16,7 +16,7 @@ import java.util.Optional;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@MicronautTest
+@KestraTest
 class SystemInformationReportTest {
 
     @Inject

core/src/test/java/io/kestra/core/repositories/AbstractExecutionRepositoryTest.java

@@ -4,6 +4,7 @@ import com.devskiller.friendly_id.FriendlyId;
 import com.google.common.collect.ImmutableMap;
 import io.kestra.core.exceptions.InvalidQueryFiltersException;
 import io.kestra.core.junit.annotations.FlakyTest;
+import io.kestra.core.junit.annotations.KestraTest;
 import io.kestra.core.models.Label;
 import io.kestra.core.models.QueryFilter;
 import io.kestra.core.models.QueryFilter.Field;
@@ -32,7 +33,6 @@ import io.micronaut.data.model.Pageable;
 import io.micronaut.data.model.Sort;
 import io.micronaut.http.HttpStatus;
 import io.micronaut.http.exceptions.HttpStatusException;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -58,7 +58,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 
-@MicronautTest
+@KestraTest
 public abstract class AbstractExecutionRepositoryTest {
     public static final String NAMESPACE = "io.kestra.unittest";
     public static final String FLOW = "full";

core/src/test/java/io/kestra/core/repositories/AbstractExecutionServiceTest.java

@@ -10,7 +10,7 @@ import io.kestra.core.runners.RunContextFactory;
 import io.kestra.core.services.ExecutionService;
 import io.kestra.plugin.core.debug.Return;
 import io.kestra.core.utils.IdUtils;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import io.kestra.core.junit.annotations.KestraTest;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 import org.slf4j.event.Level;
@@ -28,7 +28,7 @@ import java.util.Objects;
 import static io.kestra.core.tenant.TenantService.MAIN_TENANT;
 import static org.assertj.core.api.Assertions.assertThat;
 
-@MicronautTest
+@KestraTest
 public abstract class AbstractExecutionServiceTest {
     @Inject
     ExecutionService executionService;

core/src/test/java/io/kestra/core/repositories/AbstractFlowRepositoryTest.java

@@ -4,6 +4,7 @@ import com.google.common.collect.ImmutableMap;
 import io.kestra.core.events.CrudEvent;
 import io.kestra.core.events.CrudEventType;
 import io.kestra.core.exceptions.InvalidQueryFiltersException;
+import io.kestra.core.junit.annotations.KestraTest;
 import io.kestra.core.models.Label;
 import io.kestra.core.models.QueryFilter;
 import io.kestra.core.models.QueryFilter.Field;
@@ -25,7 +26,6 @@ import io.kestra.core.utils.TestsUtils;
 import io.kestra.plugin.core.debug.Return;
 import io.micronaut.context.event.ApplicationEventListener;
 import io.micronaut.data.model.Pageable;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 import jakarta.validation.ConstraintViolationException;
@@ -49,7 +49,7 @@ import static io.kestra.core.utils.NamespaceUtils.SYSTEM_FLOWS_DEFAULT_NAMESPACE
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
-@MicronautTest(transactional = false)
+@KestraTest
 public abstract class AbstractFlowRepositoryTest {
     public static final String TEST_NAMESPACE = "io.kestra.unittest";
     public static final String TEST_FLOW_ID = "test";

core/src/test/java/io/kestra/core/repositories/AbstractFlowTopologyRepositoryTest.java

@@ -3,8 +3,8 @@ package io.kestra.core.repositories;
 import io.kestra.core.models.topologies.FlowNode;
 import io.kestra.core.models.topologies.FlowRelation;
 import io.kestra.core.models.topologies.FlowTopology;
+import io.kestra.core.junit.annotations.KestraTest;
 import io.kestra.core.utils.TestsUtils;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 
@@ -12,7 +12,7 @@ import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@MicronautTest
+@KestraTest
 public abstract class AbstractFlowTopologyRepositoryTest {
     @Inject
     private FlowTopologyRepositoryInterface flowTopologyRepository;

core/src/test/java/io/kestra/core/repositories/AbstractKvMetadataRepositoryTest.java

@@ -4,8 +4,8 @@ import io.kestra.core.models.FetchVersion;
 import io.kestra.core.models.QueryFilter;
 import io.kestra.core.models.kv.PersistedKvMetadata;
 import io.kestra.core.utils.TestsUtils;
+import io.kestra.core.junit.annotations.KestraTest;
 import io.micronaut.data.model.Pageable;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 
@@ -18,7 +18,7 @@ import java.util.Optional;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@MicronautTest
+@KestraTest
 public abstract class AbstractKvMetadataRepositoryTest {
     @Inject
     protected KvMetadataRepositoryInterface kvMetadataRepositoryInterface;

core/src/test/java/io/kestra/core/repositories/AbstractLogRepositoryTest.java

@@ -1,6 +1,7 @@
 package io.kestra.core.repositories;
 
 import io.kestra.core.exceptions.InvalidQueryFiltersException;
+import io.kestra.core.junit.annotations.KestraTest;
 import io.kestra.core.models.QueryFilter;
 import io.kestra.core.models.QueryFilter.Field;
 import io.kestra.core.models.QueryFilter.Op;
@@ -13,9 +14,9 @@ import io.kestra.core.models.flows.State;
 import io.kestra.core.repositories.ExecutionRepositoryInterface.ChildFilter;
 import io.kestra.core.utils.IdUtils;
 import io.kestra.core.utils.TestsUtils;
+import io.kestra.plugin.core.dashboard.data.Executions;
 import io.kestra.plugin.core.dashboard.data.Logs;
 import io.micronaut.data.model.Pageable;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -36,7 +37,7 @@ import static io.kestra.core.models.flows.FlowScope.USER;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-@MicronautTest(transactional = false)
+@KestraTest
 public abstract class AbstractLogRepositoryTest {
     @Inject
     protected LogRepositoryInterface logRepository;

core/src/test/java/io/kestra/core/repositories/AbstractMetricRepositoryTest.java

@@ -10,9 +10,10 @@ import io.kestra.core.models.executions.metrics.MetricAggregations;
 import io.kestra.core.models.executions.metrics.Timer;
 import io.kestra.core.utils.TestsUtils;
 import io.micronaut.data.model.Pageable;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import io.kestra.core.junit.annotations.KestraTest;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
+import org.slf4j.event.Level;
 
 import java.time.Duration;
 import java.time.ZonedDateTime;
@@ -20,7 +21,7 @@ import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@MicronautTest
+@KestraTest
 public abstract class AbstractMetricRepositoryTest {
     @Inject
     protected MetricRepositoryInterface metricRepository;

core/src/test/java/io/kestra/core/repositories/AbstractNamespaceFileMetadataRepositoryTest.java

@@ -1,11 +1,11 @@
 package io.kestra.core.repositories;
 
+import io.kestra.core.junit.annotations.KestraTest;
 import io.kestra.core.models.FetchVersion;
 import io.kestra.core.models.QueryFilter;
 import io.kestra.core.models.namespaces.files.NamespaceFileMetadata;
 import io.kestra.core.utils.TestsUtils;
 import io.micronaut.data.model.Pageable;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -21,7 +21,7 @@ import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@MicronautTest(transactional = false)
+@KestraTest
 public abstract class AbstractNamespaceFileMetadataRepositoryTest {
     @Inject
     protected NamespaceFileMetadataRepositoryInterface namespaceFileMetadataRepositoryInterface;

core/src/test/java/io/kestra/core/repositories/AbstractSettingRepositoryTest.java

@@ -2,8 +2,8 @@ package io.kestra.core.repositories;
 
 import io.kestra.core.models.Setting;
 import io.kestra.core.utils.IdUtils;
+import io.kestra.core.junit.annotations.KestraTest;
 import io.kestra.core.utils.VersionProvider;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 
@@ -12,7 +12,7 @@ import java.util.Optional;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@MicronautTest
+@KestraTest
 public abstract class AbstractSettingRepositoryTest {
     @Inject
     protected SettingRepositoryInterface settingRepository;

core/src/test/java/io/kestra/core/repositories/AbstractTemplateRepositoryTest.java

@@ -10,7 +10,7 @@ import io.kestra.plugin.core.debug.Return;
 import io.kestra.core.utils.IdUtils;
 import io.micronaut.context.event.ApplicationEventListener;
 import io.micronaut.data.model.Pageable;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import io.kestra.core.junit.annotations.KestraTest;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 import java.time.Duration;
@@ -21,6 +21,7 @@ import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -29,7 +30,7 @@ import org.slf4j.LoggerFactory;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@MicronautTest
+@KestraTest
 public abstract class AbstractTemplateRepositoryTest {
     @Inject
     protected TemplateRepositoryInterface templateRepository;

core/src/test/java/io/kestra/core/repositories/AbstractTriggerRepositoryTest.java

@@ -12,7 +12,6 @@ import io.kestra.core.utils.IdUtils;
 import io.kestra.core.utils.TestsUtils;
 import io.micronaut.data.model.Pageable;
 import io.micronaut.data.model.Sort;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -29,7 +28,7 @@ import static io.kestra.core.models.flows.FlowScope.USER;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-@MicronautTest(transactional = false)
+@KestraTest
 public abstract class AbstractTriggerRepositoryTest {
     private static final String TEST_NAMESPACE = "io.kestra.unittest";
 

core/src/test/java/io/kestra/core/runners/AbstractRunnerTest.java

@@ -558,4 +558,4 @@ public abstract class AbstractRunnerTest {
     public void shouldCallTasksAfterListener(Execution execution) {
         afterExecutionTestCase.shouldCallTasksAfterListener(execution);
     }
-}
+}

core/src/test/java/io/kestra/core/runners/FlowInputOutputTest.java

@@ -22,7 +22,6 @@ import io.micronaut.http.MediaType;
 import io.micronaut.http.multipart.CompletedFileUpload;
 import io.micronaut.http.multipart.CompletedPart;
 import io.micronaut.test.annotation.MockBean;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import jakarta.inject.Inject;
 import org.jetbrains.annotations.Nullable;
 import org.junit.jupiter.api.Assertions;
@@ -43,7 +42,7 @@ import java.util.Optional;
 import static io.kestra.core.tenant.TenantService.MAIN_TENANT;
 import static org.assertj.core.api.Assertions.assertThat;
 
-@MicronautTest
+@KestraTest
 class FlowInputOutputTest {
 
     private static final String TEST_SECRET_VALUE = "test-secret-value";

core/src/test/java/io/kestra/core/runners/RunVariablesTest.java

@@ -1,5 +1,6 @@
 package io.kestra.core.runners;
 
+import io.kestra.core.junit.annotations.KestraTest;
 import io.kestra.core.models.executions.Execution;
 import io.kestra.core.models.flows.DependsOn;
 import io.kestra.core.models.flows.Flow;
@@ -23,7 +24,6 @@ import io.kestra.core.utils.IdUtils;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micronaut.context.ApplicationContext;
 import io.micronaut.test.annotation.MockBean;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import jakarta.inject.Inject;
 import org.jetbrains.annotations.Nullable;
 import org.junit.jupiter.api.Assertions;
@@ -36,7 +36,7 @@ import java.util.Optional;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@MicronautTest
+@KestraTest
 class RunVariablesTest {
 
     @Inject

core/src/test/java/io/kestra/core/runners/VariableRendererTest.java

@@ -1,8 +1,8 @@
 package io.kestra.core.runners;
 
 import io.kestra.core.exceptions.IllegalVariableEvaluationException;
+import io.kestra.core.junit.annotations.KestraTest;
 import io.micronaut.context.ApplicationContext;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import jakarta.inject.Inject;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -14,7 +14,7 @@ import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@MicronautTest
+@KestraTest
 class VariableRendererTest {
 
     @Inject

core/src/test/java/io/kestra/core/runners/pebble/PebbleVariableRendererTest.java

@@ -6,7 +6,7 @@ import com.google.common.collect.ImmutableSet;
 import io.kestra.core.exceptions.IllegalVariableEvaluationException;
 import io.kestra.core.runners.VariableRenderer;
 import io.kestra.core.utils.Rethrow;
-import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import io.kestra.core.junit.annotations.KestraTest;
 import org.junit.jupiter.api.Test;
 
 import java.time.ZonedDateTime;
@@ -18,7 +18,7 @@ import jakarta.inject.Inject;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-@MicronautTest
+@KestraTest
 class PebbleVariableRendererTest {
     @Inject
     VariableRenderer variableRenderer;