[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
huehnerlady · Oct 16, 2020 · 21cf23f · 21cf23f
1 parent c5ce6aa
commit 21cf23f
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 9 deletions.
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
@@ -42,7 +42,6 @@ subprojects {
 
     dependencies {
         implementation(kotlin("stdlib", kotlinVersion))
-        implementation("com.expediagroup:graphql-kotlin-spring-server")
         testImplementation(kotlin("test-junit5", kotlinVersion))
         testImplementation("org.junit.jupiter:junit-jupiter-api:$junitVersion")
         testImplementation("org.junit.jupiter:junit-jupiter-engine:$junitVersion")

diff --git a/examples/federation/base-app/build.gradle.kts b/examples/federation/base-app/build.gradle.kts
@@ -4,3 +4,7 @@ plugins {
     kotlin("plugin.spring")
     id("org.springframework.boot")
 }
+
+dependencies {
+    implementation("com.expediagroup", "graphql-kotlin-spring-server")
+}
diff --git a/examples/federation/extend-app/build.gradle.kts b/examples/federation/extend-app/build.gradle.kts
@@ -4,3 +4,7 @@ plugins {
     kotlin("plugin.spring")
     id("org.springframework.boot")
 }
+
+dependencies {
+    implementation("com.expediagroup", "graphql-kotlin-spring-server")
+}
diff --git a/examples/spark/build.gradle.kts b/examples/spark/build.gradle.kts
@@ -8,8 +8,11 @@ application {
     mainClassName = "com.expediagroup.graphql.examples.spark.Application"
 }
 
+val kotlinCoroutinesVersion: String by project
 dependencies {
-    compile("com.sparkjava", "spark-core", "2.9.1")
-    compile("log4j", "log4j", "1.2.17")
-    testCompile("org.slf4j", "slf4j-log4j12", "1.7.30")
+    implementation("com.expediagroup", "graphql-kotlin-schema-generator")
+    implementation("com.sparkjava", "spark-core", "2.9.1")
+    implementation("log4j", "log4j", "1.2.17")
+    implementation("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8", kotlinCoroutinesVersion)
+    testImplementation("org.slf4j", "slf4j-log4j12", "1.7.30")
 }
diff --git a/examples/spring/build.gradle.kts b/examples/spring/build.gradle.kts
@@ -9,7 +9,8 @@ val springBootVersion: String by project
 val reactorVersion: String by project
 
 dependencies {
-    implementation("javax.validation", "validation-api", "2.0.1.Final")
+    implementation("com.expediagroup", "graphql-kotlin-spring-server")
+    implementation("org.springframework.boot", "spring-boot-starter-validation", springBootVersion)
     testImplementation("org.springframework.boot:spring-boot-starter-test:$springBootVersion")
     testImplementation("io.projectreactor:reactor-test:$reactorVersion")
 }
diff --git a/gradle.properties b/gradle.properties
@@ -20,13 +20,13 @@ kotlinCoroutinesVersion = 1.3.8
 
 classGraphVersion = 4.8.87
 graphQLJavaVersion = 15.0
-jacksonVersion = 2.11.0
+jacksonVersion = 2.11.3
 kotlinPoetVersion = 1.6.0
 ktorVersion = 1.3.1
-reactorVersion = 3.3.6.RELEASE
+reactorVersion = 3.3.10.RELEASE
 reactorExtensionsVersion = 1.0.2.RELEASE
-springBootVersion = 2.2.9.RELEASE
-springVersion = 5.2.8.RELEASE
+springBootVersion = 2.3.4.RELEASE
+springVersion = 5.2.9.RELEASE
 
 # test dependency versions
 junitVersion = 5.6.2