Skip to content

Commit

Permalink
Upgrade to Spring Boot 3.3 (#1920)
Browse files Browse the repository at this point in the history
* Upgrade to Spring Boot 3.3
* buildfile cleanup
* Rebase and fix for Jackson 2.17 issue with @JsonAnySetter
* Implement unmapped arguments schema inspection support
  • Loading branch information
paulbakker committed May 31, 2024
1 parent ae5f2c3 commit f9382bf
Show file tree
Hide file tree
Showing 45 changed files with 10,513 additions and 11,298 deletions.
36 changes: 1 addition & 35 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,8 @@ 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.5"
extra["sb.version"] = "3.3.0"
extra["kotlin.version"] = Versions.KOTLIN_VERSION
val springBootVersion = extra["sb.version"] as String

configurations.all {
resolutionStrategy {
force("org.springframework.graphql:spring-graphql:1.2.6")
}
}
}
val internalBomModules by extra(
listOf(
Expand All @@ -84,23 +77,9 @@ configure(subprojects.filterNot { it in internalBomModules }) {
plugin("io.spring.dependency-management")
}

/**
* Remove once the following ticket is closed:
* Kotlin-JVM: runtimeOnlyDependenciesMetadata, implementationDependenciesMetadata should be marked with isCanBeResolved=false
* https://youtrack.jetbrains.com/issue/KT-34394
*/
// tasks.named("generateLock") {
// doFirst {
// project.configurations.filter { it.name.contains("DependenciesMetadata") }.forEach {
// it.isCanBeResolved = false
// }
// }
// }

val springBootVersion = extra["sb.version"] as String
val jmhVersion = "1.37"


dependencyManagement {
imports {
mavenBom("org.jetbrains.kotlin:kotlin-bom:${Versions.KOTLIN_VERSION}")
Expand All @@ -115,10 +94,6 @@ configure(subprojects.filterNot { it in internalBomModules }) {
annotationProcessor("org.springframework.boot:spring-boot-autoconfigure-processor")
// Produce Config Metadata for properties used in Spring Boot
annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
// Speed up processing of AutoConfig's produced by Spring Boot for Kotlin
// kapt("org.springframework.boot:spring-boot-autoconfigure-processor:${springBootVersion}")
// Produce Config Metadata for properties used in Spring Boot for Kotlin
// kapt("org.springframework.boot:spring-boot-configuration-processor:${springBootVersion}")

// Sets the JMH version to use across modules.
// Please refer to the following links for further reference.
Expand All @@ -139,15 +114,6 @@ configure(subprojects.filterNot { it in internalBomModules }) {
}
}

// kapt {
// arguments {
// arg(
// "org.springframework.boot.configurationprocessor.additionalMetadataLocations",
// "$projectDir/src/main/resources"
// )
// }
// }

jmh {
includeTests.set(true)
jmhTimeout.set("5s")
Expand Down
Loading

0 comments on commit f9382bf

Please sign in to comment.