Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to Spring Boot 3.3 #1920

Merged
merged 6 commits into from
May 31, 2024
Merged

Upgrade to Spring Boot 3.3 #1920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d81ad91
Upgrade to Spring Boot 3.3
paulbakker May 24, 2024
83eb623
Upgrade to Spring Boot 3.3
paulbakker May 25, 2024
ad9dd8b
buildfile cleanup
paulbakker May 25, 2024
8adda29
Rebase and fix for Jackson 2.17 issue with @JsonAnySetter
paulbakker May 28, 2024
9021095
Implement unmapped arguments schema inspection support
paulbakker May 29, 2024
eec2148
Format
paulbakker May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 1 addition & 35 deletions build.gradle.kts
View file
Open in desktop
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
Loading