Skip to content

Commit 20df4ad

Browse files
oxseanoxsean
committed
test
1 parent 35259a7 commit 20df4ad

File tree

101 files changed

+555
-857
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+555
-857
lines changed

‎.artifacts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ dubbo-core-spi
4141
dubbo-dependencies
4242
dubbo-dependencies-all
4343
dubbo-dependencies-bom
44+
dubbo-dependencies-sample
4445
dubbo-dependencies-zookeeper
4546
dubbo-dependencies-zookeeper-curator5
4647
dubbo-distribution

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ jobs:
193193
openssl rsautl -decrypt -in ${{ github.workspace }}/.tmp/encrypted-sonarcloud-token -out ${{ github.workspace }}/.tmp/decrypted-sonarcloud-token -inkey ${{ github.workspace }}/.tmp/rsa/rsa_private.pem
194194
- name: "Test with Maven with SonarCloud Scan"
195195
if: ${{ github.repository == 'apache/dubbo' }}
196-
timeout-minutes: 70
196+
timeout-minutes: 120
197197
env:
198198
# Needed to get some information about the pull request, if any
199199
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -202,7 +202,7 @@ jobs:
202202
./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean test verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Pjacoco,jdk15ge-simple,'!jdk15ge',jacoco089 -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache_dubbo -DtrimStackTrace=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper -Dsonar.coverage.jacoco.xmlReportPaths=dubbo-test/dubbo-dependencies-all/target/site/jacoco-aggregate/jacoco.xml -Dsonar.login=${SONAR_TOKEN}
203203
- name: "Test with Maven without SonarCloud Scan"
204204
if: ${{ github.repository != 'apache/dubbo' }}
205-
timeout-minutes: 70
205+
timeout-minutes: 120
206206
run: |
207207
./mvnw --batch-mode --no-snapshot-updates -e --no-transfer-progress --fail-fast clean test verify -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Pjacoco,jdk15ge-simple,'!jdk15ge',jacoco089 -DtrimStackTrace=false -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper
208208
- name: "Upload coverage result"
@@ -218,8 +218,8 @@ jobs:
218218
steps:
219219
- uses: actions/checkout@v3
220220
with:
221-
repository: 'apache/dubbo-samples'
222-
ref: master
221+
repository: 'oxsean/dubbo-samples'
222+
ref: test
223223
- name: "Prepare test list"
224224
run: |
225225
bash ./test/scripts/prepare-test.sh
@@ -244,8 +244,8 @@ jobs:
244244
steps:
245245
- uses: actions/checkout@v3
246246
with:
247-
repository: 'apache/dubbo-samples'
248-
ref: master
247+
repository: 'oxsean/dubbo-samples'
248+
ref: test
249249
- name: "Cache local Maven repository"
250250
uses: actions/cache@v3
251251
with:
@@ -306,8 +306,8 @@ jobs:
306306
steps:
307307
- uses: actions/checkout@v3
308308
with:
309-
repository: 'apache/dubbo-samples'
310-
ref: master
309+
repository: 'oxsean/dubbo-samples'
310+
ref: test
311311
- name: "Download test result"
312312
uses: actions/download-artifact@v3
313313
with:
@@ -325,7 +325,7 @@ jobs:
325325
path: "./dubbo"
326326
- uses: actions/checkout@v3
327327
with:
328-
repository: 'apache/dubbo-samples'
328+
repository: 'oxsean/dubbo-samples'
329329
path: "./dubbo-samples"
330330
- name: "Set up JDK 21"
331331
uses: actions/setup-java@v3

‎.licenserc.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,6 @@ dependency:
170170
license: MIT
171171
- name: org.slf4j:slf4j-log4j12
172172
license: MIT
173-
- name: org.slf4j:slf4j-reload4j
174-
license: MIT
175173
- name: org.jboss.resteasy:resteasy-jaxrs
176174
license: Apache-2.0
177175
- name: org.jboss.resteasy:resteasy-client

‎dubbo-annotation-processor/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
<version>1.0.0</version>
2929

3030
<properties>
31-
<maven.compiler.source>8</maven.compiler.source>
32-
<maven.compiler.target>8</maven.compiler.target>
31+
<maven.compiler.source>1.8</maven.compiler.source>
32+
<maven.compiler.target>1.8</maven.compiler.target>
3333
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3434

3535
<!-- System dependencies may cause problems in checkstyle. -->

‎dubbo-cluster/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@
9494
<scope>test</scope>
9595
</dependency>
9696
<dependency>
97-
<groupId>log4j</groupId>
98-
<artifactId>log4j</artifactId>
97+
<groupId>org.slf4j</groupId>
98+
<artifactId>slf4j-log4j12</artifactId>
9999
<scope>test</scope>
100100
</dependency>
101101
</dependencies>

‎dubbo-common/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,5 +100,16 @@
100100
<groupId>javax.annotation</groupId>
101101
<artifactId>javax.annotation-api</artifactId>
102102
</dependency>
103+
104+
<dependency>
105+
<groupId>cglib</groupId>
106+
<artifactId>cglib-nodep</artifactId>
107+
<scope>test</scope>
108+
</dependency>
109+
<dependency>
110+
<groupId>org.slf4j</groupId>
111+
<artifactId>slf4j-log4j12</artifactId>
112+
<scope>test</scope>
113+
</dependency>
103114
</dependencies>
104115
</project>

‎dubbo-compatible/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
<version>${project.parent.version}</version>
6060
</dependency>
6161
<dependency>
62-
<groupId>log4j</groupId>
63-
<artifactId>log4j</artifactId>
62+
<groupId>org.slf4j</groupId>
63+
<artifactId>slf4j-log4j12</artifactId>
6464
<optional>true</optional>
6565
</dependency>
6666
<dependency>

‎dubbo-compiler/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,6 @@
6969
<artifactId>maven-compiler-plugin</artifactId>
7070
<configuration>
7171
<compilerArgument>-proc:none</compilerArgument>
72-
<fork>true</fork>
73-
<source>${java_source_version}</source>
74-
<target>${java_target_version}</target>
75-
<encoding>${file_encoding}</encoding>
7672
</configuration>
7773
</plugin>
7874

‎dubbo-config/dubbo-config-api/pom.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,8 @@
171171
<scope>test</scope>
172172
</dependency>
173173
<dependency>
174-
<groupId>log4j</groupId>
175-
<artifactId>log4j</artifactId>
174+
<groupId>org.slf4j</groupId>
175+
<artifactId>slf4j-log4j12</artifactId>
176176
<scope>test</scope>
177177
</dependency>
178178

@@ -263,7 +263,5 @@
263263
<artifactId>resteasy-jackson-provider</artifactId>
264264
<scope>test</scope>
265265
</dependency>
266-
267-
268266
</dependencies>
269267
</project>

‎dubbo-config/dubbo-config-spring/pom.xml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,17 +197,22 @@
197197
<scope>test</scope>
198198
<exclusions>
199199
<exclusion>
200-
<artifactId>junit-vintage-engine</artifactId>
201-
<groupId>org.junit.vintage</groupId>
200+
<artifactId>logback-classic</artifactId>
201+
<groupId>ch.qos.logback</groupId>
202202
</exclusion>
203-
<!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 -->
204203
<exclusion>
204+
<artifactId>log4j-to-slf4j</artifactId>
205205
<groupId>org.apache.logging.log4j</groupId>
206-
<artifactId>log4j-api</artifactId>
207206
</exclusion>
208207
</exclusions>
209208
</dependency>
210209

210+
<dependency>
211+
<groupId>org.slf4j</groupId>
212+
<artifactId>slf4j-log4j12</artifactId>
213+
<scope>test</scope>
214+
</dependency>
215+
211216
<!-- Zookeeper dependencies for testing -->
212217
<dependency>
213218
<groupId>org.apache.dubbo</groupId>

‎dubbo-config/dubbo-config-spring6/pom.xml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<properties>
2828
<maven.compiler.source>17</maven.compiler.source>
2929
<maven.compiler.target>17</maven.compiler.target>
30-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3130
<spring.version>6.0.11</spring.version>
3231
<spring-boot.version>3.0.9</spring-boot.version>
3332
</properties>
@@ -78,17 +77,20 @@
7877
<scope>test</scope>
7978
<exclusions>
8079
<exclusion>
81-
<artifactId>junit-vintage-engine</artifactId>
82-
<groupId>org.junit.vintage</groupId>
80+
<artifactId>logback-classic</artifactId>
81+
<groupId>ch.qos.logback</groupId>
8382
</exclusion>
84-
<!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 -->
8583
<exclusion>
84+
<artifactId>log4j-to-slf4j</artifactId>
8685
<groupId>org.apache.logging.log4j</groupId>
87-
<artifactId>log4j-api</artifactId>
8886
</exclusion>
8987
</exclusions>
9088
</dependency>
91-
89+
<dependency>
90+
<groupId>org.slf4j</groupId>
91+
<artifactId>slf4j-log4j12</artifactId>
92+
<scope>test</scope>
93+
</dependency>
9294
</dependencies>
9395

9496
</project>

‎dubbo-container/dubbo-container-spring/pom.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,7 @@
4141
</dependency>
4242
<dependency>
4343
<groupId>org.slf4j</groupId>
44-
<artifactId>slf4j-api</artifactId>
45-
<scope>test</scope>
46-
</dependency>
47-
<dependency>
48-
<groupId>log4j</groupId>
49-
<artifactId>log4j</artifactId>
44+
<artifactId>slf4j-log4j12</artifactId>
5045
<scope>test</scope>
5146
</dependency>
5247
</dependencies>

‎dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-consumer/pom.xml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@
2929

3030
<artifactId>dubbo-demo-annotation-consumer</artifactId>
3131

32-
<properties>
33-
<skip_maven_deploy>true</skip_maven_deploy>
34-
<slf4j-log4j12.version>1.7.36</slf4j-log4j12.version>
35-
</properties>
36-
3732
<dependencies>
3833
<dependency>
3934
<groupId>org.apache.dubbo</groupId>
@@ -104,18 +99,6 @@
10499
<artifactId>dubbo-serialization-fastjson2</artifactId>
105100
<version>${project.version}</version>
106101
</dependency>
107-
<dependency>
108-
<groupId>org.slf4j</groupId>
109-
<artifactId>slf4j-api</artifactId>
110-
</dependency>
111-
<dependency>
112-
<groupId>org.slf4j</groupId>
113-
<artifactId>slf4j-log4j12</artifactId>
114-
</dependency>
115-
<dependency>
116-
<groupId>log4j</groupId>
117-
<artifactId>log4j</artifactId>
118-
</dependency>
119102
</dependencies>
120103

121104
</project>

‎dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-provider/pom.xml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929

3030
<artifactId>dubbo-demo-annotation-provider</artifactId>
3131

32-
<properties>
33-
<skip_maven_deploy>true</skip_maven_deploy>
34-
</properties>
35-
3632
<dependencies>
3733
<dependency>
3834
<groupId>org.apache.dubbo</groupId>
@@ -103,18 +99,6 @@
10399
<artifactId>dubbo-serialization-fastjson2</artifactId>
104100
<version>${project.version}</version>
105101
</dependency>
106-
<dependency>
107-
<groupId>org.slf4j</groupId>
108-
<artifactId>slf4j-api</artifactId>
109-
</dependency>
110-
<dependency>
111-
<groupId>org.slf4j</groupId>
112-
<artifactId>slf4j-log4j12</artifactId>
113-
</dependency>
114-
<dependency>
115-
<groupId>log4j</groupId>
116-
<artifactId>log4j</artifactId>
117-
</dependency>
118102
</dependencies>
119103

120104
</project>

‎dubbo-demo/dubbo-demo-annotation/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
<artifactId>dubbo-demo-annotation</artifactId>
3030

3131
<properties>
32-
<skip_maven_deploy>true</skip_maven_deploy>
3332
<spring-boot-maven-plugin.version>2.7.16</spring-boot-maven-plugin.version>
3433
</properties>
3534

‎dubbo-demo/dubbo-demo-api/dubbo-demo-api-consumer/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929

3030
<artifactId>dubbo-demo-api-consumer</artifactId>
3131

32-
<properties>
33-
<skip_maven_deploy>true</skip_maven_deploy>
34-
</properties>
35-
3632
<dependencies>
3733
<dependency>
3834
<groupId>org.apache.dubbo</groupId>

‎dubbo-demo/dubbo-demo-api/dubbo-demo-api-provider/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@
3030

3131
<artifactId>dubbo-demo-api-provider</artifactId>
3232

33-
<properties>
34-
<skip_maven_deploy>true</skip_maven_deploy>
35-
<slf4j-log4j12.version>1.7.33</slf4j-log4j12.version>
36-
</properties>
37-
3833
<dependencies>
3934
<dependency>
4035
<groupId>org.apache.dubbo</groupId>
@@ -101,6 +96,5 @@
10196
<artifactId>dubbo-serialization-fastjson2</artifactId>
10297
<version>${project.version}</version>
10398
</dependency>
104-
10599
</dependencies>
106100
</project>

‎dubbo-demo/dubbo-demo-api/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
</modules>
3636

3737
<properties>
38-
<skip_maven_deploy>true</skip_maven_deploy>
3938
<spring-boot-maven-plugin.version>2.7.16</spring-boot-maven-plugin.version>
4039
</properties>
4140

‎dubbo-demo/dubbo-demo-generic-call/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929

3030
<artifactId>dubbo-demo-generic-call</artifactId>
3131

32-
<properties>
33-
<skip_maven_deploy>true</skip_maven_deploy>
34-
</properties>
35-
3632
<dependencies>
3733
<dependency>
3834
<groupId>org.apache.dubbo</groupId>

‎dubbo-demo/dubbo-demo-interface/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
<packaging>jar</packaging>
2727
<name>${project.artifactId}</name>
2828
<description>The demo module of dubbo project</description>
29-
<properties>
30-
<skip_maven_deploy>true</skip_maven_deploy>
31-
</properties>
3229

3330
<dependencies>
3431
<dependency>
@@ -48,6 +45,5 @@
4845
<groupId>org.springframework</groupId>
4946
<artifactId>spring-web</artifactId>
5047
</dependency>
51-
5248
</dependencies>
5349
</project>

0 commit comments

Comments
 (0)