Skip to content

Update Spring grpc to 1.1.0-SNAPSHOT #381

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
artembilan merged 4 commits into from
Mar 24, 2026
Merged

Update Spring grpc to 1.1.0-SNAPSHOT #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a7ea42
Update Spring grpc to 1.1.0-SNAPSHOT
cppwfs Mar 20, 2026
d3119f6
Update based on code review
cppwfs Mar 23, 2026
90b91ba
Remove unused version from build.gradle
cppwfs Mar 23, 2026
64442d2
Merge grpServerAddress param def into single line
cppwfs Mar 23, 2026
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
126 changes: 54 additions & 72 deletions basic/grpc-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,62 @@
<system>GitHub</system>
<url>https://github.com/spring-projects/spring-integration-samples/issues</url>
</issueManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-integration</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-grpc-client</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-grpc</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.21.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-grpc-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.grpc</groupId>
<artifactId>spring-grpc-dependencies</artifactId>
<version>1.0.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-jdbc</artifactId>
Expand Down Expand Up @@ -328,71 +375,6 @@
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-integration</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework.grpc</groupId>
<artifactId>spring-grpc-client-spring-boot-starter</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-grpc</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>4.29.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.21.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.grpc</groupId>
<artifactId>spring-grpc-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>
<properties>
<java.version>17</java.version>
</properties>
Expand Down
6 changes: 4 additions & 2 deletions ...ain/java/org/springframework/integration/samples/grpc/client/GrpcClientConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationRunner;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand All @@ -47,8 +48,9 @@ public class GrpcClientConfiguration {
private static final Log LOGGER = LogFactory.getLog(GrpcClientConfiguration.class);

@Bean
ManagedChannel managedChannel(GrpcChannelFactory factory) {
return factory.createChannel("spring-integration");
ManagedChannel managedChannel(GrpcChannelFactory factory,
@Value("${spring.grpc.client.channels.spring-integration.address}") String grpcServerAddress) {
return factory.createChannel(grpcServerAddress);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions ...nt/src/test/java/org/springframework/integration/samples/grpc/client/GrpcClientTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
* @author Glenn Renfro
*/
@SpringBootTest(properties = {
"spring.grpc.test.inprocess.enabled=true",
"spring.grpc.test.inprocess.exclusive=true"
"spring.grpc.server.inprocess.name=test",
"spring.grpc.client.channels.spring-integration.address=in-process:test"
})
@DirtiesContext
@ExtendWith(OutputCaptureExtension.class)
Expand Down
9 changes: 2 additions & 7 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,6 @@ subprojects { subproject ->
protobufVersion = '4.29.4'
slf4jVersion = '2.0.17'
springCloudVersion = '2025.1.0'
springGrpc = '1.0.2'
springIntegrationVersion = '7.1.0-SNAPSHOT'
set('spring-integration.version', "$springIntegrationVersion")
springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT'
Expand Down Expand Up @@ -887,16 +886,12 @@ project('grpc-client') {
apply plugin: 'com.google.protobuf'

dependencies {
implementation platform("org.springframework.grpc:spring-grpc-dependencies:$springGrpc")
implementation 'org.springframework.boot:spring-boot-starter-integration'
implementation "org.springframework.grpc:spring-grpc-client-spring-boot-starter"
implementation "org.springframework.boot:spring-boot-starter-grpc-client"
implementation 'org.springframework.integration:spring-integration-grpc'

implementation("com.google.protobuf:protobuf-java:$protobufVersion")

//Test
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation "org.springframework.grpc:spring-grpc-test"
testImplementation "org.springframework.boot:spring-boot-starter-grpc-test"

configurations {
testRuntimeOnly.exclude group: 'io.grpc', module: 'grpc-netty'
Expand Down
Loading