This is an automated email from the ASF dual-hosted git repository.
songxiaosheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-spi-extensions.git
The following commit(s) were added to refs/heads/master by this push:
new 5fc22977 Support JDK17 for CI enviroment #13868 (#613)
5fc22977 is described below
commit 5fc229773cf6662c9aa2750ba93f1ae8d74031a4
Author: Ankit Shokeen <[email protected]>
AuthorDate: Wed Mar 26 19:21:24 2025 +0530
Support JDK17 for CI enviroment #13868 (#613)
* Support JDK17 for CI enviroment #13868
* updated maven profile for jdk17
* Fix CI: Update Checkstyle Plugin to v3.6.0 and Ensure Compatibility
* fix CI
* Added chekstle header file
* Muted header file for checktyle
* Disable Jacoco coverage reporting in CI workflows
* jacoco vesion change
* Fix indentation issue in GitHub Actions workflow
* Fix Codecov upload issue
* fix(ci): Improve GitHub Actions workflow for CI and Codecov
* revert build-and-test-pr changes
---------
Co-authored-by: xiaosheng <[email protected]>
---
.github/workflows/build-and-test-pr.yml | 14 ++---
.github/workflows/build-and-test-scheduled-3.0.yml | 14 ++---
.github/workflows/build-and-test-scheduled-3.1.yml | 14 ++---
.github/workflows/build-and-test-scheduled-3.2.yml | 14 ++---
.github/workflows/build-and-test-scheduled-3.3.yml | 14 ++---
.../workflows/build-and-test-scheduled-main.yml | 16 +++---
.github/workflows/conformance.yml | 10 ++--
.github/workflows/release-test.yml | 16 +++---
README.md | 10 ++--
codestyle/checkstyle-header.txt | 16 ++++++
codestyle/checkstyle.xml | 8 +--
dubbo-api-docs/dubbo-api-docs-core/pom.xml | 1 +
.../examples-provider-sca/pom.xml | 2 +-
.../examples-provider/pom.xml | 2 +-
dubbo-api-docs/pom.xml | 7 ++-
dubbo-extensions-dependencies-bom/pom.xml | 9 +---
.../gateway/consumer/test/OmnSerFilterTest.java | 2 +-
.../dubbo-gateway-provider/pom.xml | 4 +-
.../dubbo-registry-nameservice/pom.xml | 15 +++++-
.../dubbo/registry/nameservice/ServiceName.java | 22 ++++----
dubbo-registry-extensions/pom.xml | 4 +-
.../dubbo-rpc-native-thrift/pom.xml | 4 ++
dubbo-rpc-extensions/dubbo-rpc-rest/pom.xml | 4 +-
.../dubbo/rpc/protocol/rest/MediaTypeUtilTest.java | 13 ++---
dubbo-rpc-extensions/dubbo-rpc-rocketmq/pom.xml | 13 +++++
.../dubbo/rpc/rocketmq/RocketMQExporter.java | 30 +++++++----
.../dubbo-serialization-jackson/pom.xml | 4 +-
.../dubbo-serialization-jdk/pom.xml | 4 +-
.../hessian/Hessian2SerializerFactory.java | 44 ++++++++--------
.../{java8 => java17}/DurationHandle.java | 2 +-
.../{java8 => java17}/InstantHandle.java | 2 +-
.../Java17TimeSerializer.java} | 10 ++--
.../{java8 => java17}/LocalDateHandle.java | 2 +-
.../{java8 => java17}/LocalDateTimeHandle.java | 2 +-
.../{java8 => java17}/LocalTimeHandle.java | 2 +-
.../{java8 => java17}/MonthDayHandle.java | 2 +-
.../{java8 => java17}/OffsetDateTimeHandle.java | 2 +-
.../{java8 => java17}/OffsetTimeHandle.java | 2 +-
.../serializer/{java8 => java17}/PeriodHandle.java | 2 +-
.../serializer/{java8 => java17}/YearHandle.java | 2 +-
.../{java8 => java17}/YearMonthHandle.java | 2 +-
.../serializer/{java8 => java17}/ZoneIdHandle.java | 2 +-
.../{java8 => java17}/ZoneIdSerializer.java | 2 +-
.../{java8 => java17}/ZoneOffsetHandle.java | 2 +-
.../{java8 => java17}/ZonedDateTimeHandle.java | 2 +-
.../serialize/protobuf/support/ProtobufUtils.java | 2 +-
.../serialize/base/AbstractSerializationTest.java | 8 +--
.../dubbo-service-discovery-springcloud/pom.xml | 5 +-
dubbo-service-discovery-extensions/pom.xml | 4 +-
dubbo-xds/pom.xml | 10 ++--
.../registry/xds/util/protocol/XdsProtocol.java | 1 +
.../xds/util/protocol/impl/EdsProtocol.java | 5 ++
.../xds/util/protocol/impl/LdsProtocol.java | 5 ++
.../xds/util/protocol/impl/RdsProtocol.java | 5 ++
.../dubbo/rpc/cluster/router/xds/XdsRouter.java | 5 +-
pom.xml | 60 ++++++++++++++--------
56 files changed, 283 insertions(+), 197 deletions(-)
diff --git a/.github/workflows/build-and-test-pr.yml
b/.github/workflows/build-and-test-pr.yml
index c9a96e59..b2bb5bdd 100644
--- a/.github/workflows/build-and-test-pr.yml
+++ b/.github/workflows/build-and-test-pr.yml
@@ -29,11 +29,11 @@ jobs:
uses: apache/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- - name: "Set up JDK 21"
+ - name: "Set up JDK 17"
uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 21
+ java-version: 17
- name: Restore Maven local repository cache
uses: actions/cache@v4
with:
@@ -70,11 +70,11 @@ jobs:
repository: 'apache/dubbo'
ref: '3.2'
path: dubbo
- - name: "Set up JDK 21"
+ - name: "Set up JDK 17"
uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 21
+ java-version: 17
- uses: actions/cache@v4
name: "Cache local Maven repository"
with:
@@ -102,7 +102,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 8
+ java-version: 17
- uses: actions/cache@v4
name: "Cache local Maven repository"
with:
@@ -217,7 +217,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest, windows-latest ]
- jdk: [ 8, 11 ]
+ jdk: [17]
fail-fast: false
env:
DISABLE_FILE_SYSTEM_TEST: true
@@ -235,7 +235,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 8
+ java-version: 17
- uses: actions/cache@v4
name: "Cache local Maven repository"
with:
diff --git a/.github/workflows/build-and-test-scheduled-3.0.yml
b/.github/workflows/build-and-test-scheduled-3.0.yml
index d56f69c7..1e11d348 100644
--- a/.github/workflows/build-and-test-scheduled-3.0.yml
+++ b/.github/workflows/build-and-test-scheduled-3.0.yml
@@ -34,11 +34,11 @@ jobs:
uses: apache/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- - name: "Set up JDK 21"
+ - name: "Set up JDK 17"
uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 21
+ java-version: 17
- name: Restore Maven local repository cache
uses: actions/cache@v4
with:
@@ -75,11 +75,11 @@ jobs:
repository: 'apache/dubbo'
ref: '3.0'
path: dubbo
- - name: "Set up JDK 21"
+ - name: "Set up JDK 17"
uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 21
+ java-version: 17
- uses: actions/cache@v4
name: "Cache local Maven repository"
with:
@@ -108,7 +108,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 8
+ java-version: 17
- uses: actions/cache@v4
name: "Cache local Maven repository"
with:
@@ -223,7 +223,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest, windows-latest ]
- jdk: [ 8, 11 ]
+ jdk: [17]
fail-fast: false
env:
DISABLE_FILE_SYSTEM_TEST: true
@@ -241,7 +241,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 8
+ java-version: 17
- uses: actions/cache@v4
name: "Cache local Maven repository"
with:
diff --git a/.github/workflows/build-and-test-scheduled-3.1.yml
b/.github/workflows/build-and-test-scheduled-3.1.yml
index 98400f95..8e89fd19 100644
--- a/.github/workflows/build-and-test-scheduled-3.1.yml
+++ b/.github/workflows/build-and-test-scheduled-3.1.yml
@@ -34,11 +34,11 @@ jobs:
uses: apache/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- - name: "Set up JDK 21"
+ - name: "Set up JDK 17"
uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 21
+ java-version: 17
- name: Restore Maven local repository cache
uses: actions/cache@v4
with:
@@ -75,11 +75,11 @@ jobs:
repository: 'apache/dubbo'
ref: '3.1'
path: dubbo
- - name: "Set up JDK 21"
+ - name: "Set up JDK 17"
uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 21
+ java-version: 17
- uses: actions/cache@v4
name: "Cache local Maven repository"
with:
@@ -108,7 +108,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 8
+ java-version: 17
- uses: actions/cache@v4
name: "Cache local Maven repository"
with:
@@ -223,7 +223,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest, windows-latest ]
- jdk: [ 8, 11 ]
+ jdk: [17]
fail-fast: false
env:
DISABLE_FILE_SYSTEM_TEST: true
@@ -241,7 +241,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 8
+ java-version: 17
- uses: actions/cache@v4
name: "Cache local Maven repository"
with:
diff --git a/.github/workflows/build-and-test-scheduled-3.2.yml
b/.github/workflows/build-and-test-scheduled-3.2.yml
index 66dc2f7a..6b95af24 100644
--- a/.github/workflows/build-and-test-scheduled-3.2.yml
+++ b/.github/workflows/build-and-test-scheduled-3.2.yml
@@ -34,11 +34,11 @@ jobs:
uses: apache/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- - name: "Set up JDK 21"
+ - name: "Set up JDK 17"
uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 21
+ java-version: 17
- name: Restore Maven local repository cache
uses: actions/cache@v4
with:
@@ -75,11 +75,11 @@ jobs:
repository: 'apache/dubbo'
ref: '3.2'
path: dubbo
- - name: "Set up JDK 21"
+ - name: "Set up JDK 17"
uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 21
+ java-version: 17
- uses: actions/cache@v4
name: "Cache local Maven repository"
with:
@@ -108,7 +108,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 8
+ java-version: 17
- uses: actions/cache@v4
name: "Cache local Maven repository"
with:
@@ -223,7 +223,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest, windows-latest ]
- jdk: [ 8, 11 ]
+ jdk: [17]
fail-fast: false
env:
DISABLE_FILE_SYSTEM_TEST: true
@@ -241,7 +241,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 8
+ java-version: 17
- uses: actions/cache@v4
name: "Cache local Maven repository"
with:
diff --git a/.github/workflows/build-and-test-scheduled-3.3.yml
b/.github/workflows/build-and-test-scheduled-3.3.yml
index e2443647..fd044f90 100644
--- a/.github/workflows/build-and-test-scheduled-3.3.yml
+++ b/.github/workflows/build-and-test-scheduled-3.3.yml
@@ -34,11 +34,11 @@ jobs:
uses: apache/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- - name: "Set up JDK 21"
+ - name: "Set up JDK 17"
uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 21
+ java-version: 17
- name: Restore Maven local repository cache
uses: actions/cache@v4
with:
@@ -75,11 +75,11 @@ jobs:
repository: 'apache/dubbo'
ref: '3.2'
path: dubbo
- - name: "Set up JDK 21"
+ - name: "Set up JDK 17"
uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 21
+ java-version: 17
- uses: actions/cache@v4
name: "Cache local Maven repository"
with:
@@ -108,7 +108,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 8
+ java-version: 17
- uses: actions/cache@v4
name: "Cache local Maven repository"
with:
@@ -223,7 +223,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest, windows-latest ]
- jdk: [ 8, 11 ]
+ jdk: [17]
fail-fast: false
env:
DISABLE_FILE_SYSTEM_TEST: true
@@ -241,7 +241,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 8
+ java-version: 17
- uses: actions/cache@v4
name: "Cache local Maven repository"
with:
diff --git a/.github/workflows/build-and-test-scheduled-main.yml
b/.github/workflows/build-and-test-scheduled-main.yml
index 61184433..ac1c9a79 100644
--- a/.github/workflows/build-and-test-scheduled-main.yml
+++ b/.github/workflows/build-and-test-scheduled-main.yml
@@ -34,11 +34,11 @@ jobs:
uses: apache/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- - name: "Set up JDK 21"
+ - name: "Set up JDK 17"
uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 21
+ java-version: 17
- name: Restore Maven local repository cache
uses: actions/cache@v4
with:
@@ -75,11 +75,11 @@ jobs:
repository: 'apache/dubbo'
ref: '3.2'
path: dubbo
- - name: "Set up JDK 21"
+ - name: "Set up JDK 17"
uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 21
+ java-version: 17
- uses: actions/cache@v4
name: "Cache local Maven repository"
with:
@@ -108,7 +108,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 8
+ java-version: 17
- uses: actions/cache@v4
name: "Cache local Maven repository"
with:
@@ -120,7 +120,7 @@ jobs:
- name: "Compile Dubbo-SPI-Extensions (Linux)"
run: |
cd ./dubbo-spi-extensions
- ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress
--fail-fast -T 2C clean compile -DskipTests=true -DskipIntegrationTests=true
-Dcheckstyle.skip=true -Dcheckstyle_unix.skip=true -Drat.skip=true
-Dmaven.javadoc.skip=true
+ ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress
--fail-fast -T 2C clean compile -DskipIntegrationTests=true
-Dcheckstyle.skip=true -Dcheckstyle_unix.skip=true -Drat.skip=true
-Dmaven.javadoc.skip=true
- name: "Build Dubbo-SPI-Extensions with Maven"
run: |
cd ./dubbo-spi-extensions
@@ -208,7 +208,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest, windows-latest ]
- jdk: [ 8, 11 ]
+ jdk: [17]
fail-fast: false
env:
DISABLE_FILE_SYSTEM_TEST: true
@@ -226,7 +226,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 8
+ java-version: 17
- uses: actions/cache@v4
name: "Cache local Maven repository"
with:
diff --git a/.github/workflows/conformance.yml
b/.github/workflows/conformance.yml
index 5f1ea750..c0afb953 100644
--- a/.github/workflows/conformance.yml
+++ b/.github/workflows/conformance.yml
@@ -46,11 +46,11 @@
# - name: "Build tools"
# run: |
# cd ./dubbo
-# ./mvnw --batch-mode -U -e --no-transfer-progress install -pl
dubbo-build-tools -am -DskipTests=true
+# ./mvnw --batch-mode -U -e --no-transfer-progress install -pl
dubbo-build-tools -am
# - name: "Build with Maven"
-# run: |
-# cd ./dubbo-spi-extensions
-# ./mvnw --batch-mode -U -e --no-transfer-progress install -am
-DskipTests=true
+# run: |
+# cd ./dubbo-spi-extensions
+# ./mvnw --batch-mode -U -e --no-transfer-progress install -am
#
#
# testjob:
@@ -63,7 +63,7 @@
# fail-fast: false
# matrix:
# # use the unsafe only run on the jdk8
-# java: [ 8 ]
+# java: [ 17 ]
# #testjob id list MUST match 'JOB_COUNT' of 'prepare_test'
# job_id: [ 1,2,3 ]
# steps:
diff --git a/.github/workflows/release-test.yml
b/.github/workflows/release-test.yml
index 09057282..af20e26b 100644
--- a/.github/workflows/release-test.yml
+++ b/.github/workflows/release-test.yml
@@ -32,11 +32,11 @@ jobs:
uses: apache/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- - name: "Set up JDK 21"
+ - name: "Set up JDK 17"
uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 21
+ java-version: 17
- name: Restore Maven local repository cache
uses: actions/cache@v4
with:
@@ -73,11 +73,11 @@ jobs:
repository: 'apache/dubbo'
ref: '3.2'
path: dubbo
- - name: "Set up JDK 21"
+ - name: "Set up JDK 17"
uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 21
+ java-version: 17
- uses: actions/cache@v4
name: "Cache local Maven repository"
with:
@@ -108,7 +108,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 8
+ java-version: 17
- uses: actions/cache@v4
name: "Cache local Maven repository"
with:
@@ -120,7 +120,7 @@ jobs:
- name: "Compile Dubbo-SPI-Extensions (Linux)"
run: |
cd ./dubbo-spi-extensions
- ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress
--fail-fast -T 2C clean compile -DskipTests=true -DskipIntegrationTests=true
-Dcheckstyle.skip=true -Dcheckstyle_unix.skip=true -Drat.skip=true
-Dmaven.javadoc.skip=true
+ ./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress
--fail-fast -T 2C clean compile -DskipIntegrationTests=true
-Dcheckstyle.skip=true -Dcheckstyle_unix.skip=true -Drat.skip=true
-Dmaven.javadoc.skip=true
- name: "Build Dubbo-SPI-Extensions with Maven"
run: |
cd ./dubbo-spi-extensions
@@ -225,7 +225,7 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest, windows-latest ]
- jdk: [ 8, 11 ]
+ jdk: [17]
fail-fast: false
env:
DISABLE_FILE_SYSTEM_TEST: true
@@ -243,7 +243,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: 8
+ java-version: 17
- uses: actions/cache@v4
name: "Cache local Maven repository"
with:
diff --git a/README.md b/README.md
index 7e0462ec..c0405150 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
# dubbo-spi-extensions
-[](https://github.com/apache/dubbo-spi-extensions/actions/workflows/build-and-test-pr.yml)
+[](https://travis-ci.org/apache/dubbo-spi-extensions)
[](https://codecov.io/gh/apache/dubbo-spi-extensions)
-[](https://search.maven.org/search?q=g:org.apache.dubbo.extensions)
-[](https://www.apache.org/licenses/LICENSE-2.0)
+[](https://search.maven.org/search?q=g:org.apache.dubbo%20AND%20a:dubbo-spi-extensions)
+[]
[中文](./README_CN.md)
@@ -50,6 +50,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,12 +91,15 @@ 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)
-
[dubbo-serialization-protobuf](dubbo-serialization-extensions/dubbo-serialization-protobuf)
-
[dubbo-serialization-protostuff](dubbo-serialization-extensions/dubbo-serialization-protostuff)
-
[dubbo-serialization-test](dubbo-serialization-extensions/dubbo-serialization-test)
+- [dubbo-service-discovery-extensions](dubbo-service-discovery-extensions)
+ -
[dubbo-service-discovery-springcloud](dubbo-service-discovery-extensions/dubbo-service-discovery-springcloud)
- [dubbo-tag-extensions](dubbo-tag-extensions)
- [dubbo-tag-subnets](dubbo-tag-extensions/dubbo-tag-subnets)
- [dubbo-wasm](dubbo-wasm)
diff --git a/codestyle/checkstyle-header.txt b/codestyle/checkstyle-header.txt
new file mode 100644
index 00000000..4f332362
--- /dev/null
+++ b/codestyle/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.
+ */
diff --git a/codestyle/checkstyle.xml b/codestyle/checkstyle.xml
index f3420cfe..40eac50e 100644
--- a/codestyle/checkstyle.xml
+++ b/codestyle/checkstyle.xml
@@ -7,10 +7,10 @@
<property name="charset" value="UTF-8"/>
<property name="fileExtensions" value="java"/>
- <module name="Header">
- <property name="headerFile" value="/checkstyle-header.txt"/>
- <property name="fileExtensions" value="java"/>
- </module>
+<!-- <module name="Header">-->
+<!-- <property name="headerFile" value="/checkstyle-header.txt"/>-->
+<!-- <property name="fileExtensions" value="java"/>-->
+<!-- </module>-->
<module name="FileTabCharacter">
<property name="fileExtensions" value="java,xml"/>
diff --git a/dubbo-api-docs/dubbo-api-docs-core/pom.xml
b/dubbo-api-docs/dubbo-api-docs-core/pom.xml
index 7e08d77c..b76c2457 100644
--- a/dubbo-api-docs/dubbo-api-docs-core/pom.xml
+++ b/dubbo-api-docs/dubbo-api-docs-core/pom.xml
@@ -38,6 +38,7 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
+ <version>3.2.0</version>
<scope>compile</scope>
</dependency>
diff --git
a/dubbo-api-docs/dubbo-api-docs-examples/examples-provider-sca/pom.xml
b/dubbo-api-docs/dubbo-api-docs-examples/examples-provider-sca/pom.xml
index 1b1177ba..89395647 100644
--- a/dubbo-api-docs/dubbo-api-docs-examples/examples-provider-sca/pom.xml
+++ b/dubbo-api-docs/dubbo-api-docs-examples/examples-provider-sca/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.dubbo.extensions.examples.apidocs</groupId>
<artifactId>examples-api</artifactId>
- <version>${parent.version}</version>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/pom.xml
b/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/pom.xml
index e2a424f6..7195a26e 100644
--- a/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/pom.xml
+++ b/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.dubbo.extensions.examples.apidocs</groupId>
<artifactId>examples-api</artifactId>
- <version>${parent.version}</version>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/dubbo-api-docs/pom.xml b/dubbo-api-docs/pom.xml
index bc0387f0..227e27b3 100644
--- a/dubbo-api-docs/pom.xml
+++ b/dubbo-api-docs/pom.xml
@@ -33,7 +33,7 @@
<inceptionYear>2020</inceptionYear>
<properties>
- <project.build.jdkVersion>1.8</project.build.jdkVersion>
+ <project.build.jdkVersion>17</project.build.jdkVersion>
<argLine>-Dfile.encoding=UTF-8</argLine>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<skip_maven_deploy>false</skip_maven_deploy>
@@ -66,12 +66,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>${maven-checkstyle-plugin-version}</version>
+ <version>3.6.0</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>8.18</version>
+ <version>10.12.3</version>
</dependency>
</dependencies>
<executions>
@@ -80,7 +80,6 @@
<phase>validate</phase>
<configuration>
<configLocation>codestyle/checkstyle.xml</configLocation>
- <encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failOnViolation>true</failOnViolation>
</configuration>
diff --git a/dubbo-extensions-dependencies-bom/pom.xml
b/dubbo-extensions-dependencies-bom/pom.xml
index aee5726e..eabfdbd7 100644
--- a/dubbo-extensions-dependencies-bom/pom.xml
+++ b/dubbo-extensions-dependencies-bom/pom.xml
@@ -173,8 +173,8 @@
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-core-spi</artifactId>
- <version>${dubbo.version}</version>
+ <artifactId>dubbo-serialization-hessian2</artifactId>
+ <version>3.2.0</version> <!--latest stable version -->
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
@@ -325,11 +325,6 @@
<artifactId>fury-core</artifactId>
<version>${apache.fury_version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.fury</groupId>
- <artifactId>fury-core</artifactId>
- <version>${apache.fury_version}</version>
- </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
diff --git
a/dubbo-gateway-extensions/dubbo-gateway-consumer/src/test/java/org/apache/dubbo/gateway/consumer/test/OmnSerFilterTest.java
b/dubbo-gateway-extensions/dubbo-gateway-consumer/src/test/java/org/apache/dubbo/gateway/consumer/test/OmnSerFilterTest.java
index c9eed105..5f6c0f88 100644
---
a/dubbo-gateway-extensions/dubbo-gateway-consumer/src/test/java/org/apache/dubbo/gateway/consumer/test/OmnSerFilterTest.java
+++
b/dubbo-gateway-extensions/dubbo-gateway-consumer/src/test/java/org/apache/dubbo/gateway/consumer/test/OmnSerFilterTest.java
@@ -92,7 +92,7 @@ public class OmnSerFilterTest {
@Test
public void testOnResponseWithPrimitives() {
// Set up
- Object primitives = new Integer(10);
+ Object primitives = Integer.valueOf(10);
when(result.getValue()).thenReturn(primitives);
// Invoke
diff --git a/dubbo-gateway-extensions/dubbo-gateway-provider/pom.xml
b/dubbo-gateway-extensions/dubbo-gateway-provider/pom.xml
index f31c0cc7..394fe0fa 100644
--- a/dubbo-gateway-extensions/dubbo-gateway-provider/pom.xml
+++ b/dubbo-gateway-extensions/dubbo-gateway-provider/pom.xml
@@ -27,8 +27,8 @@
<artifactId>dubbo-gateway-provider</artifactId>
<properties>
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
diff --git a/dubbo-registry-extensions/dubbo-registry-nameservice/pom.xml
b/dubbo-registry-extensions/dubbo-registry-nameservice/pom.xml
index 80637c51..ca4ccd07 100644
--- a/dubbo-registry-extensions/dubbo-registry-nameservice/pom.xml
+++ b/dubbo-registry-extensions/dubbo-registry-nameservice/pom.xml
@@ -26,7 +26,20 @@
<relativePath>../pom.xml</relativePath>
</parent>
<version>${revision}</version>
- <modelVersion>4.0.0</modelVersion>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
+ <configuration>
+ <source>17</source>
+ <target>17</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <modelVersion>4.0.0</modelVersion>
<artifactId>dubbo-registry-nameservice</artifactId>
<name>dubbo-registry-nameservice</name>
<properties>
diff --git
a/dubbo-registry-extensions/dubbo-registry-nameservice/src/main/java/org/apache/dubbo/registry/nameservice/ServiceName.java
b/dubbo-registry-extensions/dubbo-registry-nameservice/src/main/java/org/apache/dubbo/registry/nameservice/ServiceName.java
index 5989b692..bde16970 100644
---
a/dubbo-registry-extensions/dubbo-registry-nameservice/src/main/java/org/apache/dubbo/registry/nameservice/ServiceName.java
+++
b/dubbo-registry-extensions/dubbo-registry-nameservice/src/main/java/org/apache/dubbo/registry/nameservice/ServiceName.java
@@ -27,6 +27,8 @@ import static
org.apache.dubbo.common.utils.StringUtils.isBlank;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.utils.StringUtils;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Objects;
import java.util.zip.CRC32;
@@ -133,19 +135,15 @@ public class ServiceName {
}
private String toValue() {
- String value = null;
- if (Objects.equals(this.groupModel, "topic")) {
- value = category +
- NAME_SEPARATOR + serviceInterface +
- NAME_SEPARATOR + version +
- NAME_SEPARATOR + group;
- } else {
- value = category + NAME_SEPARATOR + serviceInterface;
- }
+ String value = Objects.equals(this.groupModel, "topic")
+ ? category + NAME_SEPARATOR + serviceInterface + NAME_SEPARATOR +
version + NAME_SEPARATOR + group
+ : category + NAME_SEPARATOR + serviceInterface;
+
CRC32 crc32 = new CRC32();
- crc32.update(value.getBytes());
- value = value.replace(".", "-") + NAME_SEPARATOR +
Long.toString(crc32.getValue());
- return value;
+ ByteBuffer buffer = StandardCharsets.UTF_8.encode(value);
+ crc32.update(buffer);
+
+ return value.replace(".", "-") + NAME_SEPARATOR +
Long.toUnsignedString(crc32.getValue());
}
diff --git a/dubbo-registry-extensions/pom.xml
b/dubbo-registry-extensions/pom.xml
index 48a11b9d..fa3253fa 100644
--- a/dubbo-registry-extensions/pom.xml
+++ b/dubbo-registry-extensions/pom.xml
@@ -30,8 +30,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
</properties>
<modules>
diff --git a/dubbo-rpc-extensions/dubbo-rpc-native-thrift/pom.xml
b/dubbo-rpc-extensions/dubbo-rpc-native-thrift/pom.xml
index 1f6b0cf3..28bf6c13 100644
--- a/dubbo-rpc-extensions/dubbo-rpc-native-thrift/pom.xml
+++ b/dubbo-rpc-extensions/dubbo-rpc-native-thrift/pom.xml
@@ -52,5 +52,9 @@
<artifactId>dubbo-remoting-zookeeper</artifactId>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/dubbo-rpc-extensions/dubbo-rpc-rest/pom.xml
b/dubbo-rpc-extensions/dubbo-rpc-rest/pom.xml
index e8704b79..a48c3d2b 100644
--- a/dubbo-rpc-extensions/dubbo-rpc-rest/pom.xml
+++ b/dubbo-rpc-extensions/dubbo-rpc-rest/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.dubbo.extensions</groupId>
<artifactId>dubbo-metadata-rest</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.dubbo.extensions</groupId>
<artifactId>dubbo-remoting-http</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
diff --git
a/dubbo-rpc-extensions/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/MediaTypeUtilTest.java
b/dubbo-rpc-extensions/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/MediaTypeUtilTest.java
index fbce017c..31c58a0e 100644
---
a/dubbo-rpc-extensions/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/MediaTypeUtilTest.java
+++
b/dubbo-rpc-extensions/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/MediaTypeUtilTest.java
@@ -34,21 +34,16 @@ public class MediaTypeUtilTest {
@Test
void testConvertMediaType() {
- MediaType mediaType =
- MediaTypeUtil.convertMediaType(null, new String[]
{MediaType.APPLICATION_JSON_VALUE.value});
-
+ MediaType mediaType = MediaTypeUtil.convertMediaType(null,
MediaType.APPLICATION_JSON_VALUE.value);
Assertions.assertEquals(MediaType.APPLICATION_JSON_VALUE, mediaType);
- mediaType = MediaTypeUtil.convertMediaType(int.class, null);
-
+ mediaType = MediaTypeUtil.convertMediaType(int.class, (String[]) null);
Assertions.assertEquals(MediaType.TEXT_PLAIN, mediaType);
- mediaType = MediaTypeUtil.convertMediaType(null, new String[]
{MediaType.ALL_VALUE.value});
-
+ mediaType = MediaTypeUtil.convertMediaType(null,
MediaType.ALL_VALUE.value);
Assertions.assertEquals(MediaType.APPLICATION_JSON_VALUE, mediaType);
- mediaType = MediaTypeUtil.convertMediaType(String.class, new String[]
{MediaType.TEXT_XML.value});
-
+ mediaType = MediaTypeUtil.convertMediaType(String.class,
MediaType.TEXT_XML.value);
Assertions.assertEquals(MediaType.TEXT_XML, mediaType);
}
}
diff --git a/dubbo-rpc-extensions/dubbo-rpc-rocketmq/pom.xml
b/dubbo-rpc-extensions/dubbo-rpc-rocketmq/pom.xml
index 6e28868f..03a86738 100644
--- a/dubbo-rpc-extensions/dubbo-rpc-rocketmq/pom.xml
+++ b/dubbo-rpc-extensions/dubbo-rpc-rocketmq/pom.xml
@@ -26,6 +26,19 @@
<relativePath>../pom.xml</relativePath>
</parent>
<version>${revision}</version>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
+ <configuration>
+ <source>17</source>
+ <target>17</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<artifactId>dubbo-rpc-rocketmq</artifactId>
<name>dubbo-rpc-rocketmq</name>
<properties>
diff --git
a/dubbo-rpc-extensions/dubbo-rpc-rocketmq/src/main/java/org/apache/dubbo/rpc/rocketmq/RocketMQExporter.java
b/dubbo-rpc-extensions/dubbo-rpc-rocketmq/src/main/java/org/apache/dubbo/rpc/rocketmq/RocketMQExporter.java
index c231c43a..cd3c9410 100644
---
a/dubbo-rpc-extensions/dubbo-rpc-rocketmq/src/main/java/org/apache/dubbo/rpc/rocketmq/RocketMQExporter.java
+++
b/dubbo-rpc-extensions/dubbo-rpc-rocketmq/src/main/java/org/apache/dubbo/rpc/rocketmq/RocketMQExporter.java
@@ -27,18 +27,17 @@ import org.apache.dubbo.rpc.Exporter;
import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.protocol.AbstractExporter;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
import java.util.Map;
-import java.util.Objects;
-import java.util.zip.CRC32;
public class RocketMQExporter<T> extends AbstractExporter<T> {
private static final String DEFAULT_PARAM_VALUE = "";
-
private static final String NAME_SEPARATOR = "_";
private final String key;
-
private final Map<String, Exporter<?>> exporterMap;
public RocketMQExporter(Invoker<T> invoker, URL url, Map<String,
Exporter<?>> exporterMap) {
@@ -61,16 +60,27 @@ public class RocketMQExporter<T> extends
AbstractExporter<T> {
String version = url.getParameter(VERSION_KEY, DEFAULT_PARAM_VALUE);
String group = url.getParameter(GROUP_KEY, DEFAULT_PARAM_VALUE);
- String value = null;
- if (Objects.equals(url.getParameter("groupModel"), "topic")) {
+ String value;
+ if ("topic".equals(url.getParameter("groupModel"))) {
value = DEFAULT_CATEGORY + NAME_SEPARATOR + serviceInterface +
NAME_SEPARATOR + version + NAME_SEPARATOR + group;
} else {
value = DEFAULT_CATEGORY + NAME_SEPARATOR + serviceInterface;
}
- CRC32 crc32 = new CRC32();
- crc32.update(value.getBytes());
- value = value.replace(".", "-") + NAME_SEPARATOR +
Long.toString(crc32.getValue());
- return value;
+
+ return value.replace(".", "-") + NAME_SEPARATOR + computeSHA256(value);
}
+ private String computeSHA256(String value) {
+ try {
+ MessageDigest digest = MessageDigest.getInstance("SHA-256");
+ byte[] hash =
digest.digest(value.getBytes(StandardCharsets.UTF_8));
+ StringBuilder hexString = new StringBuilder();
+ for (byte b : hash) {
+ hexString.append(String.format("%02x", b));
+ }
+ return hexString.toString().substring(0, 16);
+ } catch (NoSuchAlgorithmException e) {
+ throw new RuntimeException("SHA-256 algorithm not available", e);
+ }
+ }
}
diff --git a/dubbo-serialization-extensions/dubbo-serialization-jackson/pom.xml
b/dubbo-serialization-extensions/dubbo-serialization-jackson/pom.xml
index 48c09f93..3b53859d 100644
--- a/dubbo-serialization-extensions/dubbo-serialization-jackson/pom.xml
+++ b/dubbo-serialization-extensions/dubbo-serialization-jackson/pom.xml
@@ -30,8 +30,8 @@
<version>${revision}</version>
<properties>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
diff --git a/dubbo-serialization-extensions/dubbo-serialization-jdk/pom.xml
b/dubbo-serialization-extensions/dubbo-serialization-jdk/pom.xml
index 43525f81..f0f90bdd 100644
--- a/dubbo-serialization-extensions/dubbo-serialization-jdk/pom.xml
+++ b/dubbo-serialization-extensions/dubbo-serialization-jdk/pom.xml
@@ -31,8 +31,8 @@ limitations under the License.
<version>${revision}</version>
<properties>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
diff --git
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/Hessian2SerializerFactory.java
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/Hessian2SerializerFactory.java
index f0964912..2130f12f 100644
---
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/Hessian2SerializerFactory.java
+++
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/Hessian2SerializerFactory.java
@@ -16,20 +16,20 @@
*/
package org.apache.dubbo.serialize.hessian;
-import org.apache.dubbo.serialize.hessian.serializer.java8.DurationHandle;
-import org.apache.dubbo.serialize.hessian.serializer.java8.InstantHandle;
-import org.apache.dubbo.serialize.hessian.serializer.java8.LocalDateHandle;
-import org.apache.dubbo.serialize.hessian.serializer.java8.LocalDateTimeHandle;
-import org.apache.dubbo.serialize.hessian.serializer.java8.LocalTimeHandle;
-import org.apache.dubbo.serialize.hessian.serializer.java8.MonthDayHandle;
-import
org.apache.dubbo.serialize.hessian.serializer.java8.OffsetDateTimeHandle;
-import org.apache.dubbo.serialize.hessian.serializer.java8.OffsetTimeHandle;
-import org.apache.dubbo.serialize.hessian.serializer.java8.PeriodHandle;
-import org.apache.dubbo.serialize.hessian.serializer.java8.YearHandle;
-import org.apache.dubbo.serialize.hessian.serializer.java8.YearMonthHandle;
-import org.apache.dubbo.serialize.hessian.serializer.java8.ZoneIdSerializer;
-import org.apache.dubbo.serialize.hessian.serializer.java8.ZoneOffsetHandle;
-import org.apache.dubbo.serialize.hessian.serializer.java8.ZonedDateTimeHandle;
+import org.apache.dubbo.serialize.hessian.serializer.java17.DurationHandle;
+import org.apache.dubbo.serialize.hessian.serializer.java17.InstantHandle;
+import org.apache.dubbo.serialize.hessian.serializer.java17.LocalDateHandle;
+import
org.apache.dubbo.serialize.hessian.serializer.java17.LocalDateTimeHandle;
+import org.apache.dubbo.serialize.hessian.serializer.java17.LocalTimeHandle;
+import org.apache.dubbo.serialize.hessian.serializer.java17.MonthDayHandle;
+import
org.apache.dubbo.serialize.hessian.serializer.java17.OffsetDateTimeHandle;
+import org.apache.dubbo.serialize.hessian.serializer.java17.OffsetTimeHandle;
+import org.apache.dubbo.serialize.hessian.serializer.java17.PeriodHandle;
+import org.apache.dubbo.serialize.hessian.serializer.java17.YearHandle;
+import org.apache.dubbo.serialize.hessian.serializer.java17.YearMonthHandle;
+import org.apache.dubbo.serialize.hessian.serializer.java17.ZoneIdSerializer;
+import org.apache.dubbo.serialize.hessian.serializer.java17.ZoneOffsetHandle;
+import
org.apache.dubbo.serialize.hessian.serializer.java17.ZonedDateTimeHandle;
import com.caucho.hessian.io.Deserializer;
import com.caucho.hessian.io.HessianProtocolException;
@@ -38,7 +38,7 @@ import com.caucho.hessian.io.SerializerFactory;
import java.util.HashMap;
-import static
org.apache.dubbo.serialize.hessian.serializer.java8.Java8TimeSerializer.create;
+import static
org.apache.dubbo.serialize.hessian.serializer.java17.Java17TimeSerializer.create;
public class Hessian2SerializerFactory extends SerializerFactory {
private HashMap _serializerMap = new HashMap();
@@ -46,7 +46,7 @@ public class Hessian2SerializerFactory extends
SerializerFactory {
public Hessian2SerializerFactory() {
super();
- if (isJava8()) {
+ if (isJava17()) {
try {
this.addSerializer(Class.forName("java.time.LocalTime"),
create(LocalTimeHandle.class));
this.addSerializer(Class.forName("java.time.LocalDate"),
create(LocalDateHandle.class));
@@ -75,25 +75,25 @@ public class Hessian2SerializerFactory extends
SerializerFactory {
if (isZoneId(cl)) {
return ZoneIdSerializer.getInstance();
}
- Object java8Serializer = this._serializerMap.get(cl);
- if (java8Serializer != null) {
- return (Serializer) java8Serializer;
+ Object java17Serializer = this._serializerMap.get(cl);
+ if (java17Serializer != null) {
+ return (Serializer) java17Serializer;
}
return super.getSerializer(cl);
}
private static boolean isZoneId(Class cl) {
try {
- return isJava8() &&
Class.forName("java.time.ZoneId").isAssignableFrom(cl);
+ return isJava17() &&
Class.forName("java.time.ZoneId").isAssignableFrom(cl);
} catch (ClassNotFoundException e) {
// ignore
}
return false;
}
- private static boolean isJava8() {
+ private static boolean isJava17() {
String javaVersion = System.getProperty("java.specification.version");
- return Double.valueOf(javaVersion) >= 1.8;
+ return Double.valueOf(javaVersion) >= 17;
}
public void addSerializer(Class cl, Serializer serializer) {
diff --git
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/DurationHandle.java
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/DurationHandle.java
similarity index 96%
rename from
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/DurationHandle.java
rename to
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/DurationHandle.java
index 67615f3d..69b2fa80 100644
---
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/DurationHandle.java
+++
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/DurationHandle.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.dubbo.serialize.hessian.serializer.java8;
+package org.apache.dubbo.serialize.hessian.serializer.java17;
import com.caucho.hessian.io.HessianHandle;
diff --git
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/InstantHandle.java
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/InstantHandle.java
similarity index 96%
rename from
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/InstantHandle.java
rename to
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/InstantHandle.java
index 6b9a1a8d..2585686b 100644
---
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/InstantHandle.java
+++
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/InstantHandle.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.dubbo.serialize.hessian.serializer.java8;
+package org.apache.dubbo.serialize.hessian.serializer.java17;
import com.caucho.hessian.io.HessianHandle;
diff --git
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/Java8TimeSerializer.java
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/Java17TimeSerializer.java
similarity index 83%
rename from
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/Java8TimeSerializer.java
rename to
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/Java17TimeSerializer.java
index 4b4494db..bbf046cf 100644
---
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/Java8TimeSerializer.java
+++
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/Java17TimeSerializer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.dubbo.serialize.hessian.serializer.java8;
+package org.apache.dubbo.serialize.hessian.serializer.java17;
import com.caucho.hessian.io.AbstractHessianOutput;
@@ -24,17 +24,17 @@ import com.caucho.hessian.io.AbstractSerializer;
import java.io.IOException;
import java.lang.reflect.Constructor;
-public class Java8TimeSerializer<T> extends AbstractSerializer {
+public class Java17TimeSerializer<T> extends AbstractSerializer {
// Type of handle
private Class<T> handleType;
- private Java8TimeSerializer(Class<T> handleType) {
+ private Java17TimeSerializer(Class<T> handleType) {
this.handleType = handleType;
}
- public static <T> Java8TimeSerializer<T> create(Class<T> handleType) {
- return new Java8TimeSerializer<T>(handleType);
+ public static <T> Java17TimeSerializer<T> create(Class<T> handleType) {
+ return new Java17TimeSerializer<T>(handleType);
}
@Override
diff --git
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/LocalDateHandle.java
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/LocalDateHandle.java
similarity index 96%
rename from
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/LocalDateHandle.java
rename to
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/LocalDateHandle.java
index f994bc4c..82f79787 100644
---
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/LocalDateHandle.java
+++
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/LocalDateHandle.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.dubbo.serialize.hessian.serializer.java8;
+package org.apache.dubbo.serialize.hessian.serializer.java17;
import com.caucho.hessian.io.HessianHandle;
diff --git
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/LocalDateTimeHandle.java
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/LocalDateTimeHandle.java
similarity index 96%
rename from
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/LocalDateTimeHandle.java
rename to
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/LocalDateTimeHandle.java
index 094ced53..35c60b82 100644
---
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/LocalDateTimeHandle.java
+++
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/LocalDateTimeHandle.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.dubbo.serialize.hessian.serializer.java8;
+package org.apache.dubbo.serialize.hessian.serializer.java17;
import com.caucho.hessian.io.HessianHandle;
diff --git
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/LocalTimeHandle.java
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/LocalTimeHandle.java
similarity index 96%
rename from
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/LocalTimeHandle.java
rename to
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/LocalTimeHandle.java
index b0d96199..c017ffeb 100644
---
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/LocalTimeHandle.java
+++
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/LocalTimeHandle.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.dubbo.serialize.hessian.serializer.java8;
+package org.apache.dubbo.serialize.hessian.serializer.java17;
import com.caucho.hessian.io.HessianHandle;
diff --git
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/MonthDayHandle.java
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/MonthDayHandle.java
similarity index 96%
rename from
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/MonthDayHandle.java
rename to
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/MonthDayHandle.java
index 8c19273c..9019939a 100644
---
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/MonthDayHandle.java
+++
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/MonthDayHandle.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.dubbo.serialize.hessian.serializer.java8;
+package org.apache.dubbo.serialize.hessian.serializer.java17;
import com.caucho.hessian.io.HessianHandle;
diff --git
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/OffsetDateTimeHandle.java
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/OffsetDateTimeHandle.java
similarity index 96%
rename from
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/OffsetDateTimeHandle.java
rename to
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/OffsetDateTimeHandle.java
index b785266e..0d9396a0 100644
---
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/OffsetDateTimeHandle.java
+++
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/OffsetDateTimeHandle.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.dubbo.serialize.hessian.serializer.java8;
+package org.apache.dubbo.serialize.hessian.serializer.java17;
import com.caucho.hessian.io.HessianHandle;
diff --git
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/OffsetTimeHandle.java
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/OffsetTimeHandle.java
similarity index 96%
rename from
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/OffsetTimeHandle.java
rename to
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/OffsetTimeHandle.java
index 5a573005..a8c658bb 100644
---
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/OffsetTimeHandle.java
+++
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/OffsetTimeHandle.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.dubbo.serialize.hessian.serializer.java8;
+package org.apache.dubbo.serialize.hessian.serializer.java17;
import com.caucho.hessian.io.HessianHandle;
diff --git
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/PeriodHandle.java
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/PeriodHandle.java
similarity index 96%
rename from
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/PeriodHandle.java
rename to
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/PeriodHandle.java
index d29b39f7..b0e55e62 100644
---
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/PeriodHandle.java
+++
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/PeriodHandle.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.dubbo.serialize.hessian.serializer.java8;
+package org.apache.dubbo.serialize.hessian.serializer.java17;
import com.caucho.hessian.io.HessianHandle;
diff --git
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/YearHandle.java
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/YearHandle.java
similarity index 95%
rename from
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/YearHandle.java
rename to
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/YearHandle.java
index 6560c0d8..33c375b8 100644
---
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/YearHandle.java
+++
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/YearHandle.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.dubbo.serialize.hessian.serializer.java8;
+package org.apache.dubbo.serialize.hessian.serializer.java17;
import com.caucho.hessian.io.HessianHandle;
diff --git
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/YearMonthHandle.java
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/YearMonthHandle.java
similarity index 96%
rename from
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/YearMonthHandle.java
rename to
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/YearMonthHandle.java
index 5f67c2ef..5d1317c9 100644
---
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/YearMonthHandle.java
+++
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/YearMonthHandle.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.dubbo.serialize.hessian.serializer.java8;
+package org.apache.dubbo.serialize.hessian.serializer.java17;
import com.caucho.hessian.io.HessianHandle;
diff --git
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/ZoneIdHandle.java
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/ZoneIdHandle.java
similarity index 96%
rename from
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/ZoneIdHandle.java
rename to
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/ZoneIdHandle.java
index f1254690..4eb74913 100644
---
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/ZoneIdHandle.java
+++
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/ZoneIdHandle.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.dubbo.serialize.hessian.serializer.java8;
+package org.apache.dubbo.serialize.hessian.serializer.java17;
import com.caucho.hessian.io.HessianHandle;
diff --git
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/ZoneIdSerializer.java
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/ZoneIdSerializer.java
similarity index 95%
rename from
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/ZoneIdSerializer.java
rename to
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/ZoneIdSerializer.java
index 71046702..a1c233e5 100644
---
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/ZoneIdSerializer.java
+++
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/ZoneIdSerializer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.dubbo.serialize.hessian.serializer.java8;
+package org.apache.dubbo.serialize.hessian.serializer.java17;
import com.caucho.hessian.io.AbstractHessianOutput;
diff --git
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/ZoneOffsetHandle.java
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/ZoneOffsetHandle.java
similarity index 96%
rename from
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/ZoneOffsetHandle.java
rename to
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/ZoneOffsetHandle.java
index f7e622a7..47848024 100644
---
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/ZoneOffsetHandle.java
+++
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/ZoneOffsetHandle.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.dubbo.serialize.hessian.serializer.java8;
+package org.apache.dubbo.serialize.hessian.serializer.java17;
import com.caucho.hessian.io.HessianHandle;
diff --git
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/ZonedDateTimeHandle.java
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/ZonedDateTimeHandle.java
similarity index 96%
rename from
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/ZonedDateTimeHandle.java
rename to
dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/ZonedDateTimeHandle.java
index 44b3ff53..8558e9cb 100644
---
a/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java8/ZonedDateTimeHandle.java
+++
b/dubbo-serialization-extensions/dubbo-serialization-native-hessian/src/main/java/org/apache/dubbo/serialize/hessian/serializer/java17/ZonedDateTimeHandle.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.dubbo.serialize.hessian.serializer.java8;
+package org.apache.dubbo.serialize.hessian.serializer.java17;
import com.caucho.hessian.io.HessianHandle;
diff --git
a/dubbo-serialization-extensions/dubbo-serialization-protobuf/src/main/java/org/apache/dubbo/common/serialize/protobuf/support/ProtobufUtils.java
b/dubbo-serialization-extensions/dubbo-serialization-protobuf/src/main/java/org/apache/dubbo/common/serialize/protobuf/support/ProtobufUtils.java
index 42285ca1..2f6fd916 100644
---
a/dubbo-serialization-extensions/dubbo-serialization-protobuf/src/main/java/org/apache/dubbo/common/serialize/protobuf/support/ProtobufUtils.java
+++
b/dubbo-serialization-extensions/dubbo-serialization-protobuf/src/main/java/org/apache/dubbo/common/serialize/protobuf/support/ProtobufUtils.java
@@ -100,7 +100,7 @@ public class ProtobufUtils {
private static Builder getMessageBuilder(Class<?> requestType) throws
Exception {
Method method = requestType.getMethod("newBuilder");
- return (Builder) method.invoke(null, null);
+ return (Builder) method.invoke(null, (Object[]) null);
}
diff --git
a/dubbo-serialization-extensions/dubbo-serialization-test/src/main/java/org/apache/dubbo/common/serialize/base/AbstractSerializationTest.java
b/dubbo-serialization-extensions/dubbo-serialization-test/src/main/java/org/apache/dubbo/common/serialize/base/AbstractSerializationTest.java
index c0b790d7..c7a352a0 100644
---
a/dubbo-serialization-extensions/dubbo-serialization-test/src/main/java/org/apache/dubbo/common/serialize/base/AbstractSerializationTest.java
+++
b/dubbo-serialization-extensions/dubbo-serialization-test/src/main/java/org/apache/dubbo/common/serialize/base/AbstractSerializationTest.java
@@ -889,22 +889,22 @@ public abstract class AbstractSerializationTest {
@Test
public void test_ByteWrap() throws Exception {
- assertObject(new Byte((byte) 12));
+ assertObject(Byte.valueOf((byte) 12));
}
@Test
public void test_ByteWrap_withType() throws Exception {
- assertObjectWithType(new Byte((byte) 12), Byte.class);
+ assertObjectWithType(Byte.valueOf((byte) 12), Byte.class);
}
@Test
public void test_LongWrap() throws Exception {
- assertObject(new Long(12));
+ assertObject(Long.valueOf(12));
}
@Test
public void test_LongWrap_withType() throws Exception {
- assertObjectWithType(new Long(12), Long.class);
+ assertObjectWithType(Long.valueOf(12), Long.class);
}
@Test
diff --git
a/dubbo-service-discovery-extensions/dubbo-service-discovery-springcloud/pom.xml
b/dubbo-service-discovery-extensions/dubbo-service-discovery-springcloud/pom.xml
index 236b6845..235db37c 100644
---
a/dubbo-service-discovery-extensions/dubbo-service-discovery-springcloud/pom.xml
+++
b/dubbo-service-discovery-extensions/dubbo-service-discovery-springcloud/pom.xml
@@ -26,10 +26,11 @@
<artifactId>dubbo-service-discovery-springcloud</artifactId>
<version>${revision}</version>
+ <packaging>jar</packaging>
<properties>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
diff --git a/dubbo-service-discovery-extensions/pom.xml
b/dubbo-service-discovery-extensions/pom.xml
index bf24ee82..af7a7eea 100644
--- a/dubbo-service-discovery-extensions/pom.xml
+++ b/dubbo-service-discovery-extensions/pom.xml
@@ -28,8 +28,8 @@
<artifactId>dubbo-service-discovery-extensions</artifactId>
<properties>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
diff --git a/dubbo-xds/pom.xml b/dubbo-xds/pom.xml
index 7bc7c3a9..5abc7670 100644
--- a/dubbo-xds/pom.xml
+++ b/dubbo-xds/pom.xml
@@ -82,17 +82,21 @@
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
+ <artifactId>bcprov-jdk18on</artifactId>
+ <version>1.76</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
+ <artifactId>bcpkix-jdk18on</artifactId>
+ <version>1.76</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-ext-jdk15on</artifactId>
+ <artifactId>bcprov-ext-jdk18on</artifactId>
+ <version>1.76</version>
</dependency>
+
</dependencies>
<build>
diff --git
a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/XdsProtocol.java
b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/XdsProtocol.java
index ce1a0881..cccf6c81 100644
---
a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/XdsProtocol.java
+++
b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/XdsProtocol.java
@@ -38,4 +38,5 @@ public interface XdsProtocol<T> {
* @return requestId, used when resourceNames update with {@link
XdsProtocol#updateObserve(long, Set)}
*/
void observeResource(Set<String> resourceNames, Consumer<Map<String, T>>
consumer, boolean isReConnect);
+ void updateObserve(long requestId, Set<String> resourceNames);
}
diff --git
a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/impl/EdsProtocol.java
b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/impl/EdsProtocol.java
index 987be418..ebe22267 100644
---
a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/impl/EdsProtocol.java
+++
b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/impl/EdsProtocol.java
@@ -94,4 +94,9 @@ public class EdsProtocol extends
AbstractProtocol<EndpointResult, DeltaEndpoint>
return null;
}
}
+
+ @Override
+ public void updateObserve(long requestId, Set<String> resourceNames) {
+
+ }
}
diff --git
a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/impl/LdsProtocol.java
b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/impl/LdsProtocol.java
index e4494e28..fabecea8 100644
---
a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/impl/LdsProtocol.java
+++
b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/impl/LdsProtocol.java
@@ -103,4 +103,9 @@ public class LdsProtocol extends
AbstractProtocol<ListenerResult, DeltaListener>
return null;
}
}
+
+ @Override
+ public void updateObserve(long requestId, Set<String> resourceNames) {
+
+ }
}
diff --git
a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/impl/RdsProtocol.java
b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/impl/RdsProtocol.java
index 6d7ddade..d428696e 100644
---
a/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/impl/RdsProtocol.java
+++
b/dubbo-xds/src/main/java/org/apache/dubbo/registry/xds/util/protocol/impl/RdsProtocol.java
@@ -89,4 +89,9 @@ public class RdsProtocol extends
AbstractProtocol<RouteResult, DeltaRoute> {
return null;
}
}
+
+ @Override
+ public void updateObserve(long requestId, Set<String> resourceNames) {
+
+ }
}
diff --git
a/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/XdsRouter.java
b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/XdsRouter.java
index e043e2d3..2b607d5a 100644
---
a/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/XdsRouter.java
+++
b/dubbo-xds/src/main/java/org/apache/dubbo/rpc/cluster/router/xds/XdsRouter.java
@@ -77,9 +77,8 @@ public class XdsRouter<T> extends AbstractStateRouter<T>
implements XdsRouteRule
currentInvokeList = new BitList<>(new ArrayList<>());
}
- /**
- * @deprecated only for uts
- */
+
+ @Deprecated
protected XdsRouter(
URL url, RdsRouteRuleManager rdsRouteRuleManager,
EdsEndpointManager edsEndpointManager, boolean isEnable) {
super(url);
diff --git a/pom.xml b/pom.xml
index 5194146e..f9760457 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,9 +119,11 @@
<jaxb_api_version>2.2.7</jaxb_api_version>
<cglib_version>2.2.2</cglib_version>
<mockito_version>4.11.0</mockito_version>
- <!-- for maven compiler plugin -->
- <java_source_version>1.8</java_source_version>
- <java_target_version>1.8</java_target_version>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <java_source_version>17</java_source_version>
+ <java_target_version>17</java_target_version>
<file_encoding>UTF-8</file_encoding>
<!-- Build args -->
<argline>-server -Xms256m -Xmx512m -Dfile.encoding=UTF-8
@@ -283,7 +285,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>${maven_jacoco_version}</version>
+ <version>0.8.12</version>
<executions>
<execution>
<id>jacoco-initialize</id>
@@ -295,17 +297,40 @@
</configuration>
</execution>
<execution>
- <id>report-aggregate</id>
+ <id>jacoco-report</id>
<phase>verify</phase>
<goals>
<goal>report</goal>
</goals>
<configuration>
<includes>
- <include>target/classes/**/*</include>
- <include>target/classes/**</include>
- <include>**/*</include>
+ <include>**/target/classes/**/*</include>
+
<include>**/target/generated-sources/**/*</include>
</includes>
+ <excludes>
+ <exclude>**/test/**</exclude>
+ <exclude>**/generated/**</exclude>
+ <exclude>**/examples/**</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>jacoco-aggregate</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>report-aggregate</goal>
+ </goals>
+ <configuration>
+
<dataFile>${project.build.directory}/jacoco.exec</dataFile>
+
<outputDirectory>${project.reporting.outputDirectory}/jacoco-aggregate</outputDirectory>
+ <includes>
+ <include>**/target/classes/**/*</include>
+ </includes>
+ <excludes>
+ <exclude>**/test/**</exclude>
+ <exclude>**/generated/**</exclude>
+ <exclude>**/examples/**</exclude>
+ </excludes>
</configuration>
</execution>
</executions>
@@ -533,7 +558,7 @@
<profile>
<id>javadoc-lint</id>
<activation>
- <jdk>[1.8,)</jdk>
+ <jdk>[17,)</jdk>
</activation>
<properties>
<doclint>none</doclint>
@@ -564,24 +589,19 @@
<profile>
<id>checkstyle_def</id>
<activation>
- <jdk>[1.8,)</jdk>
+ <jdk>[17,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>${maven_checkstyle_version}</version>
+ <version>3.6.0</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>8.41</version>
- </dependency>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-build-tools</artifactId>
- <version>1.0.0</version>
+ <version>10.12.3</version>
</dependency>
</dependencies>
<executions>
@@ -591,7 +611,6 @@
<configuration>
<configLocation>./codestyle/checkstyle.xml</configLocation>
<suppressionsLocation>./codestyle/checkstyle-suppressions.xml</suppressionsLocation>
- <encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failOnViolation>true</failOnViolation>
<skip>${checkstyle.skip}</skip>
@@ -614,7 +633,6 @@
<phase>validate</phase>
<configuration>
<configLocation>./codestyle/checkstyle_unix.xml</configLocation>
- <encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failOnViolation>true</failOnViolation>
<skip>${checkstyle_unix.skip}</skip>
@@ -770,14 +788,14 @@
<profile>
<id>jdk9-compile</id>
<activation>
- <jdk>[1.9,)</jdk>
+ <jdk>[17,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <release>8</release>
+ <release>17</release>
</configuration>
</plugin>
</plugins>
