Merge remote-tracking branch 'origin/master' into spring-graphql-refa…

…ctored

# Conflicts:
#	graphql-dgs-example-java-webflux/dependencies.lock
#	graphql-dgs-reactive/dependencies.lock
#	graphql-dgs-spring-webflux-autoconfigure/dependencies.lock
#	graphql-dgs-webflux-starter/dependencies.lock

.github/workflows/ci.yml

@@ -28,22 +28,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.3.2
+ - uses: actions/cache@v4.0.0
  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.3.2
+ uses: actions/cache@v4.0.0
  with:
  path: ~/.gradle/caches
  key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
  restore-keys: ${{ runner.os }}-gradle
 
  - name: Maven cache
- uses: actions/cache@v3.3.2
+ uses: actions/cache@v4.0.0
  with:
  path: ~/.m2
  key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

.github/workflows/nebula-publish.yml

@@ -15,14 +15,14 @@ jobs:
  with:
  distribution: 'zulu'
  java-version: 8
- - uses: actions/cache@v3.3.2
+ - uses: actions/cache@v4.0.0
  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.3.2
+ - uses: actions/cache@v4.0.0
  id: gradle-wrapper-cache
  with:
  path: ~/.gradle/wrapper

build.gradle.kts

@@ -57,7 +57,7 @@ allprojects {
  // and suggest an upgrade. The only exception currently are those defined
  // in buildSrc, most likely because the variables are used in plugins as well
  // as dependencies. e.g. KOTLIN_VERSION
- extra["sb.version"] = "3.2.0"
+ extra["sb.version"] = "3.2.2"
  extra["kotlin.version"] = Versions.KOTLIN_VERSION
  val springBootVersion = extra["sb.version"] as String
 
@@ -71,7 +71,7 @@ allprojects {
  mavenBom(mapOf("module" to "org.jetbrains.kotlin:kotlin-bom:${Versions.KOTLIN_VERSION}"))
 
  mavenBom(mapOf("module" to "org.springframework.boot:spring-boot-dependencies:${springBootVersion}"))
- mavenBom(mapOf("module" to "org.springframework.cloud:spring-cloud-dependencies:2022.0.0"))
+ mavenBom(mapOf("module" to "org.springframework.cloud:spring-cloud-dependencies:2023.0.+"))
  mavenBom(mapOf("module" to "com.fasterxml.jackson:jackson-bom:2.15.+"))
  }
 }

buildSrc/src/main/kotlin/Versions.kt

@@ -15,5 +15,5 @@
  */
 
 object Versions {
- const val KOTLIN_VERSION = "1.9.21"
+ const val KOTLIN_VERSION = "1.9.22"
 }