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 f6561f059635d939bf2c460d6c921799f1bddbb9 Merge: 79ff881b48 ef253c9ba4 Author: Albumen Kevin <[email protected]> AuthorDate: Fri Sep 13 15:48:57 2024 +0800 Merge branch 'refs/heads/apache-3.2' into apache-3.3 # Conflicts: # dubbo-dependencies-bom/pom.xml # dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml # dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml # dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Constants.java # dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TriHttp2RemoteFlowController.java # dubbo-spring-boot/pom.xml # pom.xml .../dubbo-demo-native/dubbo-demo-native-consumer/pom.xml | 2 +- .../dubbo-demo-native/dubbo-demo-native-provider/pom.xml | 2 +- dubbo-dependencies-bom/pom.xml | 8 ++++---- .../org/apache/dubbo/remoting/telnet/support/TelnetUtils.java | 8 ++++---- .../{ChanelHandlerTest.java => ChannelHandlerTest.java} | 10 +++++----- .../java/org/apache/dubbo/remoting/PerformanceClientTest.java | 4 ++-- .../src/main/java/org/apache/dubbo/rpc/Constants.java | 1 + .../apache/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java | 2 +- .../apache/dubbo/rpc/protocol/injvm/InjvmClassLoaderTest.java | 2 +- .../dubbo-rpc-triple/src/main/proto/reflectionV1Alpha.proto | 4 ++-- .../dubbo-spring-boot-starters/observability/pom.xml | 2 +- dubbo-spring-boot/pom.xml | 2 +- pom.xml | 2 +- 13 files changed, 25 insertions(+), 24 deletions(-) diff --cc dubbo-dependencies-bom/pom.xml index 6bbdf4f855,6d18fb6921..b058d569cc --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@@ -92,10 -93,9 +92,10 @@@ <spring_version>5.3.39</spring_version> <spring_security_version>5.8.14</spring_security_version> <javassist_version>3.30.2-GA</javassist_version> - <bytebuddy.version>1.15.1</bytebuddy.version> + <byte-buddy_version>1.15.1</byte-buddy_version> <netty_version>3.2.10.Final</netty_version> - <netty4_version>4.1.112.Final</netty4_version> + <netty4_version>4.1.113.Final</netty4_version> + <netty_http3_version>0.0.28.Final</netty_http3_version> <httpclient_version>4.5.14</httpclient_version> <httpcore_version>4.4.16</httpcore_version> <fastjson_version>1.2.83</fastjson_version> @@@ -108,8 -108,7 +108,8 @@@ <protobuf-java_version>3.25.4</protobuf-java_version> <javax_annotation-api_version>1.3.2</javax_annotation-api_version> <servlet_version>3.1.0</servlet_version> + <jakarta_servlet_version>6.1.0</jakarta_servlet_version> - <jetty_version>9.4.55.v20240627</jetty_version> + <jetty_version>9.4.56.v20240826</jetty_version> <validation_new_version>3.1.0</validation_new_version> <validation_version>1.1.0.Final</validation_version> <hibernate_validator_version>5.4.3.Final</hibernate_validator_version> @@@ -135,9 -133,7 +135,9 @@@ <resteasy_version>3.15.6.Final</resteasy_version> <codehaus-jackson_version>1.9.13</codehaus-jackson_version> <tomcat_embed_version>8.5.100</tomcat_embed_version> - <nacos_version>2.4.1</nacos_version> + <nacos_version>2.4.2</nacos_version> + <sentinel.version>1.8.6</sentinel.version> + <seata.version>1.6.1</seata.version> <grpc.version>1.66.0</grpc.version> <grpc_contrib_verdion>0.8.1</grpc_contrib_verdion> <jprotoc_version>1.2.2</jprotoc_version> @@@ -148,20 -143,13 +148,20 @@@ <log4j_version>1.2.17</log4j_version> <logback_version>1.2.13</logback_version> <!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 --> - <log4j2_version>2.23.1</log4j2_version> + <log4j2_version>2.24.0</log4j2_version> <commons_io_version>2.16.1</commons_io_version> + <commons-codec_version>1.16.0</commons-codec_version> + <groovy_version>4.0.21</groovy_version> + <!-- Test libs --> + <junit_jupiter_version>5.9.3</junit_jupiter_version> + <junit_version>4.13.2</junit_version> + <awaitility_version>4.2.0</awaitility_version> + <hamcrest_version>2.2</hamcrest_version> + <cglib_version>2.2.2</cglib_version> <embedded_redis_version>1.4.3</embedded_redis_version> - - <!-- Alibaba --> - <alibaba_spring_context_support_version>1.0.11</alibaba_spring_context_support_version> + <mockito_version>4.11.0</mockito_version> + <spock_version>2.3-groovy-4.0</spock_version> <jaxb_version>2.2.7</jaxb_version> <activation_version>1.2.0</activation_version> diff --cc dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Constants.java index 3e34880187,dd656bc013..c5b4bdb18a --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Constants.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Constants.java @@@ -101,19 -97,14 +101,20 @@@ public interface Constants String INVOCATION_KEY = "invocation"; String SERIALIZATION_ID_KEY = "serialization_id"; - String H2_SETTINGS_HEADER_TABLE_SIZE_KEY = "dubbo.rpc.tri.header-table-size"; - String H2_SETTINGS_ENABLE_PUSH_KEY = "dubbo.rpc.tri.enable-push"; - String H2_SETTINGS_MAX_CONCURRENT_STREAMS_KEY = "dubbo.rpc.tri.max-concurrent-streams"; - String H2_SETTINGS_INITIAL_WINDOW_SIZE_KEY = "dubbo.rpc.tri.initial-window-size"; + String HTTP3_KEY = "http3"; + + String H2_SETTINGS_SUPPORT_NO_LOWER_HEADER_KEY = "dubbo.rpc.tri.support-no-lower-header"; + String H2_SETTINGS_IGNORE_1_0_0_KEY = "dubbo.rpc.tri.ignore-1.0.0-version"; + String H2_SETTINGS_RESOLVE_FALLBACK_TO_DEFAULT_KEY = "dubbo.rpc.tri.resolve-fallback-to-default"; + String H2_SETTINGS_BUILTIN_SERVICE_INIT = "dubbo.tri.builtin.service.init"; + + String H2_SETTINGS_JSON_FRAMEWORK_NAME = "dubbo.protocol.triple.rest.json-framework"; + + String H2_SETTINGS_VERBOSE_ENABLED = "dubbo.protocol.triple.verbose"; + String H2_SETTINGS_SERVLET_ENABLED = "dubbo.protocol.triple.servlet.enabled"; + String H3_SETTINGS_HTTP3_ENABLED = "dubbo.protocol.triple.http3.enabled"; + String H3_SETTINGS_HTTP3_NEGOTIATION = "dubbo.protocol.triple.http3.negotiation"; + String H2_SETTINGS_CONNECTION_INITIAL_WINDOW_SIZE_KEY = "dubbo.rpc.tri.connection-initial-window-size"; - String H2_SETTINGS_MAX_FRAME_SIZE_KEY = "dubbo.rpc.tri.max-frame-size"; - String H2_SETTINGS_MAX_HEADER_LIST_SIZE_KEY = "dubbo.rpc.tri.max-header-list-size"; String ADAPTIVE_LOADBALANCE_ATTACHMENT_KEY = "lb_adaptive"; String ADAPTIVE_LOADBALANCE_START_TIME = "adaptive_startTime"; diff --cc dubbo-spring-boot/pom.xml index 04f057f82b,b37ab3ec23..deefb0da35 --- a/dubbo-spring-boot/pom.xml +++ b/dubbo-spring-boot/pom.xml @@@ -40,9 -39,11 +40,9 @@@ <properties> <spring-boot.version>2.7.18</spring-boot.version> - <dubbo.version>${revision}</dubbo.version> - <!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 --> - <log4j2_version>2.24.0</log4j2_version> <!-- Spring boot buddy is lower than the delivery dependency package version and can only show the defined dependency version --> - <byte-buddy.version>1.15.0</byte-buddy.version> + <byte-buddy.version>1.15.1</byte-buddy.version> + <mockito_version>4.11.0</mockito_version> </properties> <dependencyManagement>
