This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch 3.3 in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit 992abd2d342c520df842375dc75391ade799dee0 Merge: 9d9df82194 0724e94da7 Author: Albumen Kevin <[email protected]> AuthorDate: Fri May 5 13:07:25 2023 +0800 Merge branch 'apache-3.2' into apache-3.3 # Conflicts: # dubbo-config/dubbo-config-api/pom.xml # dubbo-distribution/dubbo-all/pom.xml # dubbo-metrics/dubbo-metrics-default/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metrics.collector.MetricsCollector # pom.xml .artifacts | 5 + .licenserc.yaml | 1 + .../filter/support/MetricsClusterFilter.java | 21 +- .../cluster/support/AbstractClusterInvoker.java | 2 + .../cluster/support/BroadcastClusterInvoker.java | 1 - .../cluster/support/FailbackClusterInvoker.java | 1 - .../cluster/support/FailfastClusterInvoker.java | 1 - .../cluster/support/FailoverClusterInvoker.java | 1 - .../cluster/support/FailsafeClusterInvoker.java | 1 - .../rpc/cluster/support/ForkingClusterInvoker.java | 1 - .../cluster/support/MergeableClusterInvoker.java | 1 - .../support/AvailableClusterInvokerTest.java | 2 +- .../support/FailSafeClusterInvokerTest.java | 15 +- .../support/FailbackClusterInvokerTest.java | 26 +- .../registry/ZoneAwareClusterInvokerTest.java | 2 + .../dubbo/common/constants/CommonConstants.java | 7 + .../dubbo/common/constants/QosConstants.java | 2 + .../org/apache/dubbo/common/lang/Nullable.java | 11 +- .../apache/dubbo/common/utils/ReflectionUtils.java | 150 +++++++++ .../dubbo/config/AbstractInterfaceConfig.java | 16 +- .../org/apache/dubbo/config/ApplicationConfig.java | 15 + .../java/org/apache/dubbo/config/Constants.java | 2 + .../org/apache/dubbo/config/ProtocolConfig.java | 4 +- .../org/apache/dubbo/config/ServiceConfigBase.java | 32 +- .../org/apache/dubbo/config/TracingConfig.java | 16 + .../apache/dubbo/config/nested/ExporterConfig.java | 79 +++++ .../main/java/org/apache/dubbo/rpc/model/Pack.java | 16 +- .../org/apache/dubbo/rpc/model/PackableMethod.java | 45 +-- .../dubbo/rpc/model/PackableMethodFactory.java | 16 +- .../org/apache/dubbo/rpc/model/ProviderModel.java | 10 + .../java/org/apache/dubbo/rpc/model/UnPack.java | 16 +- .../org/apache/dubbo/rpc/model/WrapperUnPack.java | 13 +- .../alibaba/dubbo/config/ApplicationConfig.java | 13 + .../com/alibaba/dubbo/config/ConsumerConfig.java | 28 ++ .../com/alibaba/dubbo/config/MethodConfig.java | 10 + .../com/alibaba/dubbo/config/ModuleConfig.java | 13 + .../com/alibaba/dubbo/config/ProtocolConfig.java | 6 + .../com/alibaba/dubbo/config/ProviderConfig.java | 36 +++ .../com/alibaba/dubbo/config/ReferenceConfig.java | 34 ++ .../com/alibaba/dubbo/config/ServiceConfig.java | 96 ++++++ .../main/java/com/alibaba/dubbo/rpc/Exporter.java | 7 + .../org/apache/dubbo/config/ModuleConfigTest.java | 1 + .../org/apache/dubbo/config/SignatureTest.java | 67 ++++ .../com.alibaba.dubbo.config.ApplicationConfig | 60 ++++ .../com.alibaba.dubbo.config.ArgumentConfig | 29 ++ .../com.alibaba.dubbo.config.ConsumerConfig | 123 +++++++ .../com.alibaba.dubbo.config.MethodConfig | 81 +++++ .../com.alibaba.dubbo.config.ModuleConfig | 42 +++ .../com.alibaba.dubbo.config.MonitorConfig | 43 +++ .../com.alibaba.dubbo.config.ProtocolConfig | 92 ++++++ .../com.alibaba.dubbo.config.ProviderConfig | 176 ++++++++++ .../com.alibaba.dubbo.config.ReferenceConfig | 130 ++++++++ .../com.alibaba.dubbo.config.RegistryConfig | 69 ++++ .../com.alibaba.dubbo.config.ServiceConfig | 150 +++++++++ dubbo-config/dubbo-config-api/pom.xml | 6 + .../org/apache/dubbo/config/DubboShutdownHook.java | 16 +- .../org/apache/dubbo/config/ServiceConfig.java | 55 ++++ .../config/deploy/DefaultApplicationDeployer.java | 49 ++- .../dubbo/config/deploy/DefaultModuleDeployer.java | 32 +- dubbo-config/dubbo-config-spring/pom.xml | 2 +- .../spring/reference/ReferenceBeanSupport.java | 4 +- .../spring/schema/DubboBeanDefinitionParser.java | 5 +- .../src/main/resources/META-INF/dubbo.xsd | 48 +++ .../config/spring/ControllerServiceConfigTest.java | 42 +++ .../config/spring/api/SpringControllerService.java | 16 +- .../registryNA/consumer/DubboXmlConsumerTest.java | 25 +- .../registryNA/consumer/dubbo-consumer.xml | 33 ++ .../consumer/dubbo-registryNA-consumer.xml | 33 ++ .../registryNA/provider/DubboXmlProviderTest.java | 51 +++ .../registryNA/provider/dubbo-provider.xml | 39 +++ .../dubbo-configcenter-apollo/pom.xml | 5 + .../support/apollo/ApolloDynamicConfiguration.java | 26 +- .../dubbo-configcenter-nacos/pom.xml | 5 + .../support/nacos/NacosDynamicConfiguration.java | 36 +-- .../dubbo-configcenter-zookeeper/pom.xml | 5 + .../support/zookeeper/ZookeeperDataListener.java | 10 +- dubbo-demo/dubbo-demo-annotation/pom.xml | 2 +- dubbo-demo/dubbo-demo-api/pom.xml | 2 +- dubbo-demo/dubbo-demo-interface/pom.xml | 7 +- .../apache/dubbo/demo/rest/api/CurlService.java | 23 +- .../rest/api/DubboServiceAnnotationService.java | 19 +- .../demo/rest/api/ExceptionMapperService.java | 18 +- .../dubbo/demo/rest/api/HttpMethodService.java | 71 ++++ .../HttpRequestAndResponseRPCContextService.java | 44 +-- .../dubbo/demo/rest/api/JaxRsRestDemoService.java | 120 +++++++ .../dubbo/demo/rest/api/SpringRestDemoService.java | 79 +++++ .../src/main/java/po/User.java | 78 +++++ .../dubbo-demo-native-consumer/pom.xml | 2 +- .../dubbo-demo-native-provider/pom.xml | 2 +- .../dubbo-demo-spring-boot-consumer/pom.xml | 4 +- .../dubbo-demo-spring-boot-provider/pom.xml | 4 +- dubbo-demo/dubbo-demo-spring-boot/pom.xml | 4 +- dubbo-demo/dubbo-demo-triple/pom.xml | 8 +- .../dubbo-demo-jaxrs-rest-consumer}/pom.xml | 129 ++++---- .../apache/dubbo/demo/rest/api/RestConsumer.java | 114 +++++++ .../DubboServiceAnnotationServiceConsumer.java | 22 +- .../dubbo/demo/rest/api/config/DubboConfig.java | 7 +- .../src/main/resources/spring/rest-consumer.xml | 48 +++ .../dubbo-demo-jaxrs-rest-provider}/pom.xml | 129 ++++---- .../apache/dubbo/demo/rest/api/RestProvider.java | 43 +++ .../dubbo/demo/rest/api/config/DubboConfig.java | 7 +- .../rest/api/extension/ExceptionMapperForTest.java | 14 +- .../dubbo/demo/rest/api/impl/CurlServiceImpl.java | 16 +- .../impl/DubboServiceAnnotationServiceImpl.java | 17 +- .../rest/api/impl/ExceptionMapperServiceImpl.java | 17 +- .../demo/rest/api/impl/HttpMethodServiceImpl.java | 48 +-- ...ttpRequestAndResponseRPCContextServiceImpl.java | 53 +++ .../rest/api/impl/JaxRsRestDemoServiceImpl.java | 105 ++++++ .../src/main/resources/spring/rest-provider.xml | 58 ++++ .../dubbo-demo-spring-mvc-rest-consumer}/pom.xml | 128 ++++---- .../dubbo/demo/rest/api/SpringMvcRestConsumer.java | 74 +++++ .../dubbo/demo/rest/api/config/DubboConfig.java | 8 +- .../consumer/SpringRestDemoServiceConsumer.java | 16 +- .../src/main/resources/spring/rest-consumer.xml | 37 +++ .../dubbo-demo-spring-mvc-rest-provider}/pom.xml | 127 ++++---- .../dubbo/demo/rest/api/SpringMvcRestProvider.java | 19 +- .../dubbo/demo/rest/api/config/DubboConfig.java | 7 +- .../rest/api/impl/SpringRestDemoServiceImpl.java | 101 ++++++ .../src/main/resources/spring/rest-provider.xml | 38 +++ dubbo-demo/dubbo-demo-xml/pom.xml | 6 +- dubbo-dependencies-bom/pom.xml | 26 +- dubbo-distribution/dubbo-all/pom.xml | 15 +- dubbo-distribution/dubbo-bom/pom.xml | 25 ++ .../rest/AbstractServiceRestMetadataResolver.java | 22 +- .../apache/dubbo/metadata/rest/PathMatcher.java | 27 +- .../dubbo/metadata/rest/RequestMetadata.java | 4 + .../dubbo/metadata/rest/ServiceRestMetadata.java | 2 +- .../dubbo/metadata/rest/api/JaxrsUsingService.java | 47 +-- .../metadata/rest/api/SpringControllerService.java | 71 ++++ .../rest/jaxrs/JaxrsRestDoubleCheckTest.java | 28 ++ .../SpringMvcServiceRestMetadataResolverTest.java | 2 + dubbo-metadata/dubbo-metadata-report-redis/pom.xml | 2 +- .../org/apache/dubbo/metrics/MetricsConstants.java | 5 + .../metrics/collector/CombMetricsCollector.java | 30 +- ...sCollector.java => MethodMetricsCollector.java} | 16 +- .../metrics/collector/ServiceMetricsCollector.java | 10 +- .../metrics/data/ApplicationStatComposite.java | 13 +- .../dubbo/metrics/data/BaseStatComposite.java | 48 ++- .../dubbo/metrics/data/MethodStatComposite.java | 71 ++++ .../apache/dubbo/metrics/data/RtStatComposite.java | 23 +- .../dubbo/metrics/data/ServiceStatComposite.java | 34 +- .../org/apache/dubbo/metrics/event/EmptyEvent.java | 2 +- .../apache/dubbo/metrics/event/MetricsEvent.java | 14 +- .../dubbo/metrics/event/MetricsEventBus.java | 81 +++-- .../dubbo/metrics/event/TimeCounterEvent.java | 5 +- ...stener.java => AbstractMetricsKeyListener.java} | 31 +- .../metrics/listener/AbstractMetricsListener.java | 53 +-- .../listener/MetricsApplicationListener.java | 17 +- .../dubbo/metrics/listener/MetricsListener.java | 10 +- .../metrics/listener/MetricsServiceListener.java | 30 +- .../apache/dubbo/metrics/model/MethodMetric.java | 32 +- .../apache/dubbo/metrics/model/MetricsSupport.java | 133 ++++++++ .../dubbo/metrics/model/key/CategoryOverall.java | 9 +- .../apache/dubbo/metrics/model/key/MetricsCat.java | 19 +- .../apache/dubbo/metrics/model/key/MetricsKey.java | 7 +- .../dubbo/metrics/model/key/MetricsKeyWrapper.java | 59 +++- .../dubbo/metrics/model/key/MetricsLevel.java | 2 +- ...etricsPlaceType.java => MetricsPlaceValue.java} | 29 +- .../dubbo/metrics/model/key/TypeWrapper.java | 9 +- .../metrics/model/sample/CounterMetricSample.java | 11 +- .../metrics/model/sample/GaugeMetricSample.java | 5 + .../apache/dubbo/metrics/report/MetricsExport.java | 4 +- .../event/SimpleMetricsEventMulticasterTest.java | 11 +- ...efaultDubboClientObservationConventionTest.java | 71 ++++ ...efaultDubboServerObservationConventionTest.java | 69 ++++ .../utils/ObservationConventionUtils.java | 48 +++ .../{ => dubbo-metrics-config-center}/pom.xml | 23 +- .../config/ConfigCenterMetricsConstants.java | 15 +- .../collector/ConfigCenterMetricsCollector.java | 56 ++-- .../metrics/config/event/ConfigCenterEvent.java | 69 ++++ .../config/event/ConfigCenterSubDispatcher.java | 58 ++++ ...apache.dubbo.metrics.collector.MetricsCollector | 1 + .../ConfigCenterMetricsCollectorTest.java | 22 +- dubbo-metrics/dubbo-metrics-default/pom.xml | 1 - .../org/apache/dubbo/metrics/DefaultConstants.java | 70 ++++ .../metrics/MetricsScopeModelInitializer.java | 2 - .../collector/AggregateMetricsCollector.java | 158 +++++---- .../metrics/collector/DefaultMetricsCollector.java | 77 +++-- .../collector/HistogramMetricsCollector.java | 40 ++- .../collector/sample/MethodMetricsSampler.java | 133 -------- .../sample/MetricsCountSampleConfigurer.java | 10 - .../collector/sample/MetricsCountSampler.java | 19 -- .../sample/SimpleMetricsCountSampler.java | 144 --------- .../dubbo/metrics/event/DefaultSubDispatcher.java | 113 +++++++ .../dubbo/metrics/event/RequestBeforeEvent.java | 48 +++ .../apache/dubbo/metrics/event/RequestEvent.java | 71 ++++ .../metrics/filter/MethodMetricsInterceptor.java | 104 ------ .../apache/dubbo/metrics/filter/MetricsFilter.java | 54 ++-- ...apache.dubbo.metrics.collector.MetricsCollector | 2 +- .../dubbo/metrics/DefaultMetricsServiceTest.java | 84 +++++ .../collector/AggregateMetricsCollectorTest.java | 242 +++++++++++--- .../metrics/collector/DefaultCollectorTest.java | 244 ++++++++++++++ .../sample/ThreadPoolMetricsSamplerTest.java | 180 +++++++++++ .../dubbo/metrics/filter/MetricsFilterTest.java | 14 +- .../collector/DefaultMetricsCollectorTest.java | 209 ------------ .../dubbo/metrics/sampler/CountSamplerTest.java | 192 ----------- .../metrics/metadata/MetadataMetricsConstants.java | 15 +- .../collector/MetadataMetricsCollector.java | 25 +- .../metrics/metadata/event/MetadataEvent.java | 3 +- ...Multicaster.java => MetadataSubDispatcher.java} | 4 +- .../metadata/MetadataMetricsCollectorTest.java | 85 ++++- .../metadata/MetadataStatCompositeTest.java | 13 +- .../metrics/registry/RegistryMetricsConstants.java | 33 +- .../collector/RegistryMetricsCollector.java | 26 +- .../metrics/registry/event/RegistryEvent.java | 5 +- ...Multicaster.java => RegistrySubDispatcher.java} | 15 +- .../collector/RegistryMetricsCollectorTest.java | 44 ++- .../metrics/collector/RegistryMetricsTest.java | 358 +++++++++++++++++++++ .../collector/RegistryStatCompositeTest.java | 62 +++- dubbo-metrics/pom.xml | 1 + .../dubbo/monitor/support/MonitorFilter.java | 7 + .../org/apache/dubbo/qos/api/QosConfiguration.java | 18 ++ .../dubbo/qos/command/impl/GracefulShutdown.java | 47 +++ .../DefaultAnonymousAccessPermissionChecker.java | 14 +- .../dubbo/qos/protocol/QosProtocolWrapper.java | 3 + .../java/org/apache/dubbo/qos/server/Server.java | 7 + .../internal/org.apache.dubbo.qos.api.BaseCommand | 1 + .../dubbo/qos/command/util/CommandHelperTest.java | 2 + ...efaultAnonymousAccessPermissionCheckerTest.java | 24 +- .../ContextHolderAuthenticationPrepareFilter.java | 9 +- .../ContextHolderAuthenticationResolverFilter.java | 6 + .../spring/security/jackson/ObjectMapperCodec.java | 14 +- .../registry/integration/RegistryProtocol.java | 127 ++++---- .../registry/nacos/NacosConnectionManager.java | 17 +- .../dubbo/registry/nacos/MockNamingService.java | 5 + .../support/header/HeaderExchangeHandler.java | 6 + .../transport/netty4/NettyChannelHandler.java | 77 +++++ .../netty4/NettyPortUnificationServer.java | 7 +- .../netty4/NettyPortUnificationServerHandler.java | 19 +- .../main/java/org/apache/dubbo/rpc/Exporter.java | 5 + .../org/apache/dubbo/rpc/GracefulShutdown.java | 16 +- .../rpc/listener/ListenerExporterWrapper.java | 5 + .../dubbo/rpc/protocol/AbstractExporter.java | 5 + .../rpc/protocol/dubbo/DecodeableRpcResult.java | 9 +- .../rpc/protocol/dubbo/DubboGracefulShutdown.java | 81 +++++ .../dubbo/rpc/protocol/dubbo/DubboProtocol.java | 1 + .../rpc/protocol/rest/NettyHttpRestServer.java | 9 +- .../rpc/protocol/rest/PathAndInvokerMapper.java | 6 +- .../rpc/protocol/rest/RestRPCInvocationUtil.java | 3 +- .../rpc/protocol/rest/RpcExceptionMapper.java | 28 +- .../rest/annotation/ParamParserManager.java | 4 + .../protocol/rest/handler/NettyHttpHandler.java | 16 +- .../rpc/protocol/rest/netty/ssl/SslContexts.java | 158 +++++++++ .../rest/netty/ssl/SslServerTlsHandler.java | 123 +++++++ .../ConstraintViolationExceptionConvert.java} | 26 +- .../rpc/protocol/rest/JaxrsRestProtocolTest.java | 38 ++- .../dubbo/rpc/protocol/rest/ServiceConfigTest.java | 91 ++++++ .../protocol/rest/mvc/SpringControllerService.java | 16 +- .../rest/rest/RestDemoForTestException.java | 5 + .../rpc/protocol/rest/rest/RestDemoService.java | 4 + .../protocol/rest/rest/RestDemoServiceImpl.java | 5 + dubbo-rpc/dubbo-rpc-triple/pom.xml | 14 +- ...pack.java => DefaultPackableMethodFactory.java} | 20 +- .../tri/{PbUnpack.java => PbArrayPacker.java} | 23 +- .../apache/dubbo/rpc/protocol/tri/PbUnpack.java | 4 +- .../rpc/protocol/tri/ReflectionPackableMethod.java | 22 +- .../dubbo/rpc/protocol/tri/TripleInvoker.java | 7 +- .../rpc/protocol/tri/call/AbstractServerCall.java | 4 +- .../tri/call/ReflectionAbstractServerCall.java | 23 +- .../protocol/tri/call/StubAbstractServerCall.java | 3 +- .../dubbo/rpc/protocol/tri/stream/StreamUtils.java | 5 +- ...rg.apache.dubbo.rpc.model.PackableMethodFactory | 1 + .../rpc/protocol/tri/call/StubServerCallTest.java | 3 +- .../autoconfigure}/pom.xml | 96 ++++-- .../DubboMicrometerTracingAutoConfiguration.java | 9 +- .../DubboObservationAutoConfiguration.java | 12 +- .../autoconfigure/ObservabilityUtils.java | 8 +- .../autoconfigure/ObservationHandlerGrouping.java | 0 .../ObservationRegistryPostProcessor.java | 11 +- .../ConditionalOnDubboTracingEnable.java | 15 +- .../brave/BraveAutoConfiguration.java | 42 ++- .../autoconfigure/exporter/zipkin/HttpSender.java | 145 +++++++++ .../exporter/zipkin/ZipkinAutoConfiguration.java | 68 ++++ .../exporter/zipkin/ZipkinConfigurations.java | 176 ++++++++++ .../exporter/zipkin/ZipkinRestTemplateSender.java | 76 +++++ .../exporter/zipkin/ZipkinWebClientSender.java | 84 +++++ .../ZipkinRestTemplateBuilderCustomizer.java | 32 +- .../ZipkinWebClientBuilderCustomizer.java | 31 +- .../otel/OpenTelemetryAutoConfiguration.java | 35 +- .../src/main/resources/META-INF/spring.factories | 3 +- ...rk.boot.autoconfigure.AutoConfiguration.imports | 1 + ...bboMicrometerTracingAutoConfigurationTests.java | 165 ++++++++++ .../pom.xml | 35 +- .../pom.xml | 38 +-- .../pom.xml | 38 +-- .../pom.xml | 87 +++++ dubbo-spring-boot/pom.xml | 4 +- dubbo-test/dubbo-dependencies-all/pom.xml | 17 + dubbo-test/dubbo-test-check/pom.xml | 2 +- dubbo-xds/pom.xml | 15 +- pom.xml | 10 +- 291 files changed, 8649 insertions(+), 2480 deletions(-) diff --cc dubbo-distribution/dubbo-all/pom.xml index f5464ae99c,3951a9fd9d..94df39e1b6 --- a/dubbo-distribution/dubbo-all/pom.xml +++ b/dubbo-distribution/dubbo-all/pom.xml @@@ -1315,34 -1323,12 +1323,39 @@@ </resource> </transformer> + <transformer + implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> + <resource> + META-INF/dubbo/internal/org.apache.dubbo.rpc.model.PackableMethodFactory + </resource> + </transformer> + <transformer + implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> + <resource> + META-INF/dubbo/internal/org.apache.dubbo.aot.api.ReflectionTypeDescriberRegistrar + </resource> + </transformer> + + <transformer + implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> + <resource> + META-INF/dubbo/internal/org.apache.dubbo.aot.api.ProxyDescriberRegistrar + </resource> + </transformer> + + <transformer + implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> + <resource> + META-INF/dubbo/internal/org.apache.dubbo.aot.api.ResourceDescriberRegistrar + </resource> + </transformer> + + <transformer + implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> + <resource> + META-INF/dubbo/internal/org.apache.dubbo.common.json.JsonUtil + </resource> + </transformer> - </transformers> <filters> <filter> diff --cc dubbo-metrics/dubbo-metrics-default/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metrics.collector.MetricsCollector index 488b68d50f,74d78cc1f7..e806704e86 --- a/dubbo-metrics/dubbo-metrics-default/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metrics.collector.MetricsCollector +++ b/dubbo-metrics/dubbo-metrics-default/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metrics.collector.MetricsCollector @@@ -1,3 -1,1 +1,3 @@@ - default=org.apache.dubbo.metrics.collector.DefaultMetricsCollector + default-collector=org.apache.dubbo.metrics.collector.DefaultMetricsCollector +aggregateMetricsCollector=org.apache.dubbo.metrics.collector.AggregateMetricsCollector +configCenterMetricsCollector=org.apache.dubbo.metrics.collector.ConfigCenterMetricsCollector diff --cc pom.xml index ac2edd363e,1f1e5e83db..e54669dd0d --- a/pom.xml +++ b/pom.xml @@@ -125,13 -125,18 +125,19 @@@ <maven_flatten_version>1.4.1</maven_flatten_version> <maven_enforce_version>3.3.0</maven_enforce_version> <maven_antrun_version>3.1.0</maven_antrun_version> + <dubbo_annotation_processor_version>1.0.0</dubbo_annotation_processor_version> + <maven_os_plugin_version>1.7.1</maven_os_plugin_version> + <maven_protobuf_plugin_version>0.6.1</maven_protobuf_plugin_version> <arguments /> <checkstyle.skip>true</checkstyle.skip> <checkstyle_unix.skip>true</checkstyle_unix.skip> <rat.skip>true</rat.skip> <jacoco.skip>true</jacoco.skip> + + <jprotoc_version>1.2.2</jprotoc_version> + <protobuf-java_version>3.22.3</protobuf-java_version> + <grpc_version>1.54.0</grpc_version> - <revision>3.2.1-SNAPSHOT</revision> + <revision>3.3.0-beta.1-SNAPSHOT</revision> </properties> <modules>
