Skip to content

Commit e192fec

Browse files
authored
[server] update to SpringBoot 2.3 (ExpediaGroup#898)
* [server] update to SpringBoot 2.3 Also updates Jackson dependency to `2.11.3`. Resolves: ExpediaGroup#850 * add missing validation dependency and cleanup spark dependencies
1 parent a691e04 commit e192fec

File tree

6 files changed

+20
-9
lines changed

6 files changed

+20
-9
lines changed

examples/build.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ subprojects {
4242

4343
dependencies {
4444
implementation(kotlin("stdlib", kotlinVersion))
45-
implementation("com.expediagroup:graphql-kotlin-spring-server")
4645
testImplementation(kotlin("test-junit5", kotlinVersion))
4746
testImplementation("org.junit.jupiter:junit-jupiter-api:$junitVersion")
4847
testImplementation("org.junit.jupiter:junit-jupiter-engine:$junitVersion")

examples/federation/base-app/build.gradle.kts

+4
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@ plugins {
44
kotlin("plugin.spring")
55
id("org.springframework.boot")
66
}
7+
8+
dependencies {
9+
implementation("com.expediagroup", "graphql-kotlin-spring-server")
10+
}

examples/federation/extend-app/build.gradle.kts

+4
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@ plugins {
44
kotlin("plugin.spring")
55
id("org.springframework.boot")
66
}
7+
8+
dependencies {
9+
implementation("com.expediagroup", "graphql-kotlin-spring-server")
10+
}

examples/spark/build.gradle.kts

+6-3
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@ application {
88
mainClassName = "com.expediagroup.graphql.examples.spark.Application"
99
}
1010

11+
val kotlinCoroutinesVersion: String by project
1112
dependencies {
12-
compile("com.sparkjava", "spark-core", "2.9.1")
13-
compile("log4j", "log4j", "1.2.17")
14-
testCompile("org.slf4j", "slf4j-log4j12", "1.7.30")
13+
implementation("com.expediagroup", "graphql-kotlin-schema-generator")
14+
implementation("com.sparkjava", "spark-core", "2.9.1")
15+
implementation("log4j", "log4j", "1.2.17")
16+
implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8", kotlinCoroutinesVersion)
17+
testImplementation("org.slf4j", "slf4j-log4j12", "1.7.30")
1518
}

examples/spring/build.gradle.kts

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ val springBootVersion: String by project
99
val reactorVersion: String by project
1010

1111
dependencies {
12-
implementation("javax.validation", "validation-api", "2.0.1.Final")
12+
implementation("com.expediagroup", "graphql-kotlin-spring-server")
13+
implementation("org.springframework.boot", "spring-boot-starter-validation", springBootVersion)
1314
testImplementation("org.springframework.boot:spring-boot-starter-test:$springBootVersion")
1415
testImplementation("io.projectreactor:reactor-test:$reactorVersion")
1516
}

gradle.properties

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ kotlinCoroutinesVersion = 1.3.8
2020

2121
classGraphVersion = 4.8.87
2222
graphQLJavaVersion = 15.0
23-
jacksonVersion = 2.11.0
23+
jacksonVersion = 2.11.3
2424
kotlinPoetVersion = 1.6.0
2525
ktorVersion = 1.3.1
26-
reactorVersion = 3.3.6.RELEASE
26+
reactorVersion = 3.3.10.RELEASE
2727
reactorExtensionsVersion = 1.0.2.RELEASE
28-
springBootVersion = 2.2.9.RELEASE
29-
springVersion = 5.2.8.RELEASE
28+
springBootVersion = 2.3.4.RELEASE
29+
springVersion = 5.2.9.RELEASE
3030

3131
# test dependency versions
3232
junitVersion = 5.6.2

0 commit comments

Comments
 (0)