Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<module>spring-grpc-server-spring-boot-starter</module>
<module>spring-grpc-server-web-spring-boot-starter</module>
<module>spring-grpc-spring-boot-starter</module>
<module>spring-grpc-test</module>
<module>spring-grpc-test-spring-boot-autoconfigure</module>
</modules>

Expand Down
4 changes: 1 addition & 3 deletions samples/grpc-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,9 @@ dependencyManagement {
dependencies {
implementation 'org.springframework.grpc:spring-grpc-client-spring-boot-starter'

testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.grpc:spring-grpc-test'
testImplementation 'org.springframework.boot:spring-boot-web-server'
testImplementation 'org.springframework.experimental.boot:spring-boot-testjars-maven:0.4.0.0-RC1'
testImplementation 'io.grpc:grpc-inprocess'

testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}
Expand Down
12 changes: 1 addition & 11 deletions samples/grpc-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,7 @@

<dependency>
<groupId>org.springframework.grpc</groupId>
<artifactId>spring-grpc-test-spring-boot-autoconfigure</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<artifactId>spring-grpc-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -74,11 +69,6 @@
<version>0.4.0.0-RC1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-inprocess</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
3 changes: 1 addition & 2 deletions samples/grpc-oauth2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ dependencies {
implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter'
implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'

testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.grpc:spring-grpc-test'
testImplementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
testImplementation 'org.springframework.experimental.boot:spring-boot-testjars-maven:0.4.0.0-RC1'

Expand Down
7 changes: 1 addition & 6 deletions samples/grpc-oauth2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,7 @@

<dependency>
<groupId>org.springframework.grpc</groupId>
<artifactId>spring-grpc-test-spring-boot-autoconfigure</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<artifactId>spring-grpc-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 1 addition & 3 deletions samples/grpc-reactive/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ dependencies {

compileOnly 'javax.annotation:javax.annotation-api:1.3.2'

testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'io.grpc:grpc-inprocess'
testImplementation 'org.springframework.grpc:spring-grpc-test'
testImplementation 'io.projectreactor:reactor-test'

testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
Expand Down
12 changes: 1 addition & 11 deletions samples/grpc-reactive/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,7 @@

<dependency>
<groupId>org.springframework.grpc</groupId>
<artifactId>spring-grpc-test-spring-boot-autoconfigure</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-inprocess</artifactId>
<artifactId>spring-grpc-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
3 changes: 1 addition & 2 deletions samples/grpc-secure/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ dependencies {
implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter'
implementation 'org.springframework.boot:spring-boot-starter-security'

testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.grpc:spring-grpc-test'

testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}
Expand Down
7 changes: 1 addition & 6 deletions samples/grpc-secure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,7 @@

<dependency>
<groupId>org.springframework.grpc</groupId>
<artifactId>spring-grpc-test-spring-boot-autoconfigure</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<artifactId>spring-grpc-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
3 changes: 1 addition & 2 deletions samples/grpc-server-kotlin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ dependencies {
implementation "io.grpc:grpc-kotlin-stub:${kotlinStubVersion}"
implementation("io.micrometer:context-propagation")

testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.grpc:spring-grpc-test'

testRuntimeOnly "io.netty:netty-transport-native-epoll::linux-x86_64"
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
Expand Down
7 changes: 1 addition & 6 deletions samples/grpc-server-kotlin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,7 @@

<dependency>
<groupId>org.springframework.grpc</groupId>
<artifactId>spring-grpc-test-spring-boot-autoconfigure</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<artifactId>spring-grpc-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
3 changes: 1 addition & 2 deletions samples/grpc-server-netty-shaded/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ dependencies {
}
}

testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.grpc:spring-grpc-test'

testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}
Expand Down
7 changes: 1 addition & 6 deletions samples/grpc-server-netty-shaded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,7 @@

<dependency>
<groupId>org.springframework.grpc</groupId>
<artifactId>spring-grpc-test-spring-boot-autoconfigure</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<artifactId>spring-grpc-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 1 addition & 3 deletions samples/grpc-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ dependencies {
implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter'
implementation 'org.springframework.boot:spring-boot-starter-actuator'

testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'io.grpc:grpc-inprocess'
testImplementation 'org.springframework.grpc:spring-grpc-test'

testRuntimeOnly "io.netty:netty-transport-native-epoll::linux-x86_64"
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
Expand Down
12 changes: 1 addition & 11 deletions samples/grpc-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,7 @@

<dependency>
<groupId>org.springframework.grpc</groupId>
<artifactId>spring-grpc-test-spring-boot-autoconfigure</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-inprocess</artifactId>
<artifactId>spring-grpc-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
3 changes: 1 addition & 2 deletions samples/grpc-tomcat-secure/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ dependencies {
implementation 'org.springframework.grpc:spring-grpc-server-web-spring-boot-starter'
implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'

testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.grpc:spring-grpc-test'

testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}
Expand Down
7 changes: 1 addition & 6 deletions samples/grpc-tomcat-secure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,7 @@

<dependency>
<groupId>org.springframework.grpc</groupId>
<artifactId>spring-grpc-test-spring-boot-autoconfigure</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<artifactId>spring-grpc-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
3 changes: 1 addition & 2 deletions samples/grpc-tomcat/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation 'io.micrometer:micrometer-tracing-bridge-otel'

testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.grpc:spring-grpc-test'

testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}
Expand Down
7 changes: 1 addition & 6 deletions samples/grpc-tomcat/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,7 @@

<dependency>
<groupId>org.springframework.grpc</groupId>
<artifactId>spring-grpc-test-spring-boot-autoconfigure</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<artifactId>spring-grpc-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
3 changes: 1 addition & 2 deletions samples/grpc-webflux-secure/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'

testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.grpc:spring-grpc-test'
testImplementation 'org.springframework.experimental.boot:spring-boot-testjars-maven:0.4.0.0-RC1'

testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
Expand Down
7 changes: 1 addition & 6 deletions samples/grpc-webflux-secure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,7 @@

<dependency>
<groupId>org.springframework.grpc</groupId>
<artifactId>spring-grpc-test-spring-boot-autoconfigure</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<artifactId>spring-grpc-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
3 changes: 1 addition & 2 deletions samples/grpc-webflux/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ dependencies {
implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter'
implementation 'org.springframework.boot:spring-boot-starter-webflux'

testImplementation 'org.springframework.grpc:spring-grpc-test-spring-boot-autoconfigure'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.grpc:spring-grpc-test'

testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}
Expand Down
7 changes: 1 addition & 6 deletions samples/grpc-webflux/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,7 @@

<dependency>
<groupId>org.springframework.grpc</groupId>
<artifactId>spring-grpc-test-spring-boot-autoconfigure</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<artifactId>spring-grpc-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
7 changes: 0 additions & 7 deletions spring-grpc-client-spring-boot-autoconfigure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,6 @@
<packaging>jar</packaging>
<name>Spring gRPC Client Auto Configuration</name>
<description>Spring gRPC Client Auto Configuration</description>
<url>https://github.com/spring-projects/spring-grpc</url>

<scm>
<url>https://github.com/spring-projects/spring-grpc</url>
<connection>git://github.com/spring-projects/spring-grpc.git</connection>
<developerConnection>[email protected]:spring-projects/spring-grpc.git</developerConnection>
</scm>

<dependencyManagement>
<dependencies>
Expand Down
9 changes: 0 additions & 9 deletions spring-grpc-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,6 @@
<packaging>jar</packaging>
<name>Spring gRPC Core</name>
<description>Core module for gRPC programming</description>
<url>https://github.com/spring-projects/spring-grpc</url>

<scm>
<url>https://github.com/spring-projects/spring-grpc</url>
<connection>git://github.com/spring-projects/spring-grpc.git
</connection>
<developerConnection>[email protected]:spring-projects/spring-grpc.git
</developerConnection>
</scm>

<dependencies>
<dependency>
Expand Down
5 changes: 5 additions & 0 deletions spring-grpc-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@
<artifactId>spring-grpc-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.grpc</groupId>
<artifactId>spring-grpc-test</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.grpc</groupId>
<artifactId>spring-grpc-test-spring-boot-autoconfigure</artifactId>
Expand Down
7 changes: 0 additions & 7 deletions spring-grpc-server-spring-boot-autoconfigure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,6 @@
<packaging>jar</packaging>
<name>Spring gRPC Server Auto Configuration</name>
<description>Spring gRPC Server Auto Configuration</description>
<url>https://github.com/spring-projects/spring-grpc</url>

<scm>
<url>https://github.com/spring-projects/spring-grpc</url>
<connection>git://github.com/spring-projects/spring-grpc.git</connection>
<developerConnection>[email protected]:spring-projects/spring-grpc.git</developerConnection>
</scm>

<dependencyManagement>
<dependencies>
Expand Down
7 changes: 0 additions & 7 deletions spring-grpc-spring-boot-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,6 @@
<packaging>jar</packaging>
<name>Spring gRPC Client and Server (Netty) Spring Boot Starter</name>
<description>Spring gRPC Client and Server (Netty) Spring Boot Starter</description>
<url>https://github.com/spring-projects/spring-grpc</url>

<scm>
<url>https://github.com/spring-projects/spring-grpc</url>
<connection>git://github.com/spring-projects/spring-grpc.git</connection>
<developerConnection>[email protected]:spring-projects/spring-grpc.git</developerConnection>
</scm>

<dependencies>
<dependency>
Expand Down
8 changes: 0 additions & 8 deletions spring-grpc-test-spring-boot-autoconfigure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,6 @@
<packaging>jar</packaging>
<name>Spring gRPC Test Auto Configuration</name>
<description>Spring gRPC Test Auto Configuration</description>
<url>https://github.com/spring-projects/spring-grpc</url>

<scm>
<url>https://github.com/spring-projects/spring-grpc</url>
<connection>git://github.com/spring-projects/spring-grpc.git</connection>
<developerConnection>[email protected]:spring-projects/spring-grpc.git
</developerConnection>
</scm>

<dependencyManagement>
<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
@Documented
@Inherited
@ImportAutoConfiguration
@PropertyMapping("spring.test.grpc.inprocess")
@PropertyMapping("spring.grpc.test.inprocess")
public @interface AutoConfigureInProcessTransport {

/**
Expand Down
Loading