diff --git a/dependencies.gradle b/dependencies.gradle index ccc66d94af..ea86026ea2 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -40,8 +40,8 @@ def VERSIONS = [ 'net.sf.ehcache:ehcache:latest.release', 'org.apache.httpcomponents:httpasyncclient:latest.release', 'org.apache.httpcomponents:httpclient:latest.release', - 'org.apache.kafka:kafka-clients:latest.release', - 'org.apache.kafka:kafka-streams:latest.release', + 'org.apache.kafka:kafka-clients:2.+', + 'org.apache.kafka:kafka-streams:2.+', 'org.apache.logging.log4j:log4j-core:2.+', 'org.apache.tomcat.embed:tomcat-embed-core:8.+', 'org.aspectj:aspectjweaver:1.8.+', diff --git a/micrometer-core/gradle/dependency-locks/compileClasspath.lockfile b/micrometer-core/gradle/dependency-locks/compileClasspath.lockfile index 3d85d35200..d550f75d3a 100644 --- a/micrometer-core/gradle/dependency-locks/compileClasspath.lockfile +++ b/micrometer-core/gradle/dependency-locks/compileClasspath.lockfile @@ -56,10 +56,10 @@ org.apache.httpcomponents:httpasyncclient:4.1.4 org.apache.httpcomponents:httpclient:4.5.13 org.apache.httpcomponents:httpcore-nio:4.4.10 org.apache.httpcomponents:httpcore:4.4.13 -org.apache.kafka:connect-api:5.5.1-ccs -org.apache.kafka:connect-json:5.5.1-ccs -org.apache.kafka:kafka-clients:5.5.1-ccs -org.apache.kafka:kafka-streams:5.5.1-ccs +org.apache.kafka:connect-api:2.6.0 +org.apache.kafka:connect-json:2.6.0 +org.apache.kafka:kafka-clients:2.6.0 +org.apache.kafka:kafka-streams:2.6.0 org.apache.logging.log4j:log4j-api:2.13.3 org.apache.logging.log4j:log4j-core:2.13.3 org.apache.tomcat.embed:tomcat-embed-core:8.5.59 @@ -91,6 +91,6 @@ org.latencyutils:LatencyUtils:2.0.3 org.lz4:lz4-java:1.7.1 org.mongodb:mongo-java-driver:3.12.7 org.reactivestreams:reactive-streams:1.0.3 -org.rocksdb:rocksdbjni:5.18.3 +org.rocksdb:rocksdbjni:5.18.4 org.slf4j:slf4j-api:1.7.30 org.xerial.snappy:snappy-java:1.1.7.3 diff --git a/micrometer-core/gradle/dependency-locks/runtimeClasspath.lockfile b/micrometer-core/gradle/dependency-locks/runtimeClasspath.lockfile index 3d85d35200..d550f75d3a 100644 --- a/micrometer-core/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/micrometer-core/gradle/dependency-locks/runtimeClasspath.lockfile @@ -56,10 +56,10 @@ org.apache.httpcomponents:httpasyncclient:4.1.4 org.apache.httpcomponents:httpclient:4.5.13 org.apache.httpcomponents:httpcore-nio:4.4.10 org.apache.httpcomponents:httpcore:4.4.13 -org.apache.kafka:connect-api:5.5.1-ccs -org.apache.kafka:connect-json:5.5.1-ccs -org.apache.kafka:kafka-clients:5.5.1-ccs -org.apache.kafka:kafka-streams:5.5.1-ccs +org.apache.kafka:connect-api:2.6.0 +org.apache.kafka:connect-json:2.6.0 +org.apache.kafka:kafka-clients:2.6.0 +org.apache.kafka:kafka-streams:2.6.0 org.apache.logging.log4j:log4j-api:2.13.3 org.apache.logging.log4j:log4j-core:2.13.3 org.apache.tomcat.embed:tomcat-embed-core:8.5.59 @@ -91,6 +91,6 @@ org.latencyutils:LatencyUtils:2.0.3 org.lz4:lz4-java:1.7.1 org.mongodb:mongo-java-driver:3.12.7 org.reactivestreams:reactive-streams:1.0.3 -org.rocksdb:rocksdbjni:5.18.3 +org.rocksdb:rocksdbjni:5.18.4 org.slf4j:slf4j-api:1.7.30 org.xerial.snappy:snappy-java:1.1.7.3 diff --git a/micrometer-core/gradle/dependency-locks/testCompileClasspath.lockfile b/micrometer-core/gradle/dependency-locks/testCompileClasspath.lockfile index 0d4190a7a4..0d6586f236 100644 --- a/micrometer-core/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/micrometer-core/gradle/dependency-locks/testCompileClasspath.lockfile @@ -75,10 +75,10 @@ org.apache.httpcomponents:httpasyncclient:4.1.4 org.apache.httpcomponents:httpclient:4.5.13 org.apache.httpcomponents:httpcore-nio:4.4.10 org.apache.httpcomponents:httpcore:4.4.13 -org.apache.kafka:connect-api:5.5.1-ccs -org.apache.kafka:connect-json:5.5.1-ccs -org.apache.kafka:kafka-clients:5.5.1-ccs -org.apache.kafka:kafka-streams:5.5.1-ccs +org.apache.kafka:connect-api:2.6.0 +org.apache.kafka:connect-json:2.6.0 +org.apache.kafka:kafka-clients:2.6.0 +org.apache.kafka:kafka-streams:2.6.0 org.apache.logging.log4j:log4j-api:2.13.3 org.apache.logging.log4j:log4j-core:2.13.3 org.apache.tomcat.embed:tomcat-embed-core:8.5.59 @@ -128,7 +128,7 @@ org.opentest4j:opentest4j:1.2.0 org.reactivestreams:reactive-streams:1.0.3 org.rnorth.duct-tape:duct-tape:1.0.8 org.rnorth.visible-assertions:visible-assertions:2.1.2 -org.rocksdb:rocksdbjni:5.18.3 +org.rocksdb:rocksdbjni:5.18.4 org.slf4j:slf4j-api:1.7.30 org.springframework:spring-aop:5.3.0 org.springframework:spring-beans:5.3.0 diff --git a/micrometer-core/gradle/dependency-locks/testRuntimeClasspath.lockfile b/micrometer-core/gradle/dependency-locks/testRuntimeClasspath.lockfile index b8493a72c5..4ac685b76b 100644 --- a/micrometer-core/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/micrometer-core/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -75,10 +75,10 @@ org.apache.httpcomponents:httpasyncclient:4.1.4 org.apache.httpcomponents:httpclient:4.5.13 org.apache.httpcomponents:httpcore-nio:4.4.10 org.apache.httpcomponents:httpcore:4.4.13 -org.apache.kafka:connect-api:5.5.1-ccs -org.apache.kafka:connect-json:5.5.1-ccs -org.apache.kafka:kafka-clients:5.5.1-ccs -org.apache.kafka:kafka-streams:5.5.1-ccs +org.apache.kafka:connect-api:2.6.0 +org.apache.kafka:connect-json:2.6.0 +org.apache.kafka:kafka-clients:2.6.0 +org.apache.kafka:kafka-streams:2.6.0 org.apache.logging.log4j:log4j-api:2.13.3 org.apache.logging.log4j:log4j-core:2.13.3 org.apache.tomcat.embed:tomcat-embed-core:8.5.59 @@ -131,7 +131,7 @@ org.opentest4j:opentest4j:1.2.0 org.reactivestreams:reactive-streams:1.0.3 org.rnorth.duct-tape:duct-tape:1.0.8 org.rnorth.visible-assertions:visible-assertions:2.1.2 -org.rocksdb:rocksdbjni:5.18.3 +org.rocksdb:rocksdbjni:5.18.4 org.slf4j:slf4j-api:1.7.30 org.springframework:spring-aop:5.3.0 org.springframework:spring-beans:5.3.0 diff --git a/samples/micrometer-samples-core/gradle/dependency-locks/compileClasspath.lockfile b/samples/micrometer-samples-core/gradle/dependency-locks/compileClasspath.lockfile index 7c2dea2090..fed065a18a 100644 --- a/samples/micrometer-samples-core/gradle/dependency-locks/compileClasspath.lockfile +++ b/samples/micrometer-samples-core/gradle/dependency-locks/compileClasspath.lockfile @@ -97,7 +97,7 @@ org.apache.commons:commons-lang3:3.5 org.apache.curator:curator-test:4.2.0 org.apache.httpcomponents:httpclient:4.5.13 org.apache.httpcomponents:httpcore:4.4.13 -org.apache.kafka:kafka-clients:5.5.1-ccs +org.apache.kafka:kafka-clients:2.6.0 org.apache.kafka:kafka_2.13:2.6.0 org.apache.yetus:audience-annotations:0.5.0 org.apache.zookeeper:zookeeper-jute:3.5.8