Improve spring integration deps (#484)

* Make dependencies of `sdk-spring-boot` minimal, and make sure all the deps used by the starter modules are what people need to get started.

Author: slinkydeveloper

gradle/libs.versions.toml

@@ -8,7 +8,7 @@ vertx = "4.5.11"
 kotlinx-serialization = "1.7.3"
 kotlinx-coroutines = "1.9.0"
 junit = "5.10.2"
-spring-boot = "3.4.0"
+spring-boot = "3.4.4"
 log4j = "2.24.2"
 restate = "2.0.0-SNAPSHOT"
 
@@ -48,7 +48,9 @@ jspecify = "org.jspecify:jspecify:1.0.0"
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
 junit-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
 slf4j-nop = "org.slf4j:slf4j-nop:2.0.16"
+spring-boot = { module = "org.springframework.boot:spring-boot", version.ref = "spring-boot" }
 spring-boot-starter = { module = "org.springframework.boot:spring-boot-starter", version.ref = "spring-boot" }
+spring-boot-starter-logging = { module = "org.springframework.boot:spring-boot-starter-logging", version.ref = "spring-boot" }
 spring-boot-starter-json = { module = "org.springframework.boot:spring-boot-starter-json", version.ref = "spring-boot" }
 spring-boot-starter-test = { module = "org.springframework.boot:spring-boot-starter-test", version.ref = "spring-boot" }
 testcontainers = "org.testcontainers:testcontainers:1.20.4"

sdk-spring-boot-kotlin-starter/build.gradle.kts

@@ -10,16 +10,21 @@ description = "Restate SDK Spring Boot Kotlin starter"
 dependencies {
   compileOnly(libs.jspecify)
 
+  // SDK dependencies
   api(project(":sdk-api-kotlin"))
   api(project(":client-kotlin"))
+  api(project(":sdk-serde-kotlinx"))
   api(project(":sdk-spring-boot"))
 
+  // Spring boot starter for kotlin dependencies brought in here for convenience
+  api(libs.spring.boot.starter)
+  implementation("org.jetbrains.kotlin:kotlin-reflect")
+
+  // Testing
   kspTest(project(":sdk-api-kotlin-gen"))
   testImplementation(project(":sdk-testing"))
   testImplementation(libs.kotlinx.coroutines.test)
   testImplementation(libs.spring.boot.starter.test)
-
-  // We need these for the deployment manifest
   testImplementation(project(":sdk-core"))
   testImplementation(libs.jackson.annotations)
   testImplementation(libs.jackson.databind)

sdk-spring-boot-starter/build.gradle.kts

@@ -10,36 +10,32 @@ description = "Restate SDK Spring Boot starter"
 dependencies {
   compileOnly(libs.jspecify)
 
+  val excludeJackson =
+      fun ProjectDependency.() {
+        // Let spring bring jackson in
+        exclude(group = "com.fasterxml.jackson")
+        exclude(group = "com.fasterxml.jackson.core")
+        exclude(group = "com.fasterxml.jackson.datatype")
+      }
+
+  // SDK dependencies
   api(project(":sdk-spring-boot"))
-  api(project(":sdk-api")) {
-    // Let spring bring jackson in
-    exclude(group = "com.fasterxml.jackson")
-    exclude(group = "com.fasterxml.jackson.core")
-    exclude(group = "com.fasterxml.jackson.datatype")
-  }
-  api(project(":client")) {
-    // Let spring bring jackson in
-    exclude(group = "com.fasterxml.jackson")
-    exclude(group = "com.fasterxml.jackson.core")
-    exclude(group = "com.fasterxml.jackson.datatype")
-  }
-  api(project(":sdk-serde-jackson")) {
-    // Let spring bring jackson in
-    exclude(group = "com.fasterxml.jackson")
-    exclude(group = "com.fasterxml.jackson.core")
-    exclude(group = "com.fasterxml.jackson.datatype")
-  }
+  api(project(":sdk-api"), excludeJackson)
+  api(project(":client"), excludeJackson)
+  api(project(":sdk-serde-jackson"), excludeJackson)
+
+  // Spring boot starter brought in here for convenience
+  api(libs.spring.boot.starter)
 
+  // Testing
+  testImplementation(libs.spring.boot.starter.test)
+  testAnnotationProcessor(project(":sdk-api-gen"))
   // We need these for the deployment manifest
   testImplementation(project(":sdk-core"))
   testImplementation(libs.jackson.annotations)
   testImplementation(libs.jackson.databind)
-
-  testAnnotationProcessor(project(":sdk-api-gen"))
   testImplementation(project(":sdk-serde-jackson"))
   testImplementation(project(":sdk-testing"))
-
-  testImplementation(libs.spring.boot.starter.test)
 }
 
 tasks.withType<JavaCompile> { options.compilerArgs.add("-parameters") }

sdk-spring-boot/build.gradle.kts

@@ -10,40 +10,37 @@ description = "Restate SDK Spring Boot integration"
 dependencies {
   compileOnly(libs.jspecify)
 
-  api(project(":sdk-common")) {
-    // Let spring bring jackson in
-    exclude(group = "com.fasterxml.jackson")
-    exclude(group = "com.fasterxml.jackson.core")
-    exclude(group = "com.fasterxml.jackson.datatype")
-  }
-
-  api(project(":client")) {
-    // Let spring bring jackson in
-    exclude(group = "com.fasterxml.jackson")
-    exclude(group = "com.fasterxml.jackson.core")
-    exclude(group = "com.fasterxml.jackson.datatype")
-  }
-
-  implementation(project(":sdk-http-vertx")) {
-    // Let spring bring jackson in
-    exclude(group = "com.fasterxml.jackson")
-    exclude(group = "com.fasterxml.jackson.core")
-    exclude(group = "com.fasterxml.jackson.datatype")
-  }
-  implementation(project(":sdk-request-identity"))
+  val excludeJackson =
+      fun ProjectDependency.() {
+        // Let spring bring jackson in
+        exclude(group = "com.fasterxml.jackson")
+        exclude(group = "com.fasterxml.jackson.core")
+        exclude(group = "com.fasterxml.jackson.datatype")
+      }
+
+  // SDK deps
+  implementation(project(":sdk-common"), excludeJackson)
+  implementation(project(":client"), excludeJackson)
+  implementation(project(":sdk-http-vertx"), excludeJackson)
+  implementation(project(":sdk-request-identity"), excludeJackson)
   implementation(libs.vertx.core) {
     // Let spring bring jackson in
     exclude(group = "com.fasterxml.jackson")
     exclude(group = "com.fasterxml.jackson.core")
     exclude(group = "com.fasterxml.jackson.datatype")
   }
 
-  implementation(libs.spring.boot.starter)
-
-  // Spring is going to bring jackson in with this
+  implementation(libs.spring.boot)
+  implementation(libs.spring.boot.starter.logging)
+  // In principle kotlin won't need this, but it's needed by the SDK core anyway, so we just import
+  // this in.
   implementation(libs.spring.boot.starter.json)
 
+  testImplementation(libs.spring.boot.starter)
+  testImplementation(libs.spring.boot.starter.json)
   testImplementation(libs.spring.boot.starter.test)
 }
 
 tasks.withType<JavaCompile> { options.compilerArgs.add("-parameters") }
+
+tasks.withType<Javadoc> { isFailOnError = false }