From a699652c7565d0f94b501af859191a0490880466 Mon Sep 17 00:00:00 2001 From: Mac Date: Thu, 24 Oct 2024 08:25:27 +0800 Subject: [PATCH 1/3] upgrade version to 3.3.1 --- dubbo-extensions-dependencies-bom/pom.xml | 4 ++-- pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dubbo-extensions-dependencies-bom/pom.xml b/dubbo-extensions-dependencies-bom/pom.xml index e6baa433..6aaef824 100644 --- a/dubbo-extensions-dependencies-bom/pom.xml +++ b/dubbo-extensions-dependencies-bom/pom.xml @@ -89,8 +89,8 @@ - 3.3.0 - 3.3.0-beta.2 + 3.3.1 + 3.3.1 5.3.39 2.7.18 diff --git a/pom.xml b/pom.xml index ff63f725..b6607e8d 100644 --- a/pom.xml +++ b/pom.xml @@ -105,8 +105,8 @@ - 3.3.0 - 3.3.0-beta.2 + 3.3.1 + 3.3.1 5.11.2 1.11.2 From 42282066d8b3ffca28abd30b909f79955a2d9784 Mon Sep 17 00:00:00 2001 From: xiaosheng Date: Fri, 8 Nov 2024 22:10:30 +0800 Subject: [PATCH 2/3] upgrade doc version (#544) * upgrade doc version * fix 3.3.1 bug * fix TripleConstants import not found * update doc --------- Co-authored-by: Mac --- README.md | 9 ++++-- README_CN.md | 9 ++++-- dubbo-api-docs/README.md | 4 +-- dubbo-api-docs/README_ch.md | 4 +-- dubbo-build-tools/pom.xml | 30 +++++++++++++++++++ .../src/main/resources/checkstyle-header.txt | 16 ++++++++++ dubbo-extensions-dependencies-bom/pom.xml | 26 +++++++++++----- .../dubbo-metadata-rest/pom.xml | 4 +++ .../JAXRSServiceRestMetadataResolver.java | 8 ++--- .../JAXRSServiceRestMetadataResolver.java | 8 ++--- .../dubbo-rpc-hessian/pom.xml | 4 +-- dubbo-rpc-extensions/dubbo-rpc-http/pom.xml | 2 +- .../dubbo-rpc-native-thrift/pom.xml | 5 ++-- dubbo-rpc-extensions/dubbo-rpc-redis/pom.xml | 2 +- dubbo-rpc-extensions/dubbo-rpc-rest/pom.xml | 2 +- .../codec/DecodeableRpcInvocation.java | 6 ++-- .../dubbo-rpc-webservice/pom.xml | 2 +- 17 files changed, 105 insertions(+), 36 deletions(-) create mode 100644 dubbo-build-tools/pom.xml create mode 100644 dubbo-build-tools/src/main/resources/checkstyle-header.txt diff --git a/README.md b/README.md index 7e0462ec..8315bd88 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # dubbo-spi-extensions -[![Build and Test For PR](https://github.com/apache/dubbo-spi-extensions/actions/workflows/build-and-test-pr.yml/badge.svg)](https://github.com/apache/dubbo-spi-extensions/actions/workflows/build-and-test-pr.yml) +[![Build Status](https://travis-ci.org/apache/dubbo-spi-extensions.svg?branch=master)](https://travis-ci.org/apache/dubbo-spi-extensions) [![codecov](https://codecov.io/gh/apache/dubbo-spi-extensions/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/dubbo-spi-extensions) -[![Maven Central](https://img.shields.io/maven-central/v/org.apache.dubbo.extensions/extensions-parent.svg)](https://search.maven.org/search?q=g:org.apache.dubbo.extensions) -[![License](https://img.shields.io/github/license/apache/dubbo.svg)](https://www.apache.org/licenses/LICENSE-2.0) +[![Maven Central](https://img.shields.io/maven-central/v/org.apache.dubbo/dubbo-spi-extensions.svg)](https://search.maven.org/search?q=g:org.apache.dubbo%20AND%20a:dubbo-spi-extensions) +[![GitHub release](https://img.shields.io/github/release/apache/dubbo-spi-extensions.svg)] [中文](./README_CN.md) @@ -20,6 +20,7 @@ The available extensions are as follows: - [dubbo-api-docs-annotations](dubbo-api-docs/dubbo-api-docs-annotations) - [dubbo-api-docs-core](dubbo-api-docs/dubbo-api-docs-core) - [dubbo-api-docs-examples](dubbo-api-docs/dubbo-api-docs-examples) +- [dubbo-build-tools](dubbo-build-tools) - [dubbo-cluster-extensions](dubbo-cluster-extensions) - [dubbo-cluster-broadcast-1](dubbo-cluster-extensions/dubbo-cluster-broadcast-1) - [dubbo-cluster-loadbalance-peakewma](dubbo-cluster-extensions/dubbo-cluster-loadbalance-peakewma) @@ -50,6 +51,7 @@ The available extensions are as follows: - [dubbo-metadata-report-extensions](dubbo-metadata-report-extensions) - [dubbo-metadata-report-consul](dubbo-metadata-report-extensions/dubbo-metadata-report-consul) - [dubbo-metadata-report-etcd](dubbo-metadata-report-extensions/dubbo-metadata-report-etcd) + - [dubbo-metadata-report-redis](dubbo-metadata-report-extensions/dubbo-metadata-report-redis) - [dubbo-metadata-rest](dubbo-metadata-report-extensions/dubbo-metadata-rest) - [dubbo-mock-extensions](dubbo-mock-extensions) - [dubbo-mock-admin](dubbo-mock-extensions/dubbo-mock-admin) @@ -90,6 +92,7 @@ The available extensions are as follows: - [dubbo-serialization-fury](dubbo-serialization-extensions/dubbo-serialization-fury) - [dubbo-serialization-gson](dubbo-serialization-extensions/dubbo-serialization-gson) - [dubbo-serialization-jackson](dubbo-serialization-extensions/dubbo-serialization-jackson) + - [dubbo-serialization-jdk](dubbo-serialization-extensions/dubbo-serialization-jdk) - [dubbo-serialization-kryo](dubbo-serialization-extensions/dubbo-serialization-kryo) - [dubbo-serialization-msgpack](dubbo-serialization-extensions/dubbo-serialization-msgpack) - [dubbo-serialization-native-hessian](dubbo-serialization-extensions/dubbo-serialization-native-hessian) diff --git a/README_CN.md b/README_CN.md index 77b111ba..1b3abd0d 100644 --- a/README_CN.md +++ b/README_CN.md @@ -1,8 +1,8 @@ # dubbo-spi-extensions -[![Build and Test For PR](https://github.com/apache/dubbo-spi-extensions/actions/workflows/build-and-test-pr.yml/badge.svg)](https://github.com/apache/dubbo-spi-extensions/actions/workflows/build-and-test-pr.yml) +[![Build Status](https://travis-ci.org/apache/dubbo-spi-extensions.svg?branch=master)](https://travis-ci.org/apache/dubbo-spi-extensions) [![codecov](https://codecov.io/gh/apache/dubbo-spi-extensions/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/dubbo-spi-extensions) -[![Maven Central](https://img.shields.io/maven-central/v/org.apache.dubbo.extensions/extensions-parent.svg)](https://search.maven.org/search?q=g:org.apache.dubbo.extensions) -[![License](https://img.shields.io/github/license/apache/dubbo.svg)](https://www.apache.org/licenses/LICENSE-2.0) +[![Maven Central](https://img.shields.io/maven-central/v/org.apache.dubbo/dubbo-spi-extensions.svg)](https://search.maven.org/search?q=g:org.apache.dubbo%20AND%20a:dubbo-spi-extensions) +[![GitHub release](https://img.shields.io/github/release/apache/dubbo-spi-extensions.svg)] [English](./README.md) @@ -20,6 +20,7 @@ dubbo-spi-extensions的目的是提供开放的、社区驱动的、可重用的 - [dubbo-api-docs-annotations](dubbo-api-docs/dubbo-api-docs-annotations) - [dubbo-api-docs-core](dubbo-api-docs/dubbo-api-docs-core) - [dubbo-api-docs-examples](dubbo-api-docs/dubbo-api-docs-examples) +- [dubbo-build-tools](dubbo-build-tools) - [dubbo-cluster-extensions](dubbo-cluster-extensions) - [dubbo-cluster-broadcast-1](dubbo-cluster-extensions/dubbo-cluster-broadcast-1) - [dubbo-cluster-loadbalance-peakewma](dubbo-cluster-extensions/dubbo-cluster-loadbalance-peakewma) @@ -50,6 +51,7 @@ dubbo-spi-extensions的目的是提供开放的、社区驱动的、可重用的 - [dubbo-metadata-report-extensions](dubbo-metadata-report-extensions) - [dubbo-metadata-report-consul](dubbo-metadata-report-extensions/dubbo-metadata-report-consul) - [dubbo-metadata-report-etcd](dubbo-metadata-report-extensions/dubbo-metadata-report-etcd) + - [dubbo-metadata-report-redis](dubbo-metadata-report-extensions/dubbo-metadata-report-redis) - [dubbo-metadata-rest](dubbo-metadata-report-extensions/dubbo-metadata-rest) - [dubbo-mock-extensions](dubbo-mock-extensions) - [dubbo-mock-admin](dubbo-mock-extensions/dubbo-mock-admin) @@ -90,6 +92,7 @@ dubbo-spi-extensions的目的是提供开放的、社区驱动的、可重用的 - [dubbo-serialization-fury](dubbo-serialization-extensions/dubbo-serialization-fury) - [dubbo-serialization-gson](dubbo-serialization-extensions/dubbo-serialization-gson) - [dubbo-serialization-jackson](dubbo-serialization-extensions/dubbo-serialization-jackson) + - [dubbo-serialization-jdk](dubbo-serialization-extensions/dubbo-serialization-jdk) - [dubbo-serialization-kryo](dubbo-serialization-extensions/dubbo-serialization-kryo) - [dubbo-serialization-msgpack](dubbo-serialization-extensions/dubbo-serialization-msgpack) - [dubbo-serialization-native-hessian](dubbo-serialization-extensions/dubbo-serialization-native-hessian) diff --git a/dubbo-api-docs/README.md b/dubbo-api-docs/README.md index edc3782e..c2f97c06 100644 --- a/dubbo-api-docs/README.md +++ b/dubbo-api-docs/README.md @@ -9,7 +9,7 @@ Adding some annotations can generate a swagger like document without turning a n ## Involving repositorys * [dubbo-spi-extensions](https://github.com/apache/dubbo-spi-extensions) - [\branch: 3.3.0\dubbo-api-docs](https://github.com/apache/dubbo-spi-extensions/tree/3.3.0/dubbo-api-docs): + [\branch: 3.3.1\dubbo-api-docs](https://github.com/apache/dubbo-spi-extensions/tree/3.3.0/dubbo-api-docs): Dubbo-Api-Docs related annotation ,annotation parsing * [dubbo-admin](https://github.com/KeRan213539/dubbo-admin): Dubbo-Api-Docs document display, test function @@ -25,7 +25,7 @@ Adding some annotations can generate a swagger like document without turning a n * Of course, Dubbo API Docs consumed a little CPU resources when the project starting and used a little memory for caching. In the future, it will consider putting the contents of the cache into the metadata center -### Current Version: 3.3.0 +### Current Version: 3.3.1 ``` diff --git a/dubbo-api-docs/README_ch.md b/dubbo-api-docs/README_ch.md index b68eabb2..eb29b7e4 100644 --- a/dubbo-api-docs/README_ch.md +++ b/dubbo-api-docs/README_ch.md @@ -9,7 +9,7 @@ dubbo 接口文档、测试工具,根据注解生成文档,并提供测试功能 ## 相关项目 * [dubbo-spi-extensions](https://github.com/apache/dubbo-spi-extensions) - [\分支: 3.3.0\dubbo-api-docs](https://github.com/apache/dubbo-spi-extensions/tree/3.3.0/dubbo-api-docs): + [\分支: 3.3.1\dubbo-api-docs](https://github.com/apache/dubbo-spi-extensions/tree/3.3.0/dubbo-api-docs): Dubbo-Api-Docs 相关注解,解析注解 * [dubbo-admin](https://github.com/KeRan213539/dubbo-admin): Dubbo-Api-Docs 文档展示,测试功能 @@ -22,7 +22,7 @@ dubbo 接口文档、测试工具,根据注解生成文档,并提供测试功能 * 为避免增加生产环境中的资源占用, 建议单独创建一个配制类用于启用Dubbo Api Docs, 并配合 @Profile("dev") 注解使用 * 当然, Dubbo Api Docs 仅在项目启动时多消耗了点CPU资源, 并使用了一点点内存用于缓存, 将来会考虑将缓存中的内容放到元数据中心. -### 当前版本: 3.3.0 +### 当前版本: 3.3.1 ``` diff --git a/dubbo-build-tools/pom.xml b/dubbo-build-tools/pom.xml new file mode 100644 index 00000000..28bae806 --- /dev/null +++ b/dubbo-build-tools/pom.xml @@ -0,0 +1,30 @@ + + + + 4.0.0 + + org.apache.dubbo + dubbo-build-tools + 1.0.0 + jar + + + true + + + \ No newline at end of file diff --git a/dubbo-build-tools/src/main/resources/checkstyle-header.txt b/dubbo-build-tools/src/main/resources/checkstyle-header.txt new file mode 100644 index 00000000..d973dced --- /dev/null +++ b/dubbo-build-tools/src/main/resources/checkstyle-header.txt @@ -0,0 +1,16 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ \ No newline at end of file diff --git a/dubbo-extensions-dependencies-bom/pom.xml b/dubbo-extensions-dependencies-bom/pom.xml index 6aaef824..37580b95 100644 --- a/dubbo-extensions-dependencies-bom/pom.xml +++ b/dubbo-extensions-dependencies-bom/pom.xml @@ -97,6 +97,7 @@ 6.13.4 4.0.66 + 3.2.13 4.5.14 1.2.0 2.0 @@ -190,7 +191,18 @@ pom import - + + org.apache.dubbo.extensions + dubbo-serialization-jdk + ${revision} + true + + + org.apache.dubbo.extensions + dubbo-remoting-http + ${revision} + true + io.fabric8 kubernetes-client @@ -223,7 +235,11 @@ ${spring.version} test - + + com.alibaba + hessian-lite + ${hession-lite.version} + com.caucho hessian @@ -254,6 +270,7 @@ libthrift ${thrift_version} + redis.clients jedis @@ -325,11 +342,6 @@ fury-core ${apache.fury_version} - - org.apache.fury - fury-core - ${apache.fury_version} - com.fasterxml.jackson.core jackson-core diff --git a/dubbo-metadata-report-extensions/dubbo-metadata-rest/pom.xml b/dubbo-metadata-report-extensions/dubbo-metadata-rest/pom.xml index e2b8f01a..ffd8851a 100644 --- a/dubbo-metadata-report-extensions/dubbo-metadata-rest/pom.xml +++ b/dubbo-metadata-report-extensions/dubbo-metadata-rest/pom.xml @@ -153,5 +153,9 @@ dubbo-metrics-metadata compile + + org.apache.dubbo + dubbo + diff --git a/dubbo-metadata-report-extensions/dubbo-metadata-rest/src/main/java/org/apache/dubbo/metadata/extension/rest/annotation/processing/jaxrs/JAXRSServiceRestMetadataResolver.java b/dubbo-metadata-report-extensions/dubbo-metadata-rest/src/main/java/org/apache/dubbo/metadata/extension/rest/annotation/processing/jaxrs/JAXRSServiceRestMetadataResolver.java index aa005a35..69ac6011 100644 --- a/dubbo-metadata-report-extensions/dubbo-metadata-rest/src/main/java/org/apache/dubbo/metadata/extension/rest/annotation/processing/jaxrs/JAXRSServiceRestMetadataResolver.java +++ b/dubbo-metadata-report-extensions/dubbo-metadata-rest/src/main/java/org/apache/dubbo/metadata/extension/rest/annotation/processing/jaxrs/JAXRSServiceRestMetadataResolver.java @@ -34,10 +34,10 @@ import static org.apache.dubbo.metadata.annotation.processing.util.AnnotationUtils.getAnnotation; import static org.apache.dubbo.metadata.annotation.processing.util.AnnotationUtils.getValue; import static org.apache.dubbo.metadata.annotation.processing.util.AnnotationUtils.isAnnotationPresent; -import static org.apache.dubbo.metadata.rest.RestMetadataConstants.JAX_RS.CONSUMES_ANNOTATION_CLASS_NAME; -import static org.apache.dubbo.metadata.rest.RestMetadataConstants.JAX_RS.HTTP_METHOD_ANNOTATION_CLASS_NAME; -import static org.apache.dubbo.metadata.rest.RestMetadataConstants.JAX_RS.PATH_ANNOTATION_CLASS_NAME; -import static org.apache.dubbo.metadata.rest.RestMetadataConstants.JAX_RS.PRODUCES_ANNOTATION_CLASS_NAME; +import static org.apache.dubbo.metadata.extension.rest.api.RestMetadataConstants.JAX_RS.CONSUMES_ANNOTATION_CLASS_NAME; +import static org.apache.dubbo.metadata.extension.rest.api.RestMetadataConstants.JAX_RS.HTTP_METHOD_ANNOTATION_CLASS_NAME; +import static org.apache.dubbo.metadata.extension.rest.api.RestMetadataConstants.JAX_RS.PATH_ANNOTATION_CLASS_NAME; +import static org.apache.dubbo.metadata.extension.rest.api.RestMetadataConstants.JAX_RS.PRODUCES_ANNOTATION_CLASS_NAME; diff --git a/dubbo-metadata-report-extensions/dubbo-metadata-rest/src/main/java/org/apache/dubbo/metadata/extension/rest/api/jaxrs/JAXRSServiceRestMetadataResolver.java b/dubbo-metadata-report-extensions/dubbo-metadata-rest/src/main/java/org/apache/dubbo/metadata/extension/rest/api/jaxrs/JAXRSServiceRestMetadataResolver.java index 61a45a11..87605711 100644 --- a/dubbo-metadata-report-extensions/dubbo-metadata-rest/src/main/java/org/apache/dubbo/metadata/extension/rest/api/jaxrs/JAXRSServiceRestMetadataResolver.java +++ b/dubbo-metadata-report-extensions/dubbo-metadata-rest/src/main/java/org/apache/dubbo/metadata/extension/rest/api/jaxrs/JAXRSServiceRestMetadataResolver.java @@ -31,10 +31,10 @@ import static org.apache.dubbo.common.utils.AnnotationUtils.getValue; import static org.apache.dubbo.common.utils.AnnotationUtils.isAnnotationPresent; import static org.apache.dubbo.common.utils.PathUtils.buildPath; -import static org.apache.dubbo.metadata.rest.RestMetadataConstants.JAX_RS.CONSUMES_ANNOTATION_CLASS_NAME; -import static org.apache.dubbo.metadata.rest.RestMetadataConstants.JAX_RS.HTTP_METHOD_ANNOTATION_CLASS_NAME; -import static org.apache.dubbo.metadata.rest.RestMetadataConstants.JAX_RS.PATH_ANNOTATION_CLASS_NAME; -import static org.apache.dubbo.metadata.rest.RestMetadataConstants.JAX_RS.PRODUCES_ANNOTATION_CLASS_NAME; +import static org.apache.dubbo.metadata.extension.rest.api.RestMetadataConstants.JAX_RS.CONSUMES_ANNOTATION_CLASS_NAME; +import static org.apache.dubbo.metadata.extension.rest.api.RestMetadataConstants.JAX_RS.HTTP_METHOD_ANNOTATION_CLASS_NAME; +import static org.apache.dubbo.metadata.extension.rest.api.RestMetadataConstants.JAX_RS.PATH_ANNOTATION_CLASS_NAME; +import static org.apache.dubbo.metadata.extension.rest.api.RestMetadataConstants.JAX_RS.PRODUCES_ANNOTATION_CLASS_NAME; /** * JAX-RS {@link ServiceRestMetadataResolver} implementation diff --git a/dubbo-rpc-extensions/dubbo-rpc-hessian/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-hessian/pom.xml index e696e558..545d27f7 100644 --- a/dubbo-rpc-extensions/dubbo-rpc-hessian/pom.xml +++ b/dubbo-rpc-extensions/dubbo-rpc-hessian/pom.xml @@ -44,7 +44,7 @@ test - org.apache.dubbo + org.apache.dubbo.extensions dubbo-remoting-http true @@ -57,7 +57,7 @@ httpclient - org.apache.dubbo + org.apache.dubbo.extensions dubbo-serialization-jdk test diff --git a/dubbo-rpc-extensions/dubbo-rpc-http/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-http/pom.xml index 35a6ef96..ee1da47f 100644 --- a/dubbo-rpc-extensions/dubbo-rpc-http/pom.xml +++ b/dubbo-rpc-extensions/dubbo-rpc-http/pom.xml @@ -41,7 +41,7 @@ true - org.apache.dubbo + org.apache.dubbo.extensions dubbo-remoting-http true diff --git a/dubbo-rpc-extensions/dubbo-rpc-native-thrift/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-native-thrift/pom.xml index 1f6b0cf3..a2399ed7 100644 --- a/dubbo-rpc-extensions/dubbo-rpc-native-thrift/pom.xml +++ b/dubbo-rpc-extensions/dubbo-rpc-native-thrift/pom.xml @@ -43,13 +43,14 @@ libthrift - org.apache.dubbo + org.apache.dubbo.extensions dubbo-serialization-jdk true + org.apache.dubbo - dubbo-remoting-zookeeper + dubbo-remoting-zookeeper-curator5 true diff --git a/dubbo-rpc-extensions/dubbo-rpc-redis/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-redis/pom.xml index 259a8add..90c3a9fe 100644 --- a/dubbo-rpc-extensions/dubbo-rpc-redis/pom.xml +++ b/dubbo-rpc-extensions/dubbo-rpc-redis/pom.xml @@ -47,7 +47,7 @@ test - org.apache.dubbo + org.apache.dubbo.extensions dubbo-serialization-jdk test diff --git a/dubbo-rpc-extensions/dubbo-rpc-rest/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-rest/pom.xml index e8704b79..ab5777b7 100644 --- a/dubbo-rpc-extensions/dubbo-rpc-rest/pom.xml +++ b/dubbo-rpc-extensions/dubbo-rpc-rest/pom.xml @@ -123,7 +123,7 @@ - org.apache.dubbo + org.apache.dubbo.extensions dubbo-serialization-jdk test diff --git a/dubbo-rpc-extensions/dubbo-rpc-rocketmq/src/main/java/org/apache/dubbo/rpc/rocketmq/codec/DecodeableRpcInvocation.java b/dubbo-rpc-extensions/dubbo-rpc-rocketmq/src/main/java/org/apache/dubbo/rpc/rocketmq/codec/DecodeableRpcInvocation.java index a13e94b4..f8d85e34 100644 --- a/dubbo-rpc-extensions/dubbo-rpc-rocketmq/src/main/java/org/apache/dubbo/rpc/rocketmq/codec/DecodeableRpcInvocation.java +++ b/dubbo-rpc-extensions/dubbo-rpc-rocketmq/src/main/java/org/apache/dubbo/rpc/rocketmq/codec/DecodeableRpcInvocation.java @@ -40,7 +40,7 @@ import org.apache.dubbo.rpc.model.ModuleModel; import org.apache.dubbo.rpc.model.ProviderModel; import org.apache.dubbo.rpc.model.ServiceDescriptor; -import org.apache.dubbo.rpc.protocol.tri.TripleConstant; +import org.apache.dubbo.rpc.protocol.tri.TripleConstants; import org.apache.dubbo.rpc.support.RpcUtils; import java.io.IOException; @@ -222,8 +222,8 @@ public Object decode(Channel channel, InputStream input) throws IOException { return this; } private static String convertHessianFromWrapper(String serializeType) { - if (TripleConstant.HESSIAN4.equals(serializeType)) { - return TripleConstant.HESSIAN2; + if (TripleConstants.HESSIAN4.equals(serializeType)) { + return TripleConstants.HESSIAN2; } return serializeType; } diff --git a/dubbo-rpc-extensions/dubbo-rpc-webservice/pom.xml b/dubbo-rpc-extensions/dubbo-rpc-webservice/pom.xml index d7b555bd..3d340bdc 100644 --- a/dubbo-rpc-extensions/dubbo-rpc-webservice/pom.xml +++ b/dubbo-rpc-extensions/dubbo-rpc-webservice/pom.xml @@ -38,7 +38,7 @@ true - org.apache.dubbo + org.apache.dubbo.extensions dubbo-remoting-http true From d9eef6b77a681e287d8efabceed1395e947cd1a3 Mon Sep 17 00:00:00 2001 From: xiaosheng Date: Thu, 14 Nov 2024 21:56:29 +0800 Subject: [PATCH 3/3] 3.3.1 (#566) (#567) * upgrade doc version * fix 3.3.1 bug * fix TripleConstants import not found * update doc * pr add Support long paths on Windows --------- Co-authored-by: Mac --- .github/workflows/build-and-test-pr.yml | 3 +++ .github/workflows/build-and-test-scheduled-3.3.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/build-and-test-pr.yml b/.github/workflows/build-and-test-pr.yml index c9a96e59..c2c04055 100644 --- a/.github/workflows/build-and-test-pr.yml +++ b/.github/workflows/build-and-test-pr.yml @@ -96,6 +96,9 @@ jobs: outputs: version: ${{ steps.dubbo-spi-extensions-version.outputs.version }} steps: + - name: Support long paths on Windows + if: ${{ startsWith( matrix.os, 'windows') }} + run: git config --system core.longpaths true - uses: actions/checkout@v4 with: path: dubbo-spi-extensions diff --git a/.github/workflows/build-and-test-scheduled-3.3.yml b/.github/workflows/build-and-test-scheduled-3.3.yml index e2443647..4fc7c1f3 100644 --- a/.github/workflows/build-and-test-scheduled-3.3.yml +++ b/.github/workflows/build-and-test-scheduled-3.3.yml @@ -101,6 +101,9 @@ jobs: outputs: version: ${{ steps.dubbo-spi-extensions-version.outputs.version }} steps: + - name: Support long paths on Windows + if: ${{ startsWith( matrix.os, 'windows') }} + run: git config --system core.longpaths true - uses: actions/checkout@v4 with: ref: "3.3"