Spring/spring-grpc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix plugin mess

Browse Source
This commit is contained in:
Dave Syer
2025-05-28 12:52:19 +01:00
parent d1b8a84637
commit c2a43c2f87
12 changed files with 225 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
samples/grpc-client/build.gradle
View File

@@ -1,59 +1,67 @@
plugins {
id 'java'
id 'org.springframework.boot' version '3.5.0'
id 'io.spring.dependency-management' version '1.1.6'
id 'com.google.protobuf' version '0.9.4'
id 'java'
id 'org.springframework.boot' version '3.5.0'
id 'io.spring.dependency-management' version '1.1.6'
id 'com.google.protobuf' version '0.9.4'
}
group = 'com.example'
version = '0.9.0-SNAPSHOT'
java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
}
repositories {
mavenLocal()
mavenCentral()
maven { url 'https://repo.spring.io/milestone' }
maven { url 'https://repo.spring.io/snapshot' }
mavenLocal()
mavenCentral()
maven { url 'https://repo.spring.io/milestone' }
maven { url 'https://repo.spring.io/snapshot' }
}
dependencyManagement {
imports {
mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.9.0-SNAPSHOT'
}
imports {
mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.9.0-SNAPSHOT'
}
}
dependencies {
implementation 'org.springframework.grpc:spring-grpc-client-spring-boot-starter'
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.0.3'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
implementation 'org.springframework.grpc:spring-grpc-client-spring-boot-starter'
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.0.3'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}
tasks.named('test') {
useJUnitPlatform()
useJUnitPlatform()
}
sourceSets {
main {
proto {
srcDir 'src/main/protobuf'
}
}
}
protobuf {
protoc {
artifact = "com.google.protobuf:protoc:${dependencyManagement.importedProperties['protobuf-java.version']}"
}
plugins {
grpc {
artifact = "io.grpc:protoc-gen-grpc-java:${dependencyManagement.importedProperties['grpc.version']}"
}
}
generateProtoTasks {
all()*.plugins {
grpc {
option 'jakarta_omit'
option '@generated=omit'
}
}
}
protoc {
artifact = "com.google.protobuf:protoc:${dependencyManagement.importedProperties['protobuf-java.version']}"
}
plugins {
grpc {
artifact = "io.grpc:protoc-gen-grpc-java:${dependencyManagement.importedProperties['grpc.version']}"
}
}
generateProtoTasks {
all()*.plugins {
grpc {
option 'jakarta_omit'
option '@generated=omit'
}
}
}
}

94
samples/grpc-oauth2/build.gradle
View File

@@ -1,69 +1,77 @@
plugins {
id 'java'
id 'org.springframework.boot' version '3.5.0'
id 'io.spring.dependency-management' version '1.1.6'
id 'org.graalvm.buildtools.native' version '0.10.3'
id 'com.google.protobuf' version '0.9.4'
id 'java'
id 'org.springframework.boot' version '3.5.0'
id 'io.spring.dependency-management' version '1.1.6'
id 'org.graalvm.buildtools.native' version '0.10.3'
id 'com.google.protobuf' version '0.9.4'
}
group = 'com.example'
version = '0.9.0-SNAPSHOT'
java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
}
processTestAot {
enabled = false
enabled = false
}
repositories {
mavenCentral()
maven { url 'https://repo.spring.io/milestone' }
maven { url 'https://repo.spring.io/snapshot' }
mavenCentral()
maven { url 'https://repo.spring.io/milestone' }
maven { url 'https://repo.spring.io/snapshot' }
}
dependencyManagement {
imports {
mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.9.0-SNAPSHOT'
}
imports {
mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.9.0-SNAPSHOT'
}
}
dependencies {
implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter'
implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'io.grpc:grpc-services'
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.0.4'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter'
implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'io.grpc:grpc-services'
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.0.4'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}
test {
useJUnitPlatform()
testLogging.showStandardStreams = true
outputs.upToDateWhen { false }
useJUnitPlatform()
testLogging.showStandardStreams = true
outputs.upToDateWhen { false }
}
sourceSets {
main {
proto {
srcDir 'src/main/protobuf'
}
}
}
protobuf {
protoc {
artifact = "com.google.protobuf:protoc:${dependencyManagement.importedProperties['protobuf-java.version']}"
}
plugins {
grpc {
artifact = "io.grpc:protoc-gen-grpc-java:${dependencyManagement.importedProperties['grpc.version']}"
}
}
generateProtoTasks {
all()*.plugins {
grpc {
option 'jakarta_omit'
option '@generated=omit'
}
}
}
protoc {
artifact = "com.google.protobuf:protoc:${dependencyManagement.importedProperties['protobuf-java.version']}"
}
plugins {
grpc {
artifact = "io.grpc:protoc-gen-grpc-java:${dependencyManagement.importedProperties['grpc.version']}"
}
}
generateProtoTasks {
all()*.plugins {
grpc {
option 'jakarta_omit'
option '@generated=omit'
}
}
}
}

16
samples/grpc-reactive/build.gradle
View File

@@ -29,7 +29,7 @@ dependencyManagement {
dependencies {
implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter'
implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation 'io.grpc:grpc-services'
compileOnly 'javax.annotation:javax.annotation-api:1.3.2'
implementation 'io.projectreactor:reactor-core'
@@ -42,9 +42,17 @@ dependencies {
}
test {
useJUnitPlatform()
testLogging.showStandardStreams = true
outputs.upToDateWhen { false }
useJUnitPlatform()
testLogging.showStandardStreams = true
outputs.upToDateWhen { false }
}
sourceSets {
main {
proto {
srcDir 'src/main/protobuf'
}
}
}
protobuf {

86
samples/grpc-secure/build.gradle
View File

@@ -1,62 +1,70 @@
plugins {
id 'java'
id 'org.springframework.boot' version '3.5.0'
id 'io.spring.dependency-management' version '1.1.6'
id 'org.graalvm.buildtools.native' version '0.10.3'
id 'com.google.protobuf' version '0.9.4'
id 'java'
id 'org.springframework.boot' version '3.5.0'
id 'io.spring.dependency-management' version '1.1.6'
id 'org.graalvm.buildtools.native' version '0.10.3'
id 'com.google.protobuf' version '0.9.4'
}
group = 'com.example'
version = '0.9.0-SNAPSHOT'
java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
}
repositories {
mavenCentral()
maven { url 'https://repo.spring.io/milestone' }
maven { url 'https://repo.spring.io/snapshot' }
mavenCentral()
maven { url 'https://repo.spring.io/milestone' }
maven { url 'https://repo.spring.io/snapshot' }
}
dependencyManagement {
imports {
mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.9.0-SNAPSHOT'
}
imports {
mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.9.0-SNAPSHOT'
}
}
dependencies {
implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter'
implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'io.grpc:grpc-services'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.grpc:spring-grpc-test'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter'
implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'io.grpc:grpc-services'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.grpc:spring-grpc-test'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}
test {
useJUnitPlatform()
testLogging.showStandardStreams = true
outputs.upToDateWhen { false }
useJUnitPlatform()
testLogging.showStandardStreams = true
outputs.upToDateWhen { false }
}
sourceSets {
main {
proto {
srcDir 'src/main/protobuf'
}
}
}
protobuf {
protoc {
artifact = "com.google.protobuf:protoc:${dependencyManagement.importedProperties['protobuf-java.version']}"
}
plugins {
grpc {
artifact = "io.grpc:protoc-gen-grpc-java:${dependencyManagement.importedProperties['grpc.version']}"
}
}
generateProtoTasks {
all()*.plugins {
grpc {
option 'jakarta_omit'
option '@generated=omit'
}
}
}
protoc {
artifact = "com.google.protobuf:protoc:${dependencyManagement.importedProperties['protobuf-java.version']}"
}
plugins {
grpc {
artifact = "io.grpc:protoc-gen-grpc-java:${dependencyManagement.importedProperties['grpc.version']}"
}
}
generateProtoTasks {
all()*.plugins {
grpc {
option 'jakarta_omit'
option '@generated=omit'
}
}
}
}

7
samples/grpc-server-kotlin/build.gradle
View File

@@ -53,6 +53,13 @@ test {
outputs.upToDateWhen { false }
}
sourceSets {
main {
proto {
srcDir 'src/main/protobuf'
}
}
}
protobuf {
protoc {

14
samples/grpc-server-netty-shaded/build.gradle
View File

@@ -42,9 +42,17 @@ dependencies {
}
test {
useJUnitPlatform()
testLogging.showStandardStreams = true
outputs.upToDateWhen { false }
useJUnitPlatform()
testLogging.showStandardStreams = true
outputs.upToDateWhen { false }
}
sourceSets {
main {
proto {
srcDir 'src/main/protobuf'
}
}
}
protobuf {

16
samples/grpc-server/build.gradle
View File

@@ -29,7 +29,7 @@ dependencyManagement {
dependencies {
implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter'
implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation 'io.grpc:grpc-services'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.grpc:spring-grpc-test'
@@ -38,9 +38,17 @@ dependencies {
}
test {
useJUnitPlatform()
testLogging.showStandardStreams = true
outputs.upToDateWhen { false }
useJUnitPlatform()
testLogging.showStandardStreams = true
outputs.upToDateWhen { false }
}
sourceSets {
main {
proto {
srcDir 'src/main/protobuf'
}
}
}
protobuf {

16
samples/grpc-tomcat-secure/build.gradle
View File

@@ -31,16 +31,24 @@ dependencies {
implementation 'org.springframework.grpc:spring-grpc-server-web-spring-boot-starter'
implementation 'io.grpc:grpc-services'
implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'org.springframework.boot:spring-boot-starter-security'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.grpc:spring-grpc-test'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
}
test {
useJUnitPlatform()
testLogging.showStandardStreams = true
outputs.upToDateWhen { false }
useJUnitPlatform()
testLogging.showStandardStreams = true
outputs.upToDateWhen { false }
}
sourceSets {
main {
proto {
srcDir 'src/main/protobuf'
}
}
}
protobuf {

14
samples/grpc-tomcat/build.gradle
View File

@@ -38,9 +38,17 @@ dependencies {
}
test {
useJUnitPlatform()
testLogging.showStandardStreams = true
outputs.upToDateWhen { false }
useJUnitPlatform()
testLogging.showStandardStreams = true
outputs.upToDateWhen { false }
}
sourceSets {
main {
proto {
srcDir 'src/main/protobuf'
}
}
}
protobuf {

14
samples/grpc-webflux/build.gradle
View File

@@ -37,9 +37,17 @@ dependencies {
}
test {
useJUnitPlatform()
testLogging.showStandardStreams = true
outputs.upToDateWhen { false }
useJUnitPlatform()
testLogging.showStandardStreams = true
outputs.upToDateWhen { false }
}
sourceSets {
main {
proto {
srcDir 'src/main/protobuf'
}
}
}
protobuf {