From 61c16aadd8175462a624c542fc006023d7fcbdbf Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Sat, 5 Apr 2025 10:06:52 +0100 Subject: [PATCH] Revert to snapshots --- README.md | 4 ++-- pom.xml | 2 +- samples/grpc-client/build.gradle | 4 ++-- samples/grpc-client/pom.xml | 4 ++-- .../grpc/sample/DefaultDeadlineSetupTests.java | 8 ++++---- .../grpc/sample/GrpcClientApplicationTests.java | 4 ++-- samples/grpc-oauth2/build.gradle | 4 ++-- samples/grpc-oauth2/pom.xml | 4 ++-- samples/grpc-reactive/build.gradle | 4 ++-- samples/grpc-reactive/pom.xml | 4 ++-- samples/grpc-secure/build.gradle | 4 ++-- samples/grpc-secure/pom.xml | 4 ++-- samples/grpc-server-netty-shaded/build.gradle | 4 ++-- samples/grpc-server-netty-shaded/pom.xml | 4 ++-- samples/grpc-server/build.gradle | 4 ++-- samples/grpc-server/pom.xml | 4 ++-- samples/grpc-tomcat-secure/build.gradle | 4 ++-- samples/grpc-tomcat-secure/pom.xml | 4 ++-- samples/grpc-tomcat/build.gradle | 4 ++-- samples/grpc-tomcat/pom.xml | 4 ++-- samples/grpc-webflux/build.gradle | 4 ++-- samples/grpc-webflux/pom.xml | 4 ++-- samples/pom.xml | 4 ++-- spring-grpc-build-dependencies/pom.xml | 2 +- spring-grpc-client-spring-boot-starter/pom.xml | 2 +- spring-grpc-core/pom.xml | 2 +- spring-grpc-dependencies/pom.xml | 2 +- spring-grpc-docs/pom.xml | 2 +- .../main/antora/modules/ROOT/pages/getting-started.adoc | 4 ++-- spring-grpc-server-spring-boot-starter/pom.xml | 2 +- spring-grpc-server-web-spring-boot-starter/pom.xml | 2 +- spring-grpc-spring-boot-autoconfigure/pom.xml | 2 +- spring-grpc-spring-boot-starter/pom.xml | 2 +- spring-grpc-test/pom.xml | 2 +- 34 files changed, 59 insertions(+), 59 deletions(-) diff --git a/README.md b/README.md index e1efbde..0bc2d94 100644 --- a/README.md +++ b/README.md @@ -201,7 +201,7 @@ If you’re a Maven user, you can use the dependencies by adding the following t org.springframework.grpc spring-grpc-dependencies - 0.6.0-SNAPSHOT + 0.7.0-SNAPSHOT-SNAPSHOT pom import @@ -215,7 +215,7 @@ As shown in the snippet below this can then be followed by version-less declarat ```gradle dependencies { - implementation platform("org.springframework.grpc:spring-grpc-dependencies:0.6.0-SNAPSHOT") + implementation platform("org.springframework.grpc:spring-grpc-dependencies:0.7.0-SNAPSHOT-SNAPSHOT") } ``` diff --git a/pom.xml b/pom.xml index 90b363b..b5a8334 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.grpc spring-grpc - 0.6.0 + 0.7.0-SNAPSHOT pom https://github.com/spring-projects-experimental/spring-grpc diff --git a/samples/grpc-client/build.gradle b/samples/grpc-client/build.gradle index ffdf331..56defcf 100644 --- a/samples/grpc-client/build.gradle +++ b/samples/grpc-client/build.gradle @@ -6,7 +6,7 @@ plugins { } group = 'com.example' -version = '0.6.0' +version = '0.7.0-SNAPSHOT' java { toolchain { @@ -23,7 +23,7 @@ repositories { dependencyManagement { imports { - mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.6.0' + mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.7.0-SNAPSHOT' } } diff --git a/samples/grpc-client/pom.xml b/samples/grpc-client/pom.xml index e665887..a03664e 100644 --- a/samples/grpc-client/pom.xml +++ b/samples/grpc-client/pom.xml @@ -11,7 +11,7 @@ org.springframework.grpc grpc-client-sample - 0.6.0 + 0.7.0-SNAPSHOT Spring gRPC Client Sample Demo project for Spring gRPC @@ -40,7 +40,7 @@ org.springframework.grpc spring-grpc-dependencies - 0.6.0 + 0.7.0-SNAPSHOT pom import diff --git a/samples/grpc-client/src/test/java/org/springframework/grpc/sample/DefaultDeadlineSetupTests.java b/samples/grpc-client/src/test/java/org/springframework/grpc/sample/DefaultDeadlineSetupTests.java index 2b641aa..94208c9 100644 --- a/samples/grpc-client/src/test/java/org/springframework/grpc/sample/DefaultDeadlineSetupTests.java +++ b/samples/grpc-client/src/test/java/org/springframework/grpc/sample/DefaultDeadlineSetupTests.java @@ -35,7 +35,7 @@ public class DefaultDeadlineSetupTests { class Deadline { static boolean serverJarAvailable() { - return new File("../grpc-server/target/grpc-server-sample-0.6.0.jar").exists(); + return new File("../grpc-server/target/grpc-server-sample-0.7.0-SNAPSHOT.jar").exists(); } @Test @@ -52,7 +52,7 @@ public class DefaultDeadlineSetupTests { static CommonsExecWebServerFactoryBean grpcServer() { return CommonsExecWebServerFactoryBean.builder() .classpath(classpath -> classpath - .entries(new MavenClasspathEntry("org.springframework.grpc:grpc-server-sample:0.6.0")) + .entries(new MavenClasspathEntry("org.springframework.grpc:grpc-server-sample:0.7.0-SNAPSHOT")) .files("target/test-classes")); } @@ -83,7 +83,7 @@ public class DefaultDeadlineSetupTests { class WithoutDeadline { static boolean serverJarAvailable() { - return new File("../grpc-server/target/grpc-server-sample-0.6.0.jar").exists(); + return new File("../grpc-server/target/grpc-server-sample-0.7.0-SNAPSHOT.jar").exists(); } @Test @@ -100,7 +100,7 @@ public class DefaultDeadlineSetupTests { static CommonsExecWebServerFactoryBean grpcServer() { return CommonsExecWebServerFactoryBean.builder() .classpath(classpath -> classpath - .entries(new MavenClasspathEntry("org.springframework.grpc:grpc-server-sample:0.6.0")) + .entries(new MavenClasspathEntry("org.springframework.grpc:grpc-server-sample:0.7.0-SNAPSHOT")) .files("target/test-classes")); } diff --git a/samples/grpc-client/src/test/java/org/springframework/grpc/sample/GrpcClientApplicationTests.java b/samples/grpc-client/src/test/java/org/springframework/grpc/sample/GrpcClientApplicationTests.java index 5df5e03..7f92d5d 100644 --- a/samples/grpc-client/src/test/java/org/springframework/grpc/sample/GrpcClientApplicationTests.java +++ b/samples/grpc-client/src/test/java/org/springframework/grpc/sample/GrpcClientApplicationTests.java @@ -26,7 +26,7 @@ public class GrpcClientApplicationTests { } static boolean serverJarAvailable() { - return new File("../grpc-server/target/grpc-server-sample-0.6.0.jar").exists(); + return new File("../grpc-server/target/grpc-server-sample-0.7.0-SNAPSHOT.jar").exists(); } @Test @@ -42,7 +42,7 @@ public class GrpcClientApplicationTests { static CommonsExecWebServerFactoryBean grpcServer() { return CommonsExecWebServerFactoryBean.builder() .classpath(classpath -> classpath - .entries(new MavenClasspathEntry("org.springframework.grpc:grpc-server-sample:0.6.0")) + .entries(new MavenClasspathEntry("org.springframework.grpc:grpc-server-sample:0.7.0-SNAPSHOT")) .files("target/test-classes")); } diff --git a/samples/grpc-oauth2/build.gradle b/samples/grpc-oauth2/build.gradle index e651502..ed548e2 100644 --- a/samples/grpc-oauth2/build.gradle +++ b/samples/grpc-oauth2/build.gradle @@ -7,7 +7,7 @@ plugins { } group = 'com.example' -version = '0.6.0' +version = '0.7.0-SNAPSHOT' java { toolchain { @@ -27,7 +27,7 @@ repositories { dependencyManagement { imports { - mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.6.0' + mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.7.0-SNAPSHOT' } } diff --git a/samples/grpc-oauth2/pom.xml b/samples/grpc-oauth2/pom.xml index bfcb382..6cfc766 100644 --- a/samples/grpc-oauth2/pom.xml +++ b/samples/grpc-oauth2/pom.xml @@ -11,7 +11,7 @@ org.springframework.grpc grpc-oauth2-sample - 0.6.0 + 0.7.0-SNAPSHOT Spring gRPC OAuth2 Server Sample Demo project for Spring gRPC @@ -38,7 +38,7 @@ org.springframework.grpc spring-grpc-dependencies - 0.6.0 + 0.7.0-SNAPSHOT pom import diff --git a/samples/grpc-reactive/build.gradle b/samples/grpc-reactive/build.gradle index e133cf9..e9da444 100644 --- a/samples/grpc-reactive/build.gradle +++ b/samples/grpc-reactive/build.gradle @@ -7,7 +7,7 @@ plugins { } group = 'com.example' -version = '0.6.0' +version = '0.7.0-SNAPSHOT' java { toolchain { @@ -23,7 +23,7 @@ repositories { dependencyManagement { imports { - mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.6.0' + mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.7.0-SNAPSHOT' } } diff --git a/samples/grpc-reactive/pom.xml b/samples/grpc-reactive/pom.xml index 601c229..a3d14ec 100644 --- a/samples/grpc-reactive/pom.xml +++ b/samples/grpc-reactive/pom.xml @@ -11,7 +11,7 @@ org.springframework.grpc grpc-reactive-sample - 0.6.0 + 0.7.0-SNAPSHOT Spring gRPC Reactive Sample Demo project for Spring gRPC @@ -38,7 +38,7 @@ org.springframework.grpc spring-grpc-dependencies - 0.6.0 + 0.7.0-SNAPSHOT pom import diff --git a/samples/grpc-secure/build.gradle b/samples/grpc-secure/build.gradle index 6a59833..d3ac982 100644 --- a/samples/grpc-secure/build.gradle +++ b/samples/grpc-secure/build.gradle @@ -7,7 +7,7 @@ plugins { } group = 'com.example' -version = '0.6.0' +version = '0.7.0-SNAPSHOT' java { toolchain { @@ -23,7 +23,7 @@ repositories { dependencyManagement { imports { - mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.6.0' + mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.7.0-SNAPSHOT' } } diff --git a/samples/grpc-secure/pom.xml b/samples/grpc-secure/pom.xml index a5898b8..cf3b589 100644 --- a/samples/grpc-secure/pom.xml +++ b/samples/grpc-secure/pom.xml @@ -11,7 +11,7 @@ org.springframework.grpc grpc-secure-sample - 0.6.0 + 0.7.0-SNAPSHOT Spring gRPC Secure Sample Demo project for Spring gRPC @@ -38,7 +38,7 @@ org.springframework.grpc spring-grpc-dependencies - 0.6.0 + 0.7.0-SNAPSHOT pom import diff --git a/samples/grpc-server-netty-shaded/build.gradle b/samples/grpc-server-netty-shaded/build.gradle index cbf2abc..5d842ad 100644 --- a/samples/grpc-server-netty-shaded/build.gradle +++ b/samples/grpc-server-netty-shaded/build.gradle @@ -7,7 +7,7 @@ plugins { } group = 'com.example' -version = '0.6.0' +version = '0.7.0-SNAPSHOT' java { toolchain { @@ -23,7 +23,7 @@ repositories { dependencyManagement { imports { - mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.6.0' + mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.7.0-SNAPSHOT' } } diff --git a/samples/grpc-server-netty-shaded/pom.xml b/samples/grpc-server-netty-shaded/pom.xml index 60d7afa..b375ad4 100644 --- a/samples/grpc-server-netty-shaded/pom.xml +++ b/samples/grpc-server-netty-shaded/pom.xml @@ -11,7 +11,7 @@ com.example grpc-server-netty-shaded - 0.6.0 + 0.7.0-SNAPSHOT Spring gRPC Server Sample Netty Shaded Demo project for Spring Boot @@ -25,7 +25,7 @@ org.springframework.grpc spring-grpc-dependencies - 0.6.0 + 0.7.0-SNAPSHOT pom import diff --git a/samples/grpc-server/build.gradle b/samples/grpc-server/build.gradle index 76b80be..093b9aa 100644 --- a/samples/grpc-server/build.gradle +++ b/samples/grpc-server/build.gradle @@ -7,7 +7,7 @@ plugins { } group = 'com.example' -version = '0.6.0' +version = '0.7.0-SNAPSHOT' java { toolchain { @@ -23,7 +23,7 @@ repositories { dependencyManagement { imports { - mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.6.0' + mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.7.0-SNAPSHOT' } } diff --git a/samples/grpc-server/pom.xml b/samples/grpc-server/pom.xml index ec04b4d..be8b6c6 100644 --- a/samples/grpc-server/pom.xml +++ b/samples/grpc-server/pom.xml @@ -11,7 +11,7 @@ org.springframework.grpc grpc-server-sample - 0.6.0 + 0.7.0-SNAPSHOT Spring gRPC Server Sample Demo project for Spring gRPC @@ -38,7 +38,7 @@ org.springframework.grpc spring-grpc-dependencies - 0.6.0 + 0.7.0-SNAPSHOT pom import diff --git a/samples/grpc-tomcat-secure/build.gradle b/samples/grpc-tomcat-secure/build.gradle index 26d97c3..835d53f 100644 --- a/samples/grpc-tomcat-secure/build.gradle +++ b/samples/grpc-tomcat-secure/build.gradle @@ -7,7 +7,7 @@ plugins { } group = 'com.example' -version = '0.6.0' +version = '0.7.0-SNAPSHOT' java { toolchain { @@ -23,7 +23,7 @@ repositories { dependencyManagement { imports { - mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.6.0' + mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.7.0-SNAPSHOT' } } diff --git a/samples/grpc-tomcat-secure/pom.xml b/samples/grpc-tomcat-secure/pom.xml index d52fb22..d81723c 100644 --- a/samples/grpc-tomcat-secure/pom.xml +++ b/samples/grpc-tomcat-secure/pom.xml @@ -11,7 +11,7 @@ org.springframework.grpc grpc-tomcat-secure-sample - 0.6.0 + 0.7.0-SNAPSHOT Spring gRPC Tomcat Secure Sample Demo project for Spring gRPC @@ -38,7 +38,7 @@ org.springframework.grpc spring-grpc-dependencies - 0.6.0 + 0.7.0-SNAPSHOT pom import diff --git a/samples/grpc-tomcat/build.gradle b/samples/grpc-tomcat/build.gradle index 872a1f5..af7cdef 100644 --- a/samples/grpc-tomcat/build.gradle +++ b/samples/grpc-tomcat/build.gradle @@ -7,7 +7,7 @@ plugins { } group = 'com.example' -version = '0.6.0' +version = '0.7.0-SNAPSHOT' java { toolchain { @@ -23,7 +23,7 @@ repositories { dependencyManagement { imports { - mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.6.0' + mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.7.0-SNAPSHOT' } } diff --git a/samples/grpc-tomcat/pom.xml b/samples/grpc-tomcat/pom.xml index 5725556..485efb6 100644 --- a/samples/grpc-tomcat/pom.xml +++ b/samples/grpc-tomcat/pom.xml @@ -11,7 +11,7 @@ org.springframework.grpc grpc-tomcat-sample - 0.6.0 + 0.7.0-SNAPSHOT Spring gRPC Tomcat Sample Demo project for Spring gRPC @@ -38,7 +38,7 @@ org.springframework.grpc spring-grpc-dependencies - 0.6.0 + 0.7.0-SNAPSHOT pom import diff --git a/samples/grpc-webflux/build.gradle b/samples/grpc-webflux/build.gradle index 5229318..2f5a6d7 100644 --- a/samples/grpc-webflux/build.gradle +++ b/samples/grpc-webflux/build.gradle @@ -7,7 +7,7 @@ plugins { } group = 'com.example' -version = '0.6.0' +version = '0.7.0-SNAPSHOT' java { toolchain { @@ -23,7 +23,7 @@ repositories { dependencyManagement { imports { - mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.6.0' + mavenBom 'org.springframework.grpc:spring-grpc-dependencies:0.7.0-SNAPSHOT' } } diff --git a/samples/grpc-webflux/pom.xml b/samples/grpc-webflux/pom.xml index 1295dfb..72d4731 100644 --- a/samples/grpc-webflux/pom.xml +++ b/samples/grpc-webflux/pom.xml @@ -11,7 +11,7 @@ org.springframework.grpc grpc-webflux-sample - 0.6.0 + 0.7.0-SNAPSHOT Spring gRPC Webflux Sample Demo project for Spring gRPC @@ -38,7 +38,7 @@ org.springframework.grpc spring-grpc-dependencies - 0.6.0 + 0.7.0-SNAPSHOT pom import diff --git a/samples/pom.xml b/samples/pom.xml index 6ab546e..dfaba01 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -6,12 +6,12 @@ org.springframework.grpc spring-grpc - 0.6.0 + 0.7.0-SNAPSHOT org.springframework.grpc parent-samples - 0.6.0 + 0.7.0-SNAPSHOT pom Parent Demo diff --git a/spring-grpc-build-dependencies/pom.xml b/spring-grpc-build-dependencies/pom.xml index 03a43c2..ead93f0 100644 --- a/spring-grpc-build-dependencies/pom.xml +++ b/spring-grpc-build-dependencies/pom.xml @@ -6,7 +6,7 @@ org.springframework.grpc spring-grpc-build-dependencies - 0.6.0 + 0.7.0-SNAPSHOT pom Spring gRPC build dependencies diff --git a/spring-grpc-client-spring-boot-starter/pom.xml b/spring-grpc-client-spring-boot-starter/pom.xml index 941cc03..3fc7c12 100644 --- a/spring-grpc-client-spring-boot-starter/pom.xml +++ b/spring-grpc-client-spring-boot-starter/pom.xml @@ -6,7 +6,7 @@ org.springframework.grpc spring-grpc - 0.6.0 + 0.7.0-SNAPSHOT spring-grpc-client-spring-boot-starter jar diff --git a/spring-grpc-core/pom.xml b/spring-grpc-core/pom.xml index 416b0b9..cfaf222 100644 --- a/spring-grpc-core/pom.xml +++ b/spring-grpc-core/pom.xml @@ -6,7 +6,7 @@ org.springframework.grpc spring-grpc - 0.6.0 + 0.7.0-SNAPSHOT spring-grpc-core jar diff --git a/spring-grpc-dependencies/pom.xml b/spring-grpc-dependencies/pom.xml index c7145cf..5fa02ae 100644 --- a/spring-grpc-dependencies/pom.xml +++ b/spring-grpc-dependencies/pom.xml @@ -6,7 +6,7 @@ org.springframework.grpc spring-grpc-dependencies - 0.6.0 + 0.7.0-SNAPSHOT pom Spring gRPC (Bill of Materials) diff --git a/spring-grpc-docs/pom.xml b/spring-grpc-docs/pom.xml index 480c26f..bd3e101 100644 --- a/spring-grpc-docs/pom.xml +++ b/spring-grpc-docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.grpc spring-grpc - 0.6.0 + 0.7.0-SNAPSHOT spring-grpc-docs Spring gRPC Docs diff --git a/spring-grpc-docs/src/main/antora/modules/ROOT/pages/getting-started.adoc b/spring-grpc-docs/src/main/antora/modules/ROOT/pages/getting-started.adoc index d35db46..8c23454 100644 --- a/spring-grpc-docs/src/main/antora/modules/ROOT/pages/getting-started.adoc +++ b/spring-grpc-docs/src/main/antora/modules/ROOT/pages/getting-started.adoc @@ -206,7 +206,7 @@ If you’re a Maven user, you can use the dependencies by adding the following t org.springframework.grpc spring-grpc-dependencies - 0.6.0-SNAPSHOT + 0.7.0-SNAPSHOT-SNAPSHOT pom import @@ -221,7 +221,7 @@ As shown in the snippet below this can then be followed by version-less declarat [source,gradle] ---- dependencies { - implementation platform("org.springframework.grpc:spring-grpc-dependencies:0.6.0-SNAPSHOT") + implementation platform("org.springframework.grpc:spring-grpc-dependencies:0.7.0-SNAPSHOT-SNAPSHOT") } ---- diff --git a/spring-grpc-server-spring-boot-starter/pom.xml b/spring-grpc-server-spring-boot-starter/pom.xml index 0b890a1..9cbd53e 100644 --- a/spring-grpc-server-spring-boot-starter/pom.xml +++ b/spring-grpc-server-spring-boot-starter/pom.xml @@ -6,7 +6,7 @@ org.springframework.grpc spring-grpc - 0.6.0 + 0.7.0-SNAPSHOT spring-grpc-server-spring-boot-starter jar diff --git a/spring-grpc-server-web-spring-boot-starter/pom.xml b/spring-grpc-server-web-spring-boot-starter/pom.xml index c63e4e9..dd3aec3 100644 --- a/spring-grpc-server-web-spring-boot-starter/pom.xml +++ b/spring-grpc-server-web-spring-boot-starter/pom.xml @@ -6,7 +6,7 @@ org.springframework.grpc spring-grpc - 0.6.0 + 0.7.0-SNAPSHOT spring-grpc-server-web-spring-boot-starter jar diff --git a/spring-grpc-spring-boot-autoconfigure/pom.xml b/spring-grpc-spring-boot-autoconfigure/pom.xml index d10f634..cb5440c 100644 --- a/spring-grpc-spring-boot-autoconfigure/pom.xml +++ b/spring-grpc-spring-boot-autoconfigure/pom.xml @@ -6,7 +6,7 @@ org.springframework.grpc spring-grpc - 0.6.0 + 0.7.0-SNAPSHOT spring-grpc-spring-boot-autoconfigure jar diff --git a/spring-grpc-spring-boot-starter/pom.xml b/spring-grpc-spring-boot-starter/pom.xml index 4493f8f..a367448 100644 --- a/spring-grpc-spring-boot-starter/pom.xml +++ b/spring-grpc-spring-boot-starter/pom.xml @@ -6,7 +6,7 @@ org.springframework.grpc spring-grpc - 0.6.0 + 0.7.0-SNAPSHOT spring-grpc-spring-boot-starter jar diff --git a/spring-grpc-test/pom.xml b/spring-grpc-test/pom.xml index 1362235..1864014 100644 --- a/spring-grpc-test/pom.xml +++ b/spring-grpc-test/pom.xml @@ -6,7 +6,7 @@ org.springframework.grpc spring-grpc - 0.6.0 + 0.7.0-SNAPSHOT spring-grpc-test Spring gRPC Test