chore(deps): update java deps

This commit is contained in:
Ludovic DEHON
2022-02-22 22:18:10 +01:00
parent 24083fbbce
commit 53d2f1b395
11 changed files with 29 additions and 29 deletions

View File

@@ -11,7 +11,7 @@ plugins {
id 'org.gradle.test-retry' version '1.3.1' id 'org.gradle.test-retry' version '1.3.1'
// helper // helper
id "com.github.ben-manes.versions" version "0.41.0" id "com.github.ben-manes.versions" version "0.42.0"
// front // front
id 'org.siouan.frontend-jdk11' version '6.0.0' apply false id 'org.siouan.frontend-jdk11' version '6.0.0' apply false
@@ -19,7 +19,7 @@ plugins {
// release // release
id "io.github.gradle-nexus.publish-plugin" version "1.1.0" id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
id 'net.researchgate.release' version '2.8.1' id 'net.researchgate.release' version '2.8.1'
id "com.gorylenko.gradle-git-properties" version "2.3.2" id "com.gorylenko.gradle-git-properties" version "2.4.0"
id 'signing' id 'signing'
id 'ru.vyarus.pom' version '2.2.1' apply false id 'ru.vyarus.pom' version '2.2.1' apply false
id 'ru.vyarus.github-info' version '1.3.0' apply false id 'ru.vyarus.github-info' version '1.3.0' apply false
@@ -96,10 +96,10 @@ allprojects {
api "io.micronaut.rxjava2:micronaut-rxjava2-http-client" api "io.micronaut.rxjava2:micronaut-rxjava2-http-client"
// logs // logs
implementation "org.slf4j:slf4j-api:1.7.32" implementation "org.slf4j:slf4j-api:1.7.36"
implementation "ch.qos.logback:logback-classic:1.2.9" implementation "ch.qos.logback:logback-classic:1.2.10"
implementation group: 'org.apache.logging.log4j', name: 'log4j-to-slf4j', version: '2.17.1' implementation group: 'org.apache.logging.log4j', name: 'log4j-to-slf4j', version: '2.17.1'
implementation group: 'org.slf4j', name: 'jul-to-slf4j', version: '1.7.33' implementation group: 'org.slf4j', name: 'jul-to-slf4j', version: '1.7.36'
// jackson // jackson
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind' implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind'

View File

@@ -1,19 +1,12 @@
package io.kestra.cli.commands.configs.sys; package io.kestra.cli.commands.configs.sys;
import io.micronaut.context.ApplicationContext;
import io.micronaut.context.env.Environment;
import io.micronaut.context.env.PropertySource;
import io.micronaut.core.order.Ordered;
import io.micronaut.management.endpoint.env.EnvironmentEndpoint;
import lombok.extern.slf4j.Slf4j;
import io.kestra.cli.AbstractCommand; import io.kestra.cli.AbstractCommand;
import io.kestra.core.serializers.JacksonMapper; import io.kestra.core.serializers.JacksonMapper;
import picocli.CommandLine; import io.micronaut.context.ApplicationContext;
import io.micronaut.management.endpoint.env.EnvironmentEndpoint;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
import jakarta.inject.Inject; import jakarta.inject.Inject;
import lombok.extern.slf4j.Slf4j;
import picocli.CommandLine;
@CommandLine.Command( @CommandLine.Command(
name = "properties", name = "properties",

View File

@@ -37,6 +37,8 @@ endpoints:
details-visible: ANONYMOUS details-visible: ANONYMOUS
loggers: loggers:
write-sensitive: false write-sensitive: false
env:
enabled: true
kestra: kestra:
retries: retries:

View File

@@ -1,3 +1,7 @@
endpoints:
env:
enabled: true
kestra: kestra:
repository: repository:
type: memory type: memory

View File

@@ -13,24 +13,24 @@ processResources.dependsOn copyGradleProperties
dependencies { dependencies {
// log // log
implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.8' implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.10'
// serializers // serializers
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-ion' implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-ion'
// utils // utils
implementation group: 'net.jodah', name: 'failsafe', version: '2.4.4' implementation group: 'net.jodah', name: 'failsafe', version: '2.4.4'
implementation 'com.github.oshi:oshi-core:6.0.0' implementation 'com.github.oshi:oshi-core:6.1.3'
implementation 'io.pebbletemplates:pebble:3.1.5' implementation 'io.pebbletemplates:pebble:3.1.5'
// scheduler // scheduler
implementation group: 'com.cronutils', name: 'cron-utils', version: '9.1.6' implementation group: 'com.cronutils', name: 'cron-utils', version: '9.1.6'
// process // process
implementation ('com.github.docker-java:docker-java:3.2.12') { implementation ('com.github.docker-java:docker-java:3.2.13') {
exclude group: 'com.github.docker-java', module: 'docker-java-transport-jersey' exclude group: 'com.github.docker-java', module: 'docker-java-transport-jersey'
} }
implementation 'com.github.docker-java:docker-java-transport-httpclient5:3.2.12' implementation 'com.github.docker-java:docker-java-transport-httpclient5:3.2.13'
// schema // schema
implementation group: 'com.github.victools', name: 'jsonschema-generator', version: '4.22.0' implementation group: 'com.github.victools', name: 'jsonschema-generator', version: '4.22.0'
@@ -43,7 +43,7 @@ dependencies {
testImplementation project(':runner-memory') testImplementation project(':runner-memory')
testImplementation project(':storage-local') testImplementation project(':storage-local')
testImplementation 'org.mockito:mockito-junit-jupiter:4.2.0' testImplementation 'org.mockito:mockito-junit-jupiter:4.3.1'
testImplementation "io.micronaut:micronaut-http-client" testImplementation "io.micronaut:micronaut-http-client"
testImplementation "io.micronaut.rxjava2:micronaut-rxjava2-http-client" testImplementation "io.micronaut.rxjava2:micronaut-rxjava2-http-client"
testImplementation "io.micronaut:micronaut-http-server-netty" testImplementation "io.micronaut:micronaut-http-server-netty"

View File

@@ -54,7 +54,8 @@ public class OverrideRetryInterceptor implements MethodInterceptor<Object, Objec
retry.get("multiplier", Double.class).orElse(2D), retry.get("multiplier", Double.class).orElse(2D),
retry.get("delay", Duration.class).orElse(Duration.ofSeconds(1)), retry.get("delay", Duration.class).orElse(Duration.ofSeconds(1)),
retry.get("maxDelay", Duration.class).orElse(null), retry.get("maxDelay", Duration.class).orElse(null),
new DefaultRetryPredicate(resolveIncludes(retry, "includes"), resolveIncludes(retry, "excludes")) new DefaultRetryPredicate(resolveIncludes(retry, "includes"), resolveIncludes(retry, "excludes")),
Throwable.class
); );
MutableConvertibleValues<Object> attrs = context.getAttributes(); MutableConvertibleValues<Object> attrs = context.getAttributes();

View File

@@ -1,5 +1,5 @@
version=0.4.1-SNAPSHOT version=0.4.1-SNAPSHOT
opensearchVersion=1.2.3 opensearchVersion=1.2.4
micronautVersion=3.2.6 micronautVersion=3.3.+
kafkaVersion=3.0.0 kafkaVersion=3.1.0
lombokVersion=1.18.22 lombokVersion=1.18.22

View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@@ -11,5 +11,5 @@ dependencies {
implementation group: "org.apache.kafka", name: "kafka-clients", version: kafkaVersion implementation group: "org.apache.kafka", name: "kafka-clients", version: kafkaVersion
implementation group: 'net.jodah', name: 'failsafe', version: '2.4.4' implementation group: 'net.jodah', name: 'failsafe', version: '2.4.4'
testImplementation 'org.mockito:mockito-junit-jupiter:4.2.0' testImplementation 'org.mockito:mockito-junit-jupiter:4.3.1'
} }

View File

@@ -9,5 +9,5 @@ dependencies {
testImplementation project(':core').sourceSets.test.output testImplementation project(':core').sourceSets.test.output
testImplementation project(':runner-memory') testImplementation project(':runner-memory')
testImplementation 'org.mockito:mockito-junit-jupiter:4.2.0' testImplementation 'org.mockito:mockito-junit-jupiter:4.3.1'
} }

View File

@@ -16,5 +16,5 @@ dependencies {
testImplementation group: 'org.apache.kafka', name: 'kafka-streams-test-utils', version: kafkaVersion testImplementation group: 'org.apache.kafka', name: 'kafka-streams-test-utils', version: kafkaVersion
testImplementation 'org.mockito:mockito-junit-jupiter:4.2.0' testImplementation 'org.mockito:mockito-junit-jupiter:4.3.1'
} }