Skip to content

Commit

Permalink
chore(deps): update java deps
Browse files Browse the repository at this point in the history
  • Loading branch information
tchiotludo committed Feb 22, 2022
1 parent 24083fb commit 53d2f1b
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 28 deletions.
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ plugins {
id 'org.gradle.test-retry' version '1.3.1'

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

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

// release
id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
id 'net.researchgate.release' version '2.8.1'
id "com.gorylenko.gradle-git-properties" version "2.3.2"
id "com.gorylenko.gradle-git-properties" version "2.4.0"
id 'signing'
id 'ru.vyarus.pom' version '2.2.1' apply false
id 'ru.vyarus.github-info' version '1.3.0' apply false
Expand Down Expand Up @@ -96,10 +96,10 @@ allprojects {
api "io.micronaut.rxjava2:micronaut-rxjava2-http-client"

// logs
implementation "org.slf4j:slf4j-api:1.7.32"
implementation "ch.qos.logback:logback-classic:1.2.9"
implementation "org.slf4j:slf4j-api:1.7.36"
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.slf4j', name: 'jul-to-slf4j', version: '1.7.33'
implementation group: 'org.slf4j', name: 'jul-to-slf4j', version: '1.7.36'

// jackson
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
package io.kestra.cli.commands.configs.sys;

import io.kestra.cli.AbstractCommand;
import io.kestra.core.serializers.JacksonMapper;
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 jakarta.inject.Inject;
import lombok.extern.slf4j.Slf4j;
import io.kestra.cli.AbstractCommand;
import io.kestra.core.serializers.JacksonMapper;
import picocli.CommandLine;

import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
import jakarta.inject.Inject;

@CommandLine.Command(
name = "properties",
description = {"Display actual configurations properties."}
Expand Down
2 changes: 2 additions & 0 deletions cli/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ endpoints:
details-visible: ANONYMOUS
loggers:
write-sensitive: false
env:
enabled: true

kestra:
retries:
Expand Down
4 changes: 4 additions & 0 deletions cli/src/test/resources/application.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
endpoints:
env:
enabled: true

kestra:
repository:
type: memory
Expand Down
10 changes: 5 additions & 5 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,24 @@ processResources.dependsOn copyGradleProperties

dependencies {
// 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
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-ion'

// utils
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'

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

// 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'
}
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
implementation group: 'com.github.victools', name: 'jsonschema-generator', version: '4.22.0'
Expand All @@ -43,7 +43,7 @@ dependencies {
testImplementation project(':runner-memory')
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.rxjava2:micronaut-rxjava2-http-client"
testImplementation "io.micronaut:micronaut-http-server-netty"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ public Object intercept(MethodInvocationContext<Object, Object> context) {
retry.get("multiplier", Double.class).orElse(2D),
retry.get("delay", Duration.class).orElse(Duration.ofSeconds(1)),
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();
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version=0.4.1-SNAPSHOT
opensearchVersion=1.2.3
micronautVersion=3.2.6
kafkaVersion=3.0.0
opensearchVersion=1.2.4
micronautVersion=3.3.+
kafkaVersion=3.1.0
lombokVersion=1.18.22
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
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
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion indexer-kafka-elasticsearch/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ dependencies {
implementation group: "org.apache.kafka", name: "kafka-clients", version: kafkaVersion
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'
}
2 changes: 1 addition & 1 deletion repository-elasticsearch/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ dependencies {

testImplementation project(':core').sourceSets.test.output
testImplementation project(':runner-memory')
testImplementation 'org.mockito:mockito-junit-jupiter:4.2.0'
testImplementation 'org.mockito:mockito-junit-jupiter:4.3.1'
}
2 changes: 1 addition & 1 deletion runner-kafka/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ dependencies {

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'
}

0 comments on commit 53d2f1b

Please sign in to comment.