Merge pull request #690 from Netflix/fix-webclient-dependency

Update compile only dependency on webclient to implementation.
Netflix · Oct 12, 2021 · 464b88e · 464b88e
2 parents 9fd200f + cfe300b
commit 464b88e
Show file tree

Hide file tree

Showing 24 changed files with 198 additions and 120 deletions.
diff --git a/dependencies.lock b/dependencies.lock
@@ -195,11 +195,6 @@
             "locked": "5.2.13.RELEASE"
         }
     },
-    "ktlint": {
-        "com.pinterest:ktlint": {
-            "locked": "0.40.0"
-        }
-    },
     "nebulaRecommenderBom": {
         "com.fasterxml.jackson:jackson-bom": {
             "locked": "2.12.3"

diff --git a/graphql-dgs-client/build.gradle.kts b/graphql-dgs-client/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
     api("com.fasterxml.jackson.core:jackson-annotations")
     api(project(":graphql-dgs-subscription-types"))
 
-    compileOnly("org.springframework:spring-webflux")
+    implementation("org.springframework:spring-webflux")
 
     implementation("org.springframework:spring-web")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin")

diff --git a/graphql-dgs-client/dependencies.lock b/graphql-dgs-client/dependencies.lock
@@ -32,12 +32,18 @@
             ],
             "locked": "2.12.3"
         },
+        "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": {
+            "locked": "2.12.3"
+        },
         "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
             "locked": "2.12.3"
         },
         "com.fasterxml.jackson.module:jackson-module-kotlin": {
             "locked": "2.12.3"
         },
+        "com.fasterxml.jackson.module:jackson-module-parameter-names": {
+            "locked": "2.12.3"
+        },
         "com.fasterxml.jackson:jackson-bom": {
             "locked": "2.12.3"
         },
@@ -257,11 +263,6 @@
             "locked": "5.2.13.RELEASE"
         }
     },
-    "ktlint": {
-        "com.pinterest:ktlint": {
-            "locked": "0.40.0"
-        }
-    },
     "nebulaRecommenderBom": {
         "com.fasterxml.jackson:jackson-bom": {
             "locked": "2.12.3"
@@ -289,12 +290,18 @@
             ],
             "locked": "2.12.3"
         },
+        "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": {
+            "locked": "2.12.3"
+        },
         "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
             "locked": "2.12.3"
         },
         "com.fasterxml.jackson.module:jackson-module-kotlin": {
             "locked": "2.12.3"
         },
+        "com.fasterxml.jackson.module:jackson-module-parameter-names": {
+            "locked": "2.12.3"
+        },
         "com.fasterxml.jackson:jackson-bom": {
             "locked": "2.12.3"
         },
@@ -342,6 +349,9 @@
         },
         "org.springframework:spring-web": {
             "locked": "5.2.13.RELEASE"
+        },
+        "org.springframework:spring-webflux": {
+            "locked": "5.2.13.RELEASE"
         }
     },
     "testAnnotationProcessor": {
@@ -371,12 +381,18 @@
             ],
             "locked": "2.12.3"
         },
+        "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": {
+            "locked": "2.12.3"
+        },
         "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
             "locked": "2.12.3"
         },
         "com.fasterxml.jackson.module:jackson-module-kotlin": {
             "locked": "2.12.3"
         },
+        "com.fasterxml.jackson.module:jackson-module-parameter-names": {
+            "locked": "2.12.3"
+        },
         "com.fasterxml.jackson:jackson-bom": {
             "locked": "2.12.3"
         },
@@ -500,6 +516,9 @@
         },
         "org.springframework:spring-web": {
             "locked": "5.2.13.RELEASE"
+        },
+        "org.springframework:spring-webflux": {
+            "locked": "5.2.13.RELEASE"
         }
     },
     "testRuntimeClasspath": {
@@ -515,6 +534,9 @@
             ],
             "locked": "2.12.3"
         },
+        "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": {
+            "locked": "2.12.3"
+        },
         "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
             "firstLevelTransitive": [
                 "com.netflix.graphql.dgs:graphql-dgs"
@@ -529,6 +551,9 @@
             ],
             "locked": "2.12.3"
         },
+        "com.fasterxml.jackson.module:jackson-module-parameter-names": {
+            "locked": "2.12.3"
+        },
         "com.fasterxml.jackson:jackson-bom": {
             "locked": "2.12.3"
         },
@@ -729,6 +754,9 @@
             ],
             "locked": "5.2.13.RELEASE"
         },
+        "org.springframework:spring-webflux": {
+            "locked": "5.2.13.RELEASE"
+        },
         "org.springframework:spring-webmvc": {
             "firstLevelTransitive": [
                 "com.netflix.graphql.dgs:graphql-dgs-spring-webmvc-autoconfigure",

diff --git a/graphql-dgs-example-java-webflux/dependencies.lock b/graphql-dgs-example-java-webflux/dependencies.lock
@@ -344,11 +344,6 @@
             "locked": "5.2.13.RELEASE"
         }
     },
-    "ktlint": {
-        "com.pinterest:ktlint": {
-            "locked": "0.40.0"
-        }
-    },
     "nebulaRecommenderBom": {
         "com.fasterxml.jackson:jackson-bom": {
             "locked": "2.12.3"
@@ -389,6 +384,12 @@
             ],
             "locked": "2.12.3"
         },
+        "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": {
+            "firstLevelTransitive": [
+                "com.netflix.graphql.dgs:graphql-dgs-client"
+            ],
+            "locked": "2.12.3"
+        },
         "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
             "firstLevelTransitive": [
                 "com.netflix.graphql.dgs:graphql-dgs",
@@ -406,6 +407,12 @@
             ],
             "locked": "2.12.3"
         },
+        "com.fasterxml.jackson.module:jackson-module-parameter-names": {
+            "firstLevelTransitive": [
+                "com.netflix.graphql.dgs:graphql-dgs-client"
+            ],
+            "locked": "2.12.3"
+        },
         "com.fasterxml.jackson:jackson-bom": {
             "locked": "2.12.3"
         },
@@ -627,6 +634,7 @@
         },
         "org.springframework:spring-webflux": {
             "firstLevelTransitive": [
+                "com.netflix.graphql.dgs:graphql-dgs-client",
                 "com.netflix.graphql.dgs:graphql-dgs-reactive",
                 "com.netflix.graphql.dgs:graphql-dgs-spring-webflux-autoconfigure"
             ],
@@ -831,6 +839,12 @@
             ],
             "locked": "2.12.3"
         },
+        "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": {
+            "firstLevelTransitive": [
+                "com.netflix.graphql.dgs:graphql-dgs-client"
+            ],
+            "locked": "2.12.3"
+        },
         "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
             "firstLevelTransitive": [
                 "com.netflix.graphql.dgs:graphql-dgs",
@@ -848,6 +862,12 @@
             ],
             "locked": "2.12.3"
         },
+        "com.fasterxml.jackson.module:jackson-module-parameter-names": {
+            "firstLevelTransitive": [
+                "com.netflix.graphql.dgs:graphql-dgs-client"
+            ],
+            "locked": "2.12.3"
+        },
         "com.fasterxml.jackson:jackson-bom": {
             "locked": "2.12.3"
         },
@@ -1075,6 +1095,7 @@
         },
         "org.springframework:spring-webflux": {
             "firstLevelTransitive": [
+                "com.netflix.graphql.dgs:graphql-dgs-client",
                 "com.netflix.graphql.dgs:graphql-dgs-reactive",
                 "com.netflix.graphql.dgs:graphql-dgs-spring-webflux-autoconfigure"
             ],

diff --git a/graphql-dgs-example-java/dependencies.lock b/graphql-dgs-example-java/dependencies.lock
@@ -350,11 +350,6 @@
             "locked": "5.2.13.RELEASE"
         }
     },
-    "ktlint": {
-        "com.pinterest:ktlint": {
-            "locked": "0.40.0"
-        }
-    },
     "nebulaRecommenderBom": {
         "com.fasterxml.jackson:jackson-bom": {
             "locked": "2.12.3"
@@ -395,6 +390,12 @@
             ],
             "locked": "2.12.3"
         },
+        "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": {
+            "firstLevelTransitive": [
+                "com.netflix.graphql.dgs:graphql-dgs-client"
+            ],
+            "locked": "2.12.3"
+        },
         "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
             "firstLevelTransitive": [
                 "com.netflix.graphql.dgs:graphql-dgs",
@@ -411,6 +412,12 @@
             ],
             "locked": "2.12.3"
         },
+        "com.fasterxml.jackson.module:jackson-module-parameter-names": {
+            "firstLevelTransitive": [
+                "com.netflix.graphql.dgs:graphql-dgs-client"
+            ],
+            "locked": "2.12.3"
+        },
         "com.fasterxml.jackson:jackson-bom": {
             "locked": "2.12.3"
         },
@@ -656,6 +663,12 @@
             ],
             "locked": "5.2.13.RELEASE"
         },
+        "org.springframework:spring-webflux": {
+            "firstLevelTransitive": [
+                "com.netflix.graphql.dgs:graphql-dgs-client"
+            ],
+            "locked": "5.2.13.RELEASE"
+        },
         "org.springframework:spring-webmvc": {
             "firstLevelTransitive": [
                 "com.netflix.graphql.dgs:graphql-dgs-spring-webmvc-autoconfigure"
@@ -880,6 +893,12 @@
             ],
             "locked": "2.12.3"
         },
+        "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": {
+            "firstLevelTransitive": [
+                "com.netflix.graphql.dgs:graphql-dgs-client"
+            ],
+            "locked": "2.12.3"
+        },
         "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
             "firstLevelTransitive": [
                 "com.netflix.graphql.dgs:graphql-dgs",
@@ -896,6 +915,12 @@
             ],
             "locked": "2.12.3"
         },
+        "com.fasterxml.jackson.module:jackson-module-parameter-names": {
+            "firstLevelTransitive": [
+                "com.netflix.graphql.dgs:graphql-dgs-client"
+            ],
+            "locked": "2.12.3"
+        },
         "com.fasterxml.jackson:jackson-bom": {
             "locked": "2.12.3"
         },
@@ -1154,6 +1179,12 @@
             ],
             "locked": "5.2.13.RELEASE"
         },
+        "org.springframework:spring-webflux": {
+            "firstLevelTransitive": [
+                "com.netflix.graphql.dgs:graphql-dgs-client"
+            ],
+            "locked": "5.2.13.RELEASE"
+        },
         "org.springframework:spring-webmvc": {
             "firstLevelTransitive": [
                 "com.netflix.graphql.dgs:graphql-dgs-spring-webmvc-autoconfigure"

diff --git a/graphql-dgs-example-shared/dependencies.lock b/graphql-dgs-example-shared/dependencies.lock
@@ -292,11 +292,6 @@
             "locked": "5.2.13.RELEASE"
         }
     },
-    "ktlint": {
-        "com.pinterest:ktlint": {
-            "locked": "0.40.0"
-        }
-    },
     "nebulaRecommenderBom": {
         "com.fasterxml.jackson:jackson-bom": {
             "locked": "2.12.3"

diff --git a/graphql-dgs-extended-scalars/dependencies.lock b/graphql-dgs-extended-scalars/dependencies.lock
@@ -263,11 +263,6 @@
             "locked": "5.2.13.RELEASE"
         }
     },
-    "ktlint": {
-        "com.pinterest:ktlint": {
-            "locked": "0.40.0"
-        }
-    },
     "nebulaRecommenderBom": {
         "com.fasterxml.jackson:jackson-bom": {
             "locked": "2.12.3"
@@ -597,6 +592,12 @@
             ],
             "locked": "2.12.3"
         },
+        "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": {
+            "firstLevelTransitive": [
+                "com.netflix.graphql.dgs:graphql-dgs-client"
+            ],
+            "locked": "2.12.3"
+        },
         "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": {
             "firstLevelTransitive": [
                 "com.netflix.graphql.dgs:graphql-dgs",
@@ -612,6 +613,12 @@
             ],
             "locked": "2.12.3"
         },
+        "com.fasterxml.jackson.module:jackson-module-parameter-names": {
+            "firstLevelTransitive": [
+                "com.netflix.graphql.dgs:graphql-dgs-client"
+            ],
+            "locked": "2.12.3"
+        },
         "com.fasterxml.jackson:jackson-bom": {
             "locked": "2.12.3"
         },
@@ -819,6 +826,12 @@
             ],
             "locked": "5.2.13.RELEASE"
         },
+        "org.springframework:spring-webflux": {
+            "firstLevelTransitive": [
+                "com.netflix.graphql.dgs:graphql-dgs-client"
+            ],
+            "locked": "5.2.13.RELEASE"
+        },
         "org.springframework:spring-webmvc": {
             "firstLevelTransitive": [
                 "com.netflix.graphql.dgs:graphql-dgs-spring-webmvc-autoconfigure"

diff --git a/graphql-dgs-mocking/dependencies.lock b/graphql-dgs-mocking/dependencies.lock
@@ -227,11 +227,6 @@
             "locked": "5.2.13.RELEASE"
         }
     },
-    "ktlint": {
-        "com.pinterest:ktlint": {
-            "locked": "0.40.0"
-        }
-    },
     "nebulaRecommenderBom": {
         "com.fasterxml.jackson:jackson-bom": {
             "locked": "2.12.3"

diff --git a/graphql-dgs-pagination/dependencies.lock b/graphql-dgs-pagination/dependencies.lock
@@ -260,11 +260,6 @@
             "locked": "5.2.13.RELEASE"
         }
     },
-    "ktlint": {
-        "com.pinterest:ktlint": {
-            "locked": "0.40.0"
-        }
-    },
     "nebulaRecommenderBom": {
         "com.fasterxml.jackson:jackson-bom": {
             "locked": "2.12.3"