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.

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

Spring Boot 3 #1230

Merged
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
bd44fe8
feat: Bumps major spring versions.
Sep 9, 2022
f142d2d
feat: upgrades graphql-java to fix conflicting antlr dependency with …
Sep 12, 2022
7f4147c
chore: remove kapt error type correction used for debugging.
Sep 13, 2022
086920e
chore: ensure jakarta deps are compileOnly.
Sep 13, 2022
6f184a7
chore: bumps version of JDK in CI workflow.
Sep 13, 2022
57ec66e
chore: merges main and resolves conflicts.
Stuckya Oct 19, 2022
ae11b1a
feat: upgrades spring boot dependencies and implements @AutoConfigura…
Stuckya Oct 20, 2022
9b8c964
chore: merges main and fixes conflicts.
Stuckya Oct 20, 2022
761ac95
feat: upgrades spring boot to first release candidate and fixes metrics.
Stuckya Oct 21, 2022
fd8677a
Merge branch 'master' into jakarta-spring-boot-3
Stuckya Oct 21, 2022
587ca3c
feat: bumps spring cloud dependency to RC1.
Stuckya Nov 1, 2022
100c2f8
chore: merges main.
Stuckya Nov 1, 2022
b9fcdf1
chore: fixes import in WebsocketSubscriptionsGraphQLWSTestCustomEndpo…
Stuckya Nov 1, 2022
42b769e
feat: bumps spring framework to final RC.
Stuckya Nov 4, 2022
5f9e9c8
feat: bumps sprint boot to latest RC.
Stuckya Nov 12, 2022
c9605d3
chore: merges main.
Stuckya Nov 12, 2022
03ede8c
feat: bumps spring boot dependencies to GA versions, except for sprin…
Stuckya Nov 24, 2022
cc7096c
Merge branch 'master' into jakarta-spring-boot-3
Stuckya Nov 24, 2022
40ae5e9
feat: adopts @AliasFor to remove deprecation warning.
Stuckya Nov 29, 2022
8719c49
feat: Adds @AliasFor to DgsSubscription annotation.
Stuckya Nov 30, 2022
45d1090
feat: cleans up @AliasFor usages.
Stuckya Nov 30, 2022
d2a73e1
Merge branch 'master' into jakarta-spring-boot-3
Stuckya Nov 30, 2022
679c9b8
chore: merges main.
Stuckya Dec 7, 2022
d446e04
feat: bumps spring-cloud-dependencies to RC3.
Stuckya Dec 7, 2022
7721acf
Merge branch 'master' into jakarta-spring-boot-3
Stuckya Dec 7, 2022
505b6c2
feat: bumps spring versions and removes milestone repository.
Stuckya Dec 20, 2022
005b971
Merge branch 'master' into jakarta-spring-boot-3
Stuckya Dec 20, 2022
502b92c
Merge branch 'master' into jakarta-spring-boot-3
srinivasankavitha Dec 21, 2022
168d8c7
feat: use spring-boot 3 example repos.
Stuckya Dec 21, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 8
java-version: 17

- name: Set up Python 3.8
uses: actions/setup-python@v4
Expand Down
17 changes: 9 additions & 8 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ allprojects {
group = "com.netflix.graphql.dgs"
repositories {
mavenCentral()
maven { url = uri("https://repo.spring.io/milestone") }
}

apply(plugin = "nebula.netflixoss")
Expand All @@ -48,17 +49,17 @@ allprojects {
// We are attempting to define the versions of the artifacts closest to the
// place they are referenced such that dependabot can easily pick them up
// and suggest an upgrade. The only exception currently are those defined
// in buildSrc, most likley because the variables are used in plugins as well
// in buildSrc, most likely because the variables are used in plugins as well
// as dependencies. e.g. KOTLIN_VERSION
extra["sb.version"] = "2.7.5"
extra["sb.version"] = "3.0.0"
val springBootVersion = extra["sb.version"] as String

dependencyRecommendations {
mavenBom(mapOf("module" to "org.jetbrains.kotlin:kotlin-bom:${Versions.KOTLIN_VERSION}"))
mavenBom(mapOf("module" to "org.springframework:spring-framework-bom:5.3.23"))
mavenBom(mapOf("module" to "org.springframework:spring-framework-bom:6.0.2"))
mavenBom(mapOf("module" to "org.springframework.boot:spring-boot-dependencies:${springBootVersion}"))
mavenBom(mapOf("module" to "org.springframework.security:spring-security-bom:5.7.4"))
mavenBom(mapOf("module" to "org.springframework.cloud:spring-cloud-dependencies:2021.0.3"))
mavenBom(mapOf("module" to "org.springframework.security:spring-security-bom:6.0.0"))
mavenBom(mapOf("module" to "org.springframework.cloud:spring-cloud-dependencies:2022.0.0-RC3"))
mavenBom(mapOf("module" to "com.fasterxml.jackson:jackson-bom:2.13.4"))
}
}
Expand Down Expand Up @@ -108,7 +109,7 @@ configure(subprojects.filterNot { it in internalBomModules }) {
// Produce Config Metadata for properties used in Spring Boot for Kotlin
kapt("org.springframework.boot:spring-boot-configuration-processor:${springBootVersion}")

// Sets sets the JMH version to use across modules.
// Sets the JMH version to use across modules.
// Please refer to the following links for further reference.
// * https://github.com/melix/jmh-gradle-plugin
// * https://openjdk.java.net/projects/code-tools/jmh/
Expand All @@ -123,7 +124,7 @@ configure(subprojects.filterNot { it in internalBomModules }) {

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
languageVersion.set(JavaLanguageVersion.of(17))
}
}

Expand Down Expand Up @@ -164,7 +165,7 @@ configure(subprojects.filterNot { it in internalBomModules }) {
* Ref. https://kotlinlang.org/docs/kotlin-reference.pdf
*/
freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all-compatibility"
jvmTarget = "1.8"
jvmTarget = "17"
}
}

Expand Down