From e979a13ecf7820a6c99b770866200789db97eeb6 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 20 Dec 2024 14:21:58 +0000 Subject: [PATCH] Add config for new protoc versions --- samples/grpc-server-netty-shaded/build.gradle | 61 ++++++++++--------- samples/grpc-server-netty-shaded/pom.xml | 2 +- samples/grpc-server/build.gradle | 51 ++++++++-------- samples/grpc-server/pom.xml | 2 +- samples/grpc-tomcat/pom.xml | 2 +- 5 files changed, 60 insertions(+), 58 deletions(-) diff --git a/samples/grpc-server-netty-shaded/build.gradle b/samples/grpc-server-netty-shaded/build.gradle index 581b56f..0299615 100644 --- a/samples/grpc-server-netty-shaded/build.gradle +++ b/samples/grpc-server-netty-shaded/build.gradle @@ -1,49 +1,49 @@ plugins { - id 'java' - id 'org.springframework.boot' version '3.4.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.4.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.3.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.3.0-SNAPSHOT' - } + imports { + mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.3.0-SNAPSHOT' + } } dependencies { - implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter' - implementation 'io.grpc:grpc-netty-shaded' - implementation 'io.grpc:grpc-services' - modules { - module("io.grpc:grpc-netty") { - replacedBy("io.grpc:grpc-netty-shaded", "Use Netty shaded instead of regular Netty") - } - } - 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 'io.grpc:grpc-netty-shaded' + implementation 'io.grpc:grpc-services' + modules { + module("io.grpc:grpc-netty") { + replacedBy("io.grpc:grpc-netty-shaded", "Use Netty shaded instead of regular Netty") + } + } + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.grpc:spring-grpc-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } tasks.named('test') { - useJUnitPlatform() + useJUnitPlatform() } protobuf { @@ -58,8 +58,9 @@ protobuf { generateProtoTasks { all()*.plugins { grpc { - option 'jakarta_omit' - } - } + option 'jakarta_omit' + option '@generated=omit' + } + } } } diff --git a/samples/grpc-server-netty-shaded/pom.xml b/samples/grpc-server-netty-shaded/pom.xml index b66b542..216f6fb 100644 --- a/samples/grpc-server-netty-shaded/pom.xml +++ b/samples/grpc-server-netty-shaded/pom.xml @@ -124,7 +124,7 @@ - jakarta_omit + jakarta_omit,@generated=omit com.google.protobuf:protoc:${protobuf-java.version}:exe:${os.detected.classifier} diff --git a/samples/grpc-server/build.gradle b/samples/grpc-server/build.gradle index bc9ff8e..8f84f35 100644 --- a/samples/grpc-server/build.gradle +++ b/samples/grpc-server/build.gradle @@ -1,44 +1,44 @@ plugins { - id 'java' - id 'org.springframework.boot' version '3.4.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.4.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.3.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.3.0-SNAPSHOT' - } + imports { + mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.3.0-SNAPSHOT' + } } dependencies { - implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter' - 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' - testRuntimeOnly "io.netty:netty-transport-native-epoll::linux-x86_64" + implementation 'org.springframework.grpc:spring-grpc-spring-boot-starter' + 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' + testRuntimeOnly "io.netty:netty-transport-native-epoll::linux-x86_64" } tasks.named('test') { - useJUnitPlatform() + useJUnitPlatform() } protobuf { @@ -53,8 +53,9 @@ protobuf { generateProtoTasks { all()*.plugins { grpc { - option 'jakarta_omit' - } - } + option 'jakarta_omit' + option '@generated=omit' + } + } } } diff --git a/samples/grpc-server/pom.xml b/samples/grpc-server/pom.xml index 3d45938..5d4275c 100644 --- a/samples/grpc-server/pom.xml +++ b/samples/grpc-server/pom.xml @@ -131,7 +131,7 @@ - jakarta_omit + jakarta_omit,@generated=omit diff --git a/samples/grpc-tomcat/pom.xml b/samples/grpc-tomcat/pom.xml index 0fbeac4..4b388eb 100644 --- a/samples/grpc-tomcat/pom.xml +++ b/samples/grpc-tomcat/pom.xml @@ -135,7 +135,7 @@ - jakarta_omit + jakarta_omit,@generated=omit com.google.protobuf:protoc:${protobuf-java.version}:exe:${os.detected.classifier}