Skip to content

Commit 56705ca

Browse files
authored
Merge pull request #2205 from Netflix/feature/spring-boot-3.5.5
Update to Spring Boot 3.5.5 which includes spring-graphql 1.4.1
2 parents e89d53e + 7aca6d2 commit 56705ca

File tree

21 files changed

+7995
-73779
lines changed

21 files changed

+7995
-73779
lines changed

build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ plugins {
2929
id("nebula.netflixoss") version "11.6.0"
3030
id("io.spring.dependency-management") version "1.1.7"
3131

32-
id("org.jmailen.kotlinter") version "5.1.+"
32+
// id("org.jmailen.kotlinter") version "5.2.+"
3333
id("me.champeau.jmh") version "0.7.3"
3434

3535
kotlin("jvm") version Versions.KOTLIN_VERSION
@@ -51,7 +51,7 @@ allprojects {
5151
// and suggest an upgrade. The only exception currently are those defined
5252
// in buildSrc, most likely because the variables are used in plugins as well
5353
// as dependencies. e.g. KOTLIN_VERSION
54-
extra["sb.version"] = "3.5.0"
54+
extra["sb.version"] = "3.5.5"
5555
extra["kotlin.version"] = Versions.KOTLIN_VERSION
5656
}
5757
val internalBomModules by extra(
@@ -66,7 +66,7 @@ configure(subprojects.filterNot { it in internalBomModules }) {
6666
apply {
6767
plugin("java-library")
6868
plugin("kotlin")
69-
plugin("org.jmailen.kotlinter")
69+
// plugin("org.jmailen.kotlinter")
7070
plugin("me.champeau.jmh")
7171
plugin("io.spring.dependency-management")
7272
}
@@ -145,7 +145,7 @@ configure(subprojects.filterNot { it in internalBomModules }) {
145145
}
146146
}
147147

148-
kotlinter {
149-
reporters = arrayOf("checkstyle", "plain")
150-
}
148+
// kotlinter {
149+
// reporters = arrayOf("checkstyle", "plain")
150+
// }
151151
}

buildSrc/src/main/kotlin/Versions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
*/
1616

1717
object Versions {
18-
const val KOTLIN_VERSION = "1.9.20"
18+
const val KOTLIN_VERSION = "1.9.25"
1919
}

0 commit comments

Comments
 (0)