Merge branch 'master' into #1058-2

Netflix · Oct 19, 2022 · c1a4014 · c1a4014
2 parents 6666853 + 3e0b0a8
commit c1a4014
Show file tree

Hide file tree

Showing 28 changed files with 202 additions and 202 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,22 +24,22 @@ jobs:
           python -m pip install --upgrade pip
           if [ -f scripts/requirements.txt ]; then pip install -r scripts/requirements.txt; fi
 
-      - uses: actions/cache@v3.0.10
+      - uses: actions/cache@v3.0.11
         id: gradle-wrapper-cache
         with:
           path: ~/.gradle/wrapper
           key: ${{ runner.os }}-gradlewrapper-${{ hashFiles('gradle/wrapper/*') }}
           restore-keys: ${{ runner.os }}-gradlewrapper-
 
       - name: Cache Gradle packages
-        uses: actions/cache@v3.0.10
+        uses: actions/cache@v3.0.11
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
           restore-keys: ${{ runner.os }}-gradle
 
       - name: Maven cache
-        uses: actions/cache@v3.0.10
+        uses: actions/cache@v3.0.11
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

diff --git a/.github/workflows/nebula-publish.yml b/.github/workflows/nebula-publish.yml
@@ -15,14 +15,14 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: 8
-      - uses: actions/cache@v3.0.10
+      - uses: actions/cache@v3.0.11
         id: gradle-cache
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/gradle/dependency-locks/*.lockfile') }}
           restore-keys: |
             - ${{ runner.os }}-gradle-
-      - uses: actions/cache@v3.0.10
+      - uses: actions/cache@v3.0.11
         id: gradle-wrapper-cache
         with:
           path: ~/.gradle/wrapper

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -118,7 +118,7 @@ configure(subprojects.filterNot { it in internalBomModules }) {
         testImplementation("org.springframework.boot:spring-boot-starter-test") {
             exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
         }
-        testImplementation("io.mockk:mockk:1.12.4")
+        testImplementation("io.mockk:mockk:1.13.2")
     }
 
     java {

diff --git a/graphql-dgs-client/dependencies.lock b/graphql-dgs-client/dependencies.lock
diff --git a/graphql-dgs-example-java-webflux/dependencies.lock b/graphql-dgs-example-java-webflux/dependencies.lock
diff --git a/graphql-dgs-example-java/dependencies.lock b/graphql-dgs-example-java/dependencies.lock
diff --git a/graphql-dgs-example-shared/dependencies.lock b/graphql-dgs-example-shared/dependencies.lock