diff --git a/build.gradle b/build.gradle index 830223d7d3..d9b86805ff 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ plugins { id 'com.netflix.nebula.netflixoss' version '11.4.0' id "com.google.osdetector" version "1.7.3" id "me.champeau.jmh" version "0.7.2" - id "org.openrewrite.rewrite" version "6.3.0" + id "org.openrewrite.rewrite" version "6.8.1" } ext.githubProjectName = rootProject.name @@ -105,10 +105,10 @@ subprojects { } dependencies { - rewrite(platform("org.openrewrite.recipe:rewrite-recipe-bom:2.2.1")) - rewrite("org.openrewrite.recipe:rewrite-static-analysis:1.2.0") + rewrite(platform("org.openrewrite.recipe:rewrite-recipe-bom:2.6.3")) rewrite("org.openrewrite.recipe:rewrite-logging-frameworks") rewrite("org.openrewrite.recipe:rewrite-testing-frameworks") + rewrite("org.openrewrite.recipe:rewrite-static-analysis") } rewrite { diff --git a/dependencies.lock b/dependencies.lock index b057609fd5..7f8b83e536 100644 --- a/dependencies.lock +++ b/dependencies.lock @@ -266,6 +266,7 @@ "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", "com.fasterxml.jackson.module:jackson-module-jaxb-annotations", "com.fasterxml.jackson:jackson-bom", + "com.github.docker-java:docker-java-api", "org.openrewrite:rewrite-groovy", "org.openrewrite:rewrite-java", "org.openrewrite:rewrite-maven", @@ -379,39 +380,49 @@ "org.openrewrite:rewrite-maven" ] }, + "com.github.docker-java:docker-java-api": { + "locked": "3.3.4", + "transitive": [ + "org.testcontainers:testcontainers" + ] + }, + "com.github.docker-java:docker-java-transport": { + "locked": "3.3.4", + "transitive": [ + "com.github.docker-java:docker-java-transport-zerodep" + ] + }, + "com.github.docker-java:docker-java-transport-zerodep": { + "locked": "3.3.4", + "transitive": [ + "org.testcontainers:testcontainers" + ] + }, "com.google.code.findbugs:jsr305": { "locked": "3.0.2", "transitive": [ - "com.google.guava:guava", - "com.google.guava:guava-parent" + "com.google.guava:guava" ] }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.18.0", + "locked": "2.23.0", "transitive": [ "com.github.ben-manes.caffeine:caffeine", - "com.google.guava:guava", - "com.google.guava:guava-parent" + "com.google.guava:guava" ] }, "com.google.guava:failureaccess": { - "locked": "1.0.1", + "locked": "1.0.2", "transitive": [ "com.google.guava:guava" ] }, "com.google.guava:guava": { - "locked": "32.1.2-jre", + "locked": "33.0.0-jre", "transitive": [ "org.openrewrite.recipe:rewrite-java-dependencies" ] }, - "com.google.guava:guava-parent": { - "locked": "32.1.2-jre", - "transitive": [ - "com.google.guava:guava" - ] - }, "com.google.guava:listenablefuture": { "locked": "9999.0-empty-to-avoid-conflict-with-guava", "transitive": [ @@ -474,9 +485,16 @@ "com.fasterxml.jackson.module:jackson-module-jaxb-annotations" ] }, + "junit:junit": { + "locked": "4.13.2", + "transitive": [ + "org.testcontainers:testcontainers" + ] + }, "net.java.dev.jna:jna": { "locked": "5.14.0", "transitive": [ + "com.github.docker-java:docker-java-transport-zerodep", "net.java.dev.jna:jna-platform" ] }, @@ -498,7 +516,8 @@ "org.apache.commons:commons-compress": { "locked": "1.25.0", "transitive": [ - "org.openrewrite:rewrite-core" + "org.openrewrite:rewrite-core", + "org.testcontainers:testcontainers" ] }, "org.apache.commons:commons-lang3": { @@ -518,11 +537,10 @@ ] }, "org.checkerframework:checker-qual": { - "locked": "3.33.0", + "locked": "3.41.0", "transitive": [ "com.github.ben-manes.caffeine:caffeine", - "com.google.guava:guava", - "com.google.guava:guava-parent" + "com.google.guava:guava" ] }, "org.codehaus.groovy:groovy": { @@ -544,6 +562,12 @@ "org.openrewrite.meta:rewrite-analysis" ] }, + "org.hamcrest:hamcrest-core": { + "locked": "1.3", + "transitive": [ + "junit:junit" + ] + }, "org.hdrhistogram:HdrHistogram": { "locked": "2.1.12", "transitive": [ @@ -615,7 +639,8 @@ "org.openrewrite:rewrite-maven", "org.openrewrite:rewrite-properties", "org.openrewrite:rewrite-xml", - "org.openrewrite:rewrite-yaml" + "org.openrewrite:rewrite-yaml", + "org.rnorth.duct-tape:duct-tape" ] }, "org.kohsuke:wordnet-random-name": { @@ -631,44 +656,45 @@ ] }, "org.openrewrite.gradle.tooling:model": { - "locked": "1.1.4", + "locked": "1.5.1", "transitive": [ "org.openrewrite.recipe:rewrite-java-dependencies", "org.openrewrite:rewrite-gradle" ] }, "org.openrewrite.meta:rewrite-analysis": { - "locked": "2.2.1", + "locked": "2.2.3", "transitive": [ "org.openrewrite.recipe:rewrite-recipe-bom", "org.openrewrite.recipe:rewrite-static-analysis" ] }, "org.openrewrite.recipe:rewrite-java-dependencies": { - "locked": "1.0.8", + "locked": "1.4.0", "transitive": [ + "org.openrewrite.recipe:rewrite-logging-frameworks", "org.openrewrite.recipe:rewrite-recipe-bom", "org.openrewrite.recipe:rewrite-testing-frameworks" ] }, "org.openrewrite.recipe:rewrite-logging-frameworks": { - "locked": "2.0.3", + "locked": "2.4.2", "transitive": [ "org.openrewrite.recipe:rewrite-recipe-bom" ] }, "org.openrewrite.recipe:rewrite-recipe-bom": { - "locked": "2.2.1" + "locked": "2.6.3" }, "org.openrewrite.recipe:rewrite-static-analysis": { - "locked": "1.2.0", + "locked": "1.2.2", "transitive": [ "org.openrewrite.recipe:rewrite-recipe-bom", "org.openrewrite.recipe:rewrite-testing-frameworks" ] }, "org.openrewrite.recipe:rewrite-testing-frameworks": { - "locked": "2.0.10", + "locked": "2.3.1", "transitive": [ "org.openrewrite.recipe:rewrite-recipe-bom" ] @@ -680,7 +706,7 @@ ] }, "org.openrewrite:rewrite-core": { - "locked": "8.13.1", + "locked": "8.14.0", "transitive": [ "org.openrewrite.recipe:rewrite-recipe-bom", "org.openrewrite:rewrite-gradle", @@ -694,7 +720,7 @@ ] }, "org.openrewrite:rewrite-gradle": { - "locked": "8.4.0", + "locked": "8.14.0", "transitive": [ "org.openrewrite.recipe:rewrite-java-dependencies", "org.openrewrite.recipe:rewrite-recipe-bom", @@ -702,7 +728,7 @@ ] }, "org.openrewrite:rewrite-groovy": { - "locked": "8.13.1", + "locked": "8.14.0", "transitive": [ "org.openrewrite.recipe:rewrite-java-dependencies", "org.openrewrite.recipe:rewrite-recipe-bom", @@ -711,7 +737,7 @@ ] }, "org.openrewrite:rewrite-java": { - "locked": "8.13.1", + "locked": "8.14.0", "transitive": [ "org.openrewrite.meta:rewrite-analysis", "org.openrewrite.recipe:rewrite-logging-frameworks", @@ -727,14 +753,14 @@ ] }, "org.openrewrite:rewrite-java-11": { - "locked": "8.4.0", + "locked": "8.14.0", "transitive": [ "org.openrewrite.recipe:rewrite-java-dependencies", "org.openrewrite.recipe:rewrite-recipe-bom" ] }, "org.openrewrite:rewrite-java-17": { - "locked": "8.4.0", + "locked": "8.14.0", "transitive": [ "org.openrewrite.recipe:rewrite-java-dependencies", "org.openrewrite.recipe:rewrite-logging-frameworks", @@ -743,32 +769,31 @@ ] }, "org.openrewrite:rewrite-java-8": { - "locked": "8.4.0", + "locked": "8.14.0", "transitive": [ "org.openrewrite.recipe:rewrite-java-dependencies", "org.openrewrite.recipe:rewrite-recipe-bom" ] }, "org.openrewrite:rewrite-kotlin": { - "locked": "1.9.1", + "locked": "1.11.0", "transitive": [ "org.openrewrite.recipe:rewrite-recipe-bom", "org.openrewrite.recipe:rewrite-static-analysis" ] }, "org.openrewrite:rewrite-maven": { - "locked": "8.13.1", + "locked": "8.14.0", "transitive": [ "org.openrewrite.meta:rewrite-analysis", "org.openrewrite.recipe:rewrite-java-dependencies", - "org.openrewrite.recipe:rewrite-logging-frameworks", "org.openrewrite.recipe:rewrite-recipe-bom", "org.openrewrite.recipe:rewrite-testing-frameworks", "org.openrewrite:rewrite-gradle" ] }, "org.openrewrite:rewrite-properties": { - "locked": "8.13.1", + "locked": "8.14.0", "transitive": [ "org.openrewrite.recipe:rewrite-recipe-bom", "org.openrewrite:rewrite-gradle", @@ -776,13 +801,14 @@ ] }, "org.openrewrite:rewrite-templating": { - "locked": "1.4.1", + "locked": "1.4.4", "transitive": [ + "org.openrewrite.recipe:rewrite-recipe-bom", "org.openrewrite.recipe:rewrite-static-analysis" ] }, "org.openrewrite:rewrite-xml": { - "locked": "8.13.1", + "locked": "8.14.0", "transitive": [ "org.openrewrite.meta:rewrite-analysis", "org.openrewrite.recipe:rewrite-recipe-bom", @@ -791,7 +817,7 @@ ] }, "org.openrewrite:rewrite-yaml": { - "locked": "8.13.1", + "locked": "8.14.0", "transitive": [ "org.openrewrite.meta:rewrite-analysis", "org.openrewrite.recipe:rewrite-recipe-bom", @@ -830,6 +856,26 @@ "org.openrewrite:rewrite-java" ] }, + "org.rnorth.duct-tape:duct-tape": { + "locked": "1.0.8", + "transitive": [ + "org.testcontainers:testcontainers" + ] + }, + "org.slf4j:slf4j-api": { + "locked": "1.7.36", + "transitive": [ + "com.github.docker-java:docker-java-api", + "com.github.docker-java:docker-java-transport-zerodep", + "org.testcontainers:testcontainers" + ] + }, + "org.testcontainers:testcontainers": { + "locked": "1.19.3", + "transitive": [ + "org.openrewrite.recipe:rewrite-testing-frameworks" + ] + }, "org.xerial.snappy:snappy-java": { "locked": "1.1.10.5", "transitive": [ diff --git a/zuul-core/dependencies.lock b/zuul-core/dependencies.lock index 1cd6f6f8e0..3eedc32ef4 100644 --- a/zuul-core/dependencies.lock +++ b/zuul-core/dependencies.lock @@ -130,7 +130,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5" + "locked": "1.7.6" }, "com.netflix.zuul:zuul-discovery": { "project": true @@ -587,7 +587,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5" + "locked": "1.7.6" }, "com.netflix.zuul:zuul-discovery": { "project": true @@ -1125,7 +1125,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5" + "locked": "1.7.6" }, "com.netflix.zuul:zuul-discovery": { "project": true @@ -1833,7 +1833,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5" + "locked": "1.7.6" }, "com.netflix.zuul:zuul-discovery": { "project": true @@ -2327,7 +2327,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5" + "locked": "1.7.6" }, "com.netflix.zuul:zuul-discovery": { "project": true @@ -2930,7 +2930,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5" + "locked": "1.7.6" }, "com.netflix.zuul:zuul-discovery": { "project": true diff --git a/zuul-groovy/dependencies.lock b/zuul-groovy/dependencies.lock index d7bba04f24..36e94c48b2 100644 --- a/zuul-groovy/dependencies.lock +++ b/zuul-groovy/dependencies.lock @@ -150,7 +150,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -753,7 +753,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -1437,7 +1437,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -2420,7 +2420,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -3261,7 +3261,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -3976,7 +3976,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] diff --git a/zuul-guice/dependencies.lock b/zuul-guice/dependencies.lock index 0df504836b..3e0161f34d 100644 --- a/zuul-guice/dependencies.lock +++ b/zuul-guice/dependencies.lock @@ -144,7 +144,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -550,7 +550,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -1031,7 +1031,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -1765,7 +1765,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -2308,7 +2308,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -2849,7 +2849,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] diff --git a/zuul-integration-test/dependencies.lock b/zuul-integration-test/dependencies.lock index f5b48e069d..dadd33f351 100644 --- a/zuul-integration-test/dependencies.lock +++ b/zuul-integration-test/dependencies.lock @@ -211,7 +211,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -753,7 +753,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -1176,7 +1176,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -1746,7 +1746,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -2840,7 +2840,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -3464,7 +3464,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -4432,7 +4432,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] diff --git a/zuul-processor/dependencies.lock b/zuul-processor/dependencies.lock index f9f02d62bc..4492c54f39 100644 --- a/zuul-processor/dependencies.lock +++ b/zuul-processor/dependencies.lock @@ -144,7 +144,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -550,7 +550,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -1031,7 +1031,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -1737,7 +1737,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -2335,7 +2335,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -2881,7 +2881,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -3401,7 +3401,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] diff --git a/zuul-sample/dependencies.lock b/zuul-sample/dependencies.lock index 54bba934a2..ce24cc36be 100644 --- a/zuul-sample/dependencies.lock +++ b/zuul-sample/dependencies.lock @@ -211,7 +211,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -756,7 +756,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -1369,7 +1369,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -2053,7 +2053,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -3030,7 +3030,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -3892,7 +3892,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ] @@ -4534,7 +4534,7 @@ ] }, "com.netflix.spectator:spectator-api": { - "locked": "1.7.5", + "locked": "1.7.6", "transitive": [ "com.netflix.zuul:zuul-core" ]