Skip to content

Commit c43b631

Browse files
committed
Merge branch 'apache-3.1' into apache-3.2
# Conflicts: # .github/workflows/build-and-test-pr.yml # dubbo-common/src/main/resources/security/serialize.allowlist # dubbo-dependencies-bom/pom.xml # dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml # dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml # pom.xml
2 parents f8980fe + a8bbc23 commit c43b631

File tree

3 files changed

+2
-10
lines changed

3 files changed

+2
-10
lines changed

.github/workflows/build-and-test-pr.yml

-9
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,6 @@ jobs:
7979
with:
8080
name: "class-file"
8181
path: ${{ github.workspace }}/class.zip
82-
- name: "Pack rat file if failure"
83-
if: failure()
84-
run: 7z a ${{ github.workspace }}/rat.zip *rat.txt -r
85-
- name: "Upload rat file if failure"
86-
if: failure()
87-
uses: actions/upload-artifact@v3
88-
with:
89-
name: "rat-file"
90-
path: ${{ github.workspace }}/rat.zip
9182
- name: "Pack checkstyle file if failure"
9283
if: failure()
9384
run: 7z a ${{ github.workspace }}/checkstyle.zip *checkstyle* -r

dubbo-common/src/main/resources/security/serialize.allowlist

+1
Original file line numberDiff line numberDiff line change
@@ -124,3 +124,4 @@ java.util.UUID
124124
java.util.WeakHashMap
125125
org.apache.dubbo
126126
com.alibaba.dubbo
127+
com.alibaba.com.caucho.hessian.io.java8

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@
272272
<jacoco.skip>false</jacoco.skip>
273273
</properties>
274274
</profile>
275-
275+
276276
<!-- check code style: mvn validate -Pcheckstyle -->
277277
<profile>
278278
<id>checkstyle</id>

0 commit comments

Comments
 (0)