Skip to content

Commit 25261b7

Browse files
taojintianxiataojintianxia
authored
Merge pull request #2301 from terrymanu/master
Refactor log dependencies
2 parents fffabf5 + d213fba commit 25261b7

File tree

14 files changed

+10
-202
lines changed

14 files changed

+10
-202
lines changed

‎ecosystem/error-handler/type/dingtalk/pom.xml

-19
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@
4343
<scope>test</scope>
4444
</dependency>
4545

46-
<dependency>
47-
<groupId>org.slf4j</groupId>
48-
<artifactId>slf4j-api</artifactId>
49-
</dependency>
5046
<dependency>
5147
<groupId>org.apache.httpcomponents</groupId>
5248
<artifactId>httpclient</artifactId>
@@ -55,20 +51,5 @@
5551
<groupId>org.apache.httpcomponents</groupId>
5652
<artifactId>httpcore</artifactId>
5753
</dependency>
58-
<dependency>
59-
<groupId>ch.qos.logback</groupId>
60-
<artifactId>logback-classic</artifactId>
61-
<scope>test</scope>
62-
</dependency>
63-
<dependency>
64-
<groupId>org.slf4j</groupId>
65-
<artifactId>log4j-over-slf4j</artifactId>
66-
<scope>test</scope>
67-
</dependency>
68-
<dependency>
69-
<groupId>org.slf4j</groupId>
70-
<artifactId>jcl-over-slf4j</artifactId>
71-
<scope>test</scope>
72-
</dependency>
7354
</dependencies>
7455
</project>

‎ecosystem/error-handler/type/email/pom.xml

+1-20
Original file line numberDiff line numberDiff line change
@@ -36,29 +36,10 @@
3636
<artifactId>elasticjob-error-handler-general</artifactId>
3737
<version>${project.parent.version}</version>
3838
</dependency>
39-
<dependency>
40-
<groupId>org.slf4j</groupId>
41-
<artifactId>slf4j-api</artifactId>
42-
</dependency>
39+
4340
<dependency>
4441
<groupId>com.sun.mail</groupId>
4542
<artifactId>javax.mail</artifactId>
4643
</dependency>
47-
48-
<dependency>
49-
<groupId>ch.qos.logback</groupId>
50-
<artifactId>logback-classic</artifactId>
51-
<scope>test</scope>
52-
</dependency>
53-
<dependency>
54-
<groupId>org.slf4j</groupId>
55-
<artifactId>log4j-over-slf4j</artifactId>
56-
<scope>test</scope>
57-
</dependency>
58-
<dependency>
59-
<groupId>org.slf4j</groupId>
60-
<artifactId>jcl-over-slf4j</artifactId>
61-
<scope>test</scope>
62-
</dependency>
6344
</dependencies>
6445
</project>

‎ecosystem/error-handler/type/general/pom.xml

-11
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,5 @@
3636
<artifactId>elasticjob-infra</artifactId>
3737
<version>${project.parent.version}</version>
3838
</dependency>
39-
40-
<dependency>
41-
<groupId>org.slf4j</groupId>
42-
<artifactId>slf4j-api</artifactId>
43-
</dependency>
44-
45-
<dependency>
46-
<groupId>ch.qos.logback</groupId>
47-
<artifactId>logback-classic</artifactId>
48-
<scope>test</scope>
49-
</dependency>
5039
</dependencies>
5140
</project>

‎ecosystem/error-handler/type/wechat/pom.xml

-19
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@
4343
<scope>test</scope>
4444
</dependency>
4545

46-
<dependency>
47-
<groupId>org.slf4j</groupId>
48-
<artifactId>slf4j-api</artifactId>
49-
</dependency>
5046
<dependency>
5147
<groupId>org.apache.httpcomponents</groupId>
5248
<artifactId>httpclient</artifactId>
@@ -55,20 +51,5 @@
5551
<groupId>org.apache.httpcomponents</groupId>
5652
<artifactId>httpcore</artifactId>
5753
</dependency>
58-
<dependency>
59-
<groupId>ch.qos.logback</groupId>
60-
<artifactId>logback-classic</artifactId>
61-
<scope>test</scope>
62-
</dependency>
63-
<dependency>
64-
<groupId>org.slf4j</groupId>
65-
<artifactId>log4j-over-slf4j</artifactId>
66-
<scope>test</scope>
67-
</dependency>
68-
<dependency>
69-
<groupId>org.slf4j</groupId>
70-
<artifactId>jcl-over-slf4j</artifactId>
71-
<scope>test</scope>
72-
</dependency>
7354
</dependencies>
7455
</project>

‎ecosystem/executor/kernel/pom.xml

-6
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,5 @@
4747
<artifactId>elasticjob-error-handler-general</artifactId>
4848
<version>${project.parent.version}</version>
4949
</dependency>
50-
51-
<dependency>
52-
<groupId>ch.qos.logback</groupId>
53-
<artifactId>logback-classic</artifactId>
54-
<scope>test</scope>
55-
</dependency>
5650
</dependencies>
5751
</project>

‎ecosystem/executor/type/http/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
<dependency>
5050
<groupId>org.awaitility</groupId>
5151
<artifactId>awaitility</artifactId>
52-
<scope>test</scope>
5352
</dependency>
5453
</dependencies>
5554
</project>

‎ecosystem/tracing/api/pom.xml

-21
Original file line numberDiff line numberDiff line change
@@ -42,26 +42,5 @@
4242
<groupId>org.apache.commons</groupId>
4343
<artifactId>commons-lang3</artifactId>
4444
</dependency>
45-
<dependency>
46-
<groupId>org.slf4j</groupId>
47-
<artifactId>slf4j-api</artifactId>
48-
<version>${slf4j.version}</version>
49-
</dependency>
50-
51-
<dependency>
52-
<groupId>org.slf4j</groupId>
53-
<artifactId>jcl-over-slf4j</artifactId>
54-
<scope>test</scope>
55-
</dependency>
56-
<dependency>
57-
<groupId>org.slf4j</groupId>
58-
<artifactId>log4j-over-slf4j</artifactId>
59-
<scope>test</scope>
60-
</dependency>
61-
<dependency>
62-
<groupId>ch.qos.logback</groupId>
63-
<artifactId>logback-classic</artifactId>
64-
<scope>test</scope>
65-
</dependency>
6645
</dependencies>
6746
</project>

‎ecosystem/tracing/rdb/pom.xml

-15
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,6 @@
3333
<version>${project.parent.version}</version>
3434
</dependency>
3535

36-
<dependency>
37-
<groupId>org.slf4j</groupId>
38-
<artifactId>jcl-over-slf4j</artifactId>
39-
<scope>test</scope>
40-
</dependency>
41-
<dependency>
42-
<groupId>org.slf4j</groupId>
43-
<artifactId>log4j-over-slf4j</artifactId>
44-
<scope>test</scope>
45-
</dependency>
46-
<dependency>
47-
<groupId>ch.qos.logback</groupId>
48-
<artifactId>logback-classic</artifactId>
49-
<scope>test</scope>
50-
</dependency>
5136
<dependency>
5237
<groupId>org.apache.commons</groupId>
5338
<artifactId>commons-dbcp2</artifactId>

‎infra/pom.xml

-21
Original file line numberDiff line numberDiff line change
@@ -45,31 +45,10 @@
4545
<groupId>com.google.code.gson</groupId>
4646
<artifactId>gson</artifactId>
4747
</dependency>
48-
<dependency>
49-
<groupId>org.slf4j</groupId>
50-
<artifactId>slf4j-api</artifactId>
51-
<version>${slf4j.version}</version>
52-
</dependency>
5348

54-
<dependency>
55-
<groupId>org.slf4j</groupId>
56-
<artifactId>jcl-over-slf4j</artifactId>
57-
<scope>test</scope>
58-
</dependency>
59-
<dependency>
60-
<groupId>org.slf4j</groupId>
61-
<artifactId>log4j-over-slf4j</artifactId>
62-
<scope>test</scope>
63-
</dependency>
64-
<dependency>
65-
<groupId>ch.qos.logback</groupId>
66-
<artifactId>logback-classic</artifactId>
67-
<scope>test</scope>
68-
</dependency>
6949
<dependency>
7050
<groupId>org.awaitility</groupId>
7151
<artifactId>awaitility</artifactId>
72-
<scope>test</scope>
7352
</dependency>
7453
</dependencies>
7554
</project>

‎kernel/pom.xml

-16
Original file line numberDiff line numberDiff line change
@@ -94,25 +94,9 @@
9494
<groupId>org.apache.curator</groupId>
9595
<artifactId>curator-test</artifactId>
9696
</dependency>
97-
<dependency>
98-
<groupId>org.slf4j</groupId>
99-
<artifactId>jcl-over-slf4j</artifactId>
100-
<scope>test</scope>
101-
</dependency>
102-
<dependency>
103-
<groupId>org.slf4j</groupId>
104-
<artifactId>log4j-over-slf4j</artifactId>
105-
<scope>test</scope>
106-
</dependency>
107-
<dependency>
108-
<groupId>ch.qos.logback</groupId>
109-
<artifactId>logback-classic</artifactId>
110-
<scope>test</scope>
111-
</dependency>
11297
<dependency>
11398
<groupId>org.awaitility</groupId>
11499
<artifactId>awaitility</artifactId>
115-
<scope>test</scope>
116100
</dependency>
117101
</dependencies>
118102
</project>

‎lifecycle/pom.xml

-15
Original file line numberDiff line numberDiff line change
@@ -47,20 +47,5 @@
4747
<groupId>org.apache.curator</groupId>
4848
<artifactId>curator-test</artifactId>
4949
</dependency>
50-
<dependency>
51-
<groupId>org.slf4j</groupId>
52-
<artifactId>jcl-over-slf4j</artifactId>
53-
<scope>test</scope>
54-
</dependency>
55-
<dependency>
56-
<groupId>org.slf4j</groupId>
57-
<artifactId>log4j-over-slf4j</artifactId>
58-
<scope>test</scope>
59-
</dependency>
60-
<dependency>
61-
<groupId>ch.qos.logback</groupId>
62-
<artifactId>logback-classic</artifactId>
63-
<scope>test</scope>
64-
</dependency>
6550
</dependencies>
6651
</project>

‎pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,10 @@
353353
<groupId>com.google.guava</groupId>
354354
<artifactId>guava</artifactId>
355355
</dependency>
356+
<dependency>
357+
<groupId>org.slf4j</groupId>
358+
<artifactId>slf4j-api</artifactId>
359+
</dependency>
356360

357361
<dependency>
358362
<groupId>org.projectlombok</groupId>
@@ -384,6 +388,11 @@
384388
<artifactId>mockito-junit-jupiter</artifactId>
385389
<scope>test</scope>
386390
</dependency>
391+
<dependency>
392+
<groupId>ch.qos.logback</groupId>
393+
<artifactId>logback-classic</artifactId>
394+
<scope>test</scope>
395+
</dependency>
387396
</dependencies>
388397

389398
<build>

‎registry-center/api/pom.xml

-23
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,4 @@
2525
</parent>
2626
<artifactId>elasticjob-registry-center-api</artifactId>
2727
<name>${project.artifactId}</name>
28-
29-
<dependencies>
30-
<dependency>
31-
<groupId>org.slf4j</groupId>
32-
<artifactId>slf4j-api</artifactId>
33-
</dependency>
34-
35-
<dependency>
36-
<groupId>org.slf4j</groupId>
37-
<artifactId>jcl-over-slf4j</artifactId>
38-
<scope>test</scope>
39-
</dependency>
40-
<dependency>
41-
<groupId>org.slf4j</groupId>
42-
<artifactId>log4j-over-slf4j</artifactId>
43-
<scope>test</scope>
44-
</dependency>
45-
<dependency>
46-
<groupId>ch.qos.logback</groupId>
47-
<artifactId>logback-classic</artifactId>
48-
<scope>test</scope>
49-
</dependency>
50-
</dependencies>
5128
</project>

‎registry-center/provider/zookeeper-curator/pom.xml

-15
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,5 @@
5050
<groupId>org.apache.curator</groupId>
5151
<artifactId>curator-test</artifactId>
5252
</dependency>
53-
<dependency>
54-
<groupId>org.slf4j</groupId>
55-
<artifactId>jcl-over-slf4j</artifactId>
56-
<scope>test</scope>
57-
</dependency>
58-
<dependency>
59-
<groupId>org.slf4j</groupId>
60-
<artifactId>log4j-over-slf4j</artifactId>
61-
<scope>test</scope>
62-
</dependency>
63-
<dependency>
64-
<groupId>ch.qos.logback</groupId>
65-
<artifactId>logback-classic</artifactId>
66-
<scope>test</scope>
67-
</dependency>
6853
</dependencies>
6954
</project>

0 commit comments

Comments
 (0)