Skip to content

Commit

Permalink
Merge pull request #1878 from Netflix/lindsey/upgrade-netty
Browse files Browse the repository at this point in the history 
Upgrade netty version
  • Loading branch information
@lindseyreynolds
lindseyreynolds authored Jan 16, 2025
2 parents 63ff48e + a2144b5 commit b5857dd
Show file tree
Hide file tree
Showing 9 changed files with 979 additions and 882 deletions.
114 changes: 8 additions & 106 deletions dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,16 +273,12 @@
"com.fasterxml.jackson.dataformat:jackson-dataformat-xml",
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
"com.fasterxml.jackson.module:jackson-module-jaxb-annotations",
"com.fasterxml.jackson.module:jackson-module-kotlin",
"com.fasterxml.jackson:jackson-bom",
"com.github.docker-java:docker-java-api",
"org.openrewrite:rewrite-groovy",
"org.openrewrite:rewrite-hcl",
"org.openrewrite:rewrite-java",
"org.openrewrite:rewrite-json",
"org.openrewrite:rewrite-maven",
"org.openrewrite:rewrite-properties",
"org.openrewrite:rewrite-protobuf",
"org.openrewrite:rewrite-xml",
"org.openrewrite:rewrite-yaml"
]
Expand Down Expand Up @@ -314,7 +310,6 @@
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
"com.fasterxml.jackson.module:jackson-module-jaxb-annotations",
"com.fasterxml.jackson.module:jackson-module-kotlin",
"com.fasterxml.jackson.module:jackson-module-parameter-names",
"com.fasterxml.jackson:jackson-bom",
"org.openrewrite:rewrite-core"
Expand Down Expand Up @@ -372,12 +367,6 @@
"org.openrewrite:rewrite-maven"
]
},
"com.fasterxml.jackson.module:jackson-module-kotlin": {
"locked": "2.17.2",
"transitive": [
"com.fasterxml.jackson:jackson-bom"
]
},
"com.fasterxml.jackson.module:jackson-module-parameter-names": {
"locked": "2.17.2",
"transitive": [
Expand All @@ -398,7 +387,6 @@
"com.fasterxml.jackson.datatype:jackson-datatype-jdk8",
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
"com.fasterxml.jackson.module:jackson-module-jaxb-annotations",
"com.fasterxml.jackson.module:jackson-module-kotlin",
"com.fasterxml.jackson.module:jackson-module-parameter-names"
]
},
Expand Down Expand Up @@ -499,9 +487,7 @@
"org.openrewrite.meta:rewrite-analysis",
"org.openrewrite:rewrite-core",
"org.openrewrite:rewrite-java",
"org.openrewrite:rewrite-java-11",
"org.openrewrite:rewrite-java-17",
"org.openrewrite:rewrite-java-21"
"org.openrewrite:rewrite-java-17"
]
},
"io.micrometer:micrometer-commons": {
Expand All @@ -517,16 +503,10 @@
"org.openrewrite:rewrite-core",
"org.openrewrite:rewrite-csharp",
"org.openrewrite:rewrite-groovy",
"org.openrewrite:rewrite-hcl",
"org.openrewrite:rewrite-java",
"org.openrewrite:rewrite-java-11",
"org.openrewrite:rewrite-java-17",
"org.openrewrite:rewrite-java-21",
"org.openrewrite:rewrite-java-8",
"org.openrewrite:rewrite-json",
"org.openrewrite:rewrite-maven",
"org.openrewrite:rewrite-properties",
"org.openrewrite:rewrite-protobuf",
"org.openrewrite:rewrite-xml",
"org.openrewrite:rewrite-yaml"
]
Expand Down Expand Up @@ -584,11 +564,8 @@
"org.antlr:antlr4-runtime": {
"locked": "4.11.1",
"transitive": [
"org.openrewrite:rewrite-hcl",
"org.openrewrite:rewrite-java",
"org.openrewrite:rewrite-json",
"org.openrewrite:rewrite-maven",
"org.openrewrite:rewrite-protobuf",
"org.openrewrite:rewrite-xml",
"org.openrewrite:rewrite-yaml"
]
Expand Down Expand Up @@ -692,9 +669,8 @@
]
},
"org.jetbrains.kotlin:kotlin-reflect": {
"locked": "1.7.22",
"locked": "1.6.10",
"transitive": [
"com.fasterxml.jackson.module:jackson-module-kotlin",
"org.jetbrains.kotlin:kotlin-compiler-embeddable"
]
},
Expand All @@ -708,15 +684,13 @@
"locked": "1.9.25",
"transitive": [
"org.jetbrains.kotlin:kotlin-compiler-embeddable",
"org.jetbrains.kotlin:kotlin-reflect",
"org.openrewrite:rewrite-kotlin"
]
},
"org.jetbrains:annotations": {
"locked": "26.0.1",
"transitive": [
"org.jetbrains.kotlin:kotlin-stdlib",
"org.openrewrite.gradle.tooling:model",
"org.openrewrite.meta:rewrite-analysis",
"org.openrewrite.recipe:rewrite-java-dependencies",
"org.openrewrite.recipe:rewrite-logging-frameworks",
Expand All @@ -728,19 +702,12 @@
"org.openrewrite:rewrite-csharp",
"org.openrewrite:rewrite-gradle",
"org.openrewrite:rewrite-groovy",
"org.openrewrite:rewrite-hcl",
"org.openrewrite:rewrite-java",
"org.openrewrite:rewrite-java-11",
"org.openrewrite:rewrite-java-17",
"org.openrewrite:rewrite-java-21",
"org.openrewrite:rewrite-java-8",
"org.openrewrite:rewrite-java-lombok",
"org.openrewrite:rewrite-json",
"org.openrewrite:rewrite-kotlin",
"org.openrewrite:rewrite-maven",
"org.openrewrite:rewrite-polyglot",
"org.openrewrite:rewrite-properties",
"org.openrewrite:rewrite-protobuf",
"org.openrewrite:rewrite-xml",
"org.openrewrite:rewrite-yaml",
"org.rnorth.duct-tape:duct-tape"
Expand All @@ -766,9 +733,6 @@
"io.micrometer:micrometer-core"
]
},
"org.openrewrite.gradle.tooling:model": {
"locked": "2.8.0"
},
"org.openrewrite.meta:rewrite-analysis": {
"locked": "2.14.0",
"transitive": [
Expand Down Expand Up @@ -825,15 +789,10 @@
"org.openrewrite.recipe:rewrite-recipe-bom",
"org.openrewrite:rewrite-csharp",
"org.openrewrite:rewrite-gradle",
"org.openrewrite:rewrite-hcl",
"org.openrewrite:rewrite-java",
"org.openrewrite:rewrite-java-11",
"org.openrewrite:rewrite-java-17",
"org.openrewrite:rewrite-java-21",
"org.openrewrite:rewrite-json",
"org.openrewrite:rewrite-maven",
"org.openrewrite:rewrite-properties",
"org.openrewrite:rewrite-protobuf",
"org.openrewrite:rewrite-xml",
"org.openrewrite:rewrite-yaml"
]
Expand All @@ -850,8 +809,7 @@
"transitive": [
"org.openrewrite.recipe:rewrite-java-dependencies",
"org.openrewrite.recipe:rewrite-recipe-bom",
"org.openrewrite.recipe:rewrite-testing-frameworks",
"org.openrewrite:rewrite-polyglot"
"org.openrewrite.recipe:rewrite-testing-frameworks"
]
},
"org.openrewrite:rewrite-groovy": {
Expand All @@ -860,15 +818,7 @@
"org.openrewrite.recipe:rewrite-java-dependencies",
"org.openrewrite.recipe:rewrite-recipe-bom",
"org.openrewrite.recipe:rewrite-static-analysis",
"org.openrewrite:rewrite-gradle",
"org.openrewrite:rewrite-polyglot"
]
},
"org.openrewrite:rewrite-hcl": {
"locked": "8.42.0",
"transitive": [
"org.openrewrite.recipe:rewrite-recipe-bom",
"org.openrewrite:rewrite-polyglot"
"org.openrewrite:rewrite-gradle"
]
},
"org.openrewrite:rewrite-java": {
Expand All @@ -881,20 +831,11 @@
"org.openrewrite.recipe:rewrite-testing-frameworks",
"org.openrewrite:rewrite-csharp",
"org.openrewrite:rewrite-groovy",
"org.openrewrite:rewrite-java-11",
"org.openrewrite:rewrite-java-17",
"org.openrewrite:rewrite-java-21",
"org.openrewrite:rewrite-java-8",
"org.openrewrite:rewrite-kotlin",
"org.openrewrite:rewrite-maven"
]
},
"org.openrewrite:rewrite-java-11": {
"locked": "8.42.0",
"transitive": [
"org.openrewrite.recipe:rewrite-recipe-bom"
]
},
"org.openrewrite:rewrite-java-17": {
"locked": "8.42.0",
"transitive": [
Expand All @@ -904,32 +845,13 @@
"org.openrewrite.recipe:rewrite-testing-frameworks"
]
},
"org.openrewrite:rewrite-java-21": {
"locked": "8.42.0",
"transitive": [
"org.openrewrite.recipe:rewrite-recipe-bom"
]
},
"org.openrewrite:rewrite-java-8": {
"locked": "8.42.0",
"transitive": [
"org.openrewrite.recipe:rewrite-recipe-bom"
]
},
"org.openrewrite:rewrite-java-lombok": {
"locked": "8.42.0",
"transitive": [
"org.openrewrite.recipe:rewrite-recipe-bom",
"org.openrewrite:rewrite-java-17"
]
},
"org.openrewrite:rewrite-json": {
"locked": "8.42.0",
"transitive": [
"org.openrewrite.recipe:rewrite-recipe-bom",
"org.openrewrite:rewrite-polyglot"
]
},
"org.openrewrite:rewrite-kotlin": {
"locked": "1.24.0",
"transitive": [
Expand All @@ -944,14 +866,7 @@
"org.openrewrite.recipe:rewrite-java-dependencies",
"org.openrewrite.recipe:rewrite-recipe-bom",
"org.openrewrite.recipe:rewrite-testing-frameworks",
"org.openrewrite:rewrite-gradle",
"org.openrewrite:rewrite-polyglot"
]
},
"org.openrewrite:rewrite-polyglot": {
"locked": "1.16.2",
"transitive": [
"org.openrewrite.recipe:rewrite-recipe-bom"
"org.openrewrite:rewrite-gradle"
]
},
"org.openrewrite:rewrite-properties": {
Expand All @@ -960,15 +875,7 @@
"org.openrewrite.recipe:rewrite-recipe-bom",
"org.openrewrite:rewrite-gradle",
"org.openrewrite:rewrite-java",
"org.openrewrite:rewrite-maven",
"org.openrewrite:rewrite-polyglot"
]
},
"org.openrewrite:rewrite-protobuf": {
"locked": "8.42.0",
"transitive": [
"org.openrewrite.recipe:rewrite-recipe-bom",
"org.openrewrite:rewrite-polyglot"
"org.openrewrite:rewrite-maven"
]
},
"org.openrewrite:rewrite-templating": {
Expand All @@ -986,28 +893,23 @@
"org.openrewrite.meta:rewrite-analysis",
"org.openrewrite.recipe:rewrite-recipe-bom",
"org.openrewrite:rewrite-java",
"org.openrewrite:rewrite-maven",
"org.openrewrite:rewrite-polyglot"
"org.openrewrite:rewrite-maven"
]
},
"org.openrewrite:rewrite-yaml": {
"locked": "8.42.0",
"transitive": [
"org.openrewrite.meta:rewrite-analysis",
"org.openrewrite.recipe:rewrite-recipe-bom",
"org.openrewrite:rewrite-java",
"org.openrewrite:rewrite-polyglot"
"org.openrewrite:rewrite-java"
]
},
"org.ow2.asm:asm": {
"locked": "9.7.1",
"transitive": [
"io.quarkus.gizmo:gizmo",
"org.openrewrite:rewrite-java",
"org.openrewrite:rewrite-java-11",
"org.openrewrite:rewrite-java-17",
"org.openrewrite:rewrite-java-21",
"org.openrewrite:rewrite-java-8",
"org.ow2.asm:asm-tree",
"org.ow2.asm:asm-util"
]
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
versions_groovy=3.0.19
versions_ribbon=2.4.4
versions_netty=4.1.115.Final
versions_netty=4.1.117.Final
versions_netty_io_uring=0.0.25.Final
versions_brotli4j=1.16.0
release.scope=patch
Expand Down
Loading

0 comments on commit b5857dd

Please sign in to comment.