mirror of
https://github.com/kestra-io/kestra.git
synced 2025-12-19 18:05:41 -05:00
chore(deps): upgrade micronaut-platform to 4.8.0 (#8232)
* chore(deps): upgrade micronaut-platform to 4.8.0 * fix: http client version enforcement is not needed anymore as docker-java as updated the dependency * fix: make applicationContext protected in SchedulerPollingTriggerTest * fix: upgrade docker-java version to 3.5.0 * fix: make some method protected in the AbstractRunnerTest so it can be override
This commit is contained in:
@@ -36,5 +36,5 @@ dependencies {
|
||||
implementation project(":webserver")
|
||||
|
||||
//test
|
||||
testImplementation "org.wiremock:wiremock"
|
||||
}
|
||||
testImplementation "org.wiremock:wiremock-jetty12"
|
||||
}
|
||||
|
||||
@@ -179,7 +179,7 @@ public abstract class AbstractRunnerTest {
|
||||
|
||||
@Test
|
||||
@LoadFlows({"flows/valids/restart-parent.yaml", "flows/valids/restart-child.yaml"})
|
||||
void restartSubflow() throws Exception {
|
||||
protected void restartSubflow() throws Exception {
|
||||
restartCaseTest.restartSubflow();
|
||||
}
|
||||
|
||||
@@ -387,13 +387,13 @@ public abstract class AbstractRunnerTest {
|
||||
|
||||
@RetryingTest(5) // Flaky on CI but never locally even with 100 repetitions
|
||||
@LoadFlows({"flows/valids/flow-concurrency-queue-pause.yml"})
|
||||
void concurrencyQueuePause() throws Exception {
|
||||
protected void concurrencyQueuePause() throws Exception {
|
||||
flowConcurrencyCaseTest.flowConcurrencyQueuePause();
|
||||
}
|
||||
|
||||
@Test
|
||||
@LoadFlows({"flows/valids/flow-concurrency-cancel-pause.yml"})
|
||||
void concurrencyCancelPause() throws Exception {
|
||||
protected void concurrencyCancelPause() throws Exception {
|
||||
flowConcurrencyCaseTest.flowConcurrencyCancelPause();
|
||||
}
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ import static org.mockito.Mockito.spy;
|
||||
|
||||
public class SchedulerPollingTriggerTest extends AbstractSchedulerTest {
|
||||
@Inject
|
||||
private ApplicationContext applicationContext;
|
||||
protected ApplicationContext applicationContext;
|
||||
|
||||
@Inject
|
||||
private SchedulerTriggerStateInterface triggerState;
|
||||
|
||||
@@ -25,10 +25,8 @@ dependencies {
|
||||
|
||||
// as Jackson is in the Micronaut BOM, to force its version we need to use enforcedPlatform but it didn't really work, see later :(
|
||||
api enforcedPlatform("com.fasterxml.jackson:jackson-bom:$jacksonVersion")
|
||||
// needed because httpclient fails to communicate with docker socket with > v5.4 (https://github.com/docker-java/docker-java/pull/2293#issuecomment-2435455322) and opensearch-java brings that version
|
||||
api enforcedPlatform("org.apache.httpcomponents.client5:httpclient5:5.3.1")
|
||||
api enforcedPlatform("org.slf4j:slf4j-api:$slf4jVersion")
|
||||
api platform("io.micronaut.platform:micronaut-platform:4.7.6")
|
||||
api platform("io.micronaut.platform:micronaut-platform:4.8.0")
|
||||
api platform("io.qameta.allure:allure-bom:2.29.1")
|
||||
// we define cloud bom here for GCP, Azure and AWS so they are aligned for all plugins that use them (secret, storage, oss and ee plugins)
|
||||
api platform('com.google.cloud:libraries-bom:26.57.0')
|
||||
@@ -37,9 +35,6 @@ dependencies {
|
||||
|
||||
|
||||
constraints {
|
||||
// Forced dependencies
|
||||
// Temporal force to include https://github.com/micronaut-projects/micronaut-core/commit/9bb43ce55ea3fca97c12cb50c5f1baea28557729 as a potential fix for https://github.com/kestra-io/kestra/issues/3402
|
||||
api("io.micronaut:micronaut-core:4.7.15")
|
||||
// need to force this dep as mysql-connector brings a version incompatible with the Google Cloud libs
|
||||
api("com.google.protobuf:protobuf-java:$protobufVersion")
|
||||
api("com.google.protobuf:protobuf-java-util:$protobufVersion")
|
||||
@@ -107,8 +102,8 @@ dependencies {
|
||||
api 'com.h2database:h2:2.3.232'
|
||||
api 'mysql:mysql-connector-java:8.0.33'
|
||||
api 'org.postgresql:postgresql:42.7.5'
|
||||
api 'com.github.docker-java:docker-java:3.4.2'
|
||||
api 'com.github.docker-java:docker-java-transport-httpclient5:3.4.2'
|
||||
api 'com.github.docker-java:docker-java:3.5.0'
|
||||
api 'com.github.docker-java:docker-java-transport-httpclient5:3.5.0'
|
||||
api (group: 'org.opensearch.client', name: 'opensearch-java', version: "$opensearchVersion")
|
||||
api (group: 'org.opensearch.client', name: 'opensearch-rest-client', version: "$opensearchRestVersion")
|
||||
api (group: 'org.opensearch.client', name: 'opensearch-rest-high-level-client', version: "$opensearchRestVersion") // used by the elasticsearch plugin
|
||||
@@ -133,7 +128,7 @@ dependencies {
|
||||
api 'org.hamcrest:hamcrest-library:3.0'
|
||||
api 'org.assertj:assertj-core:3.27.3'
|
||||
api group: 'org.exparity', name: 'hamcrest-date', version: '2.0.8'
|
||||
api "org.wiremock:wiremock:3.10.0"
|
||||
api "org.wiremock:wiremock-jetty12:3.12.1"
|
||||
api "org.apache.kafka:kafka-streams-test-utils:$kafkaVersion"
|
||||
api "com.microsoft.playwright:playwright:1.51.0"
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ dependencies {
|
||||
exclude group: 'com.github.docker-java', module: 'docker-java-transport-jersey'
|
||||
exclude group: 'com.fasterxml.jackson.core'
|
||||
}
|
||||
implementation 'com.github.docker-java:docker-java-transport-httpclient5:3.4.1'
|
||||
implementation 'com.github.docker-java:docker-java-transport-httpclient5'
|
||||
|
||||
testImplementation project(':core').sourceSets.test.output
|
||||
testImplementation project(':tests')
|
||||
|
||||
@@ -26,7 +26,7 @@ dependencies {
|
||||
testAnnotationProcessor project(':processor')
|
||||
testImplementation project(':core').sourceSets.test.output
|
||||
testImplementation project(':storage-local')
|
||||
testImplementation "org.wiremock:wiremock"
|
||||
testImplementation "org.wiremock:wiremock-jetty12"
|
||||
|
||||
testImplementation project(':tests')
|
||||
testImplementation project(':jdbc')
|
||||
|
||||
Reference in New Issue
Block a user