Skip to content

Upgrade to Spring-Boot 4.1 #83

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

Merged
mjd507 merged 1 commit into from
Jun 11, 2026
Merged

Upgrade to Spring-Boot 4.1 #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 4 additions & 28 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import com.google.protobuf.gradle.id

plugins {
java
id("org.springframework.boot") version "4.0.6"
id("org.springframework.boot") version "4.1.0"
id("io.spring.dependency-management") version "1.1.7"
jacoco
id("com.google.protobuf") version "0.9.5"
id("com.google.protobuf") version "0.9.6"
}

group = "com.jiandong"
Expand Down Expand Up @@ -47,8 +45,7 @@ dependencies {
implementation("net.javacrumbs.shedlock:shedlock-provider-jdbc-template")
implementation("org.postgresql:postgresql")
developmentOnly("org.springframework.boot:spring-boot-docker-compose")
implementation("io.grpc:grpc-services")
implementation("org.springframework.grpc:spring-grpc-spring-boot-starter")
implementation("org.springframework.boot:spring-boot-starter-grpc-server")
testImplementation("org.testcontainers:testcontainers-postgresql")
testImplementation("org.testcontainers:testcontainers-activemq")
testImplementation("org.testcontainers:testcontainers-junit-jupiter")
Expand All @@ -63,15 +60,14 @@ dependencies {
testImplementation("org.springframework.boot:spring-boot-starter-websocket-test")
testImplementation("org.springframework.modulith:spring-modulith-starter-test")
testImplementation("com.squareup.okhttp3:mockwebserver3:5.4.0")
testImplementation("org.springframework.grpc:spring-grpc-test")
testImplementation("org.springframework.boot:spring-boot-starter-grpc-client-test")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

dependencyManagement {
imports {
mavenBom("org.springframework.modulith:spring-modulith-bom:2.0.6")
mavenBom("net.javacrumbs.shedlock:shedlock-bom:7.7.0")
mavenBom("org.springframework.grpc:spring-grpc-dependencies:1.0.3")
}
}

Expand All @@ -91,23 +87,3 @@ tasks.jacocoTestReport {
html.required = false
}
}

protobuf {
protoc {
artifact = "com.google.protobuf:protoc"
}
plugins {
id("grpc") {
artifact = "io.grpc:protoc-gen-grpc-java"
}
}
generateProtoTasks {
all().forEach {
it.plugins {
id("grpc") {
option("@generated=omit")
}
}
}
}
}
6 changes: 2 additions & 4 deletions src/test/java/com/jiandong/grpc/GrpcServerServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,18 @@
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration;
import org.springframework.boot.grpc.server.autoconfigure.GrpcServerAutoConfiguration;
import org.springframework.boot.grpc.test.autoconfigure.AutoConfigureInProcessTransport;
import org.springframework.boot.grpc.test.autoconfigure.InProcessTestAutoConfiguration;
import org.springframework.boot.grpc.test.autoconfigure.AutoConfigureTestGrpcTransport;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.grpc.client.ImportGrpcClients;

import static org.assertj.core.api.Assertions.assertThat;

@SpringBootTest(classes = GrpcServerService.class)
@AutoConfigureInProcessTransport
@AutoConfigureTestGrpcTransport
@ImportGrpcClients(basePackageClasses = HelloServiceGrpc.class)
@ImportAutoConfiguration(classes = {
GrpcServerAutoConfiguration.class,
SslAutoConfiguration.class,
InProcessTestAutoConfiguration.class // allow channel to support all target, not just [in-process:]
})
class GrpcServerServiceTest {

Expand Down