Skip to content

Commit

Permalink
chore(deps): update all java deps except micronaut & kafka
Browse files Browse the repository at this point in the history
  • Loading branch information
tchiotludo committed Jun 19, 2022
1 parent df6348a commit 4526b13
Show file tree
Hide file tree
Showing 11 changed files with 35 additions and 31 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ plugins {
// 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.4.0"
id "com.gorylenko.gradle-git-properties" version "2.4.1"
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
10 changes: 5 additions & 5 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@ dependencies {
implementation 'com.github.docker-java:docker-java-transport-httpclient5:3.2.13'

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

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

testImplementation 'org.mockito:mockito-junit-jupiter:4.5.1'
testImplementation 'org.mockito:mockito-junit-jupiter:4.6.1'
testImplementation "io.micronaut:micronaut-http-client"
testImplementation "io.micronaut.rxjava2:micronaut-rxjava2-http-client"
testImplementation "io.micronaut:micronaut-http-server-netty"
Expand Down
16 changes: 10 additions & 6 deletions docker-compose-ci.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
services:
zookeeper:
image: confluentinc/cp-zookeeper:7.0.0
image: confluentinc/cp-zookeeper
environment:
ZOOKEEPER_CLIENT_PORT: 2181
healthcheck:
test: nc -z localhost 2181 || exit 1
interval: 10s
timeout: 5s
retries: 5
retries: 10
start_period: 10s

kafka:
image: confluentinc/cp-kafka:7.0.0
image: confluentinc/cp-kafka
environment:
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
Expand All @@ -26,26 +26,30 @@ services:
test: echo "exit" | curl -s -f telnet://localhost:9092 || exit 1
interval: 30s
timeout: 10s
retries: 5
retries: 10
ports:
- 9092:9092

elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:7.16.0
image: docker.elastic.co/elasticsearch/elasticsearch:8.2.3
environment:
discovery.type: single-node
ES_JAVA_OPTS: "-Xms256m -Xmx256m"
xpack.security.enabled: "false"
ulimits:
memlock:
soft: -1
hard: -1
nofile:
soft: 65536
hard: 65536
ports:
- 9200:9200
healthcheck:
test: curl -s -f localhost:9200/_cat/health >/dev/null || exit 1
interval: 30s
timeout: 10s
retries: 5
retries: 10

mysql:
image: mysql
Expand Down
14 changes: 7 additions & 7 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ services:
test: nc -z localhost 2181 || exit 1
interval: 10s
timeout: 5s
retries: 5
retries: 10
start_period: 10s

kafka:
image: 'bitnami/kafka:latest'
volumes:
Expand All @@ -42,10 +42,10 @@ services:
test: echo "exit" | curl -s -f telnet://localhost:9092 || exit 1
interval: 30s
timeout: 10s
retries: 5
retries: 10

elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:7.15.2
image: docker.elastic.co/elasticsearch/elasticsearch:8.2.3
environment:
discovery.type: single-node
cluster.routing.allocation.disk.threshold_enabled: "false"
Expand All @@ -64,8 +64,8 @@ services:
test: curl -s -f localhost:9200/_cat/health >/dev/null || exit 1
interval: 30s
timeout: 10s
retries: 5
retries: 10

kestra:
image: kestra/kestra:develop-full
# build:
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version=0.4.8-SNAPSHOT
opensearchVersion=1.3.1
opensearchVersion=2.0.1
micronautVersion=3.4.1
kafkaVersion=3.1.0
lombokVersion=1.18.22
lombokVersion=1.18.24
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.5.1'
testImplementation 'org.mockito:mockito-junit-jupiter:4.6.1'
}
4 changes: 2 additions & 2 deletions jdbc-h2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ dependencies {
implementation project(":jdbc")

implementation("io.micronaut.sql:micronaut-jooq")
runtimeOnly("com.h2database:h2:2.1.212")
runtimeOnly("com.h2database:h2:2.1.214")

testImplementation project(':core').sourceSets.test.output
testImplementation project(':jdbc').sourceSets.test.output
testImplementation project(':runner-memory')
testImplementation project(':storage-local')
testImplementation 'org.mockito:mockito-junit-jupiter:4.5.1'
testImplementation 'org.mockito:mockito-junit-jupiter:4.6.1'
}
6 changes: 3 additions & 3 deletions jdbc-mysql/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ dependencies {
implementation project(":jdbc")

implementation("io.micronaut.sql:micronaut-jooq")
runtimeOnly("mysql:mysql-connector-java")
runtimeOnly('org.flywaydb:flyway-mysql')
runtimeOnly("mysql:mysql-connector-java:8.0.29")
runtimeOnly('org.flywaydb:flyway-mysql:8.5.13')

testImplementation project(':core').sourceSets.test.output
testImplementation project(':jdbc').sourceSets.test.output
testImplementation project(':runner-memory')
testImplementation project(':storage-local')
testImplementation 'org.mockito:mockito-junit-jupiter:4.5.1'
testImplementation 'org.mockito:mockito-junit-jupiter:4.6.1'
}
4 changes: 2 additions & 2 deletions jdbc-postgres/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ dependencies {
implementation project(":jdbc")

implementation("io.micronaut.sql:micronaut-jooq")
runtimeOnly("org.postgresql:postgresql")
runtimeOnly("org.postgresql:postgresql:42.4.0")

testImplementation project(':core').sourceSets.test.output
testImplementation project(':jdbc').sourceSets.test.output
testImplementation project(':runner-memory')
testImplementation project(':storage-local')
testImplementation 'org.mockito:mockito-junit-jupiter:4.5.1'
testImplementation 'org.mockito:mockito-junit-jupiter:4.6.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.5.1'
testImplementation 'org.mockito:mockito-junit-jupiter:4.6.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.5.1'
testImplementation 'org.mockito:mockito-junit-jupiter:4.6.1'
}

0 comments on commit 4526b13

Please sign in to comment.