Skip to content

Commit 9d41bef

Browse files
author
gituser
committed
Merge branch '1.8_release_3.10.x' into 1.8_release_4.0.x
2 parents ef99a45 + e64ee54 commit 9d41bef

File tree

8 files changed

+72
-2
lines changed

8 files changed

+72
-2
lines changed

‎flinkx-binlog/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,16 @@
2323
<artifactId>flinkx-core</artifactId>
2424
<version>1.6</version>
2525
<scope>provided</scope>
26+
<exclusions>
27+
<exclusion>
28+
<groupId>ch.qos.logback</groupId>
29+
<artifactId>logback-classic</artifactId>
30+
</exclusion>
31+
<exclusion>
32+
<groupId>ch.qos.logback</groupId>
33+
<artifactId>logback-core</artifactId>
34+
</exclusion>
35+
</exclusions>
2636
</dependency>
2737
</dependencies>
2838

‎flinkx-core/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626

2727
<dependency>
2828
<groupId>org.slf4j</groupId>
29-
<artifactId>slf4j-api</artifactId>
30-
<version>1.7.20</version>
29+
<artifactId>slf4j-log4j12</artifactId>
30+
<version>1.7.10</version>
3131
</dependency>
3232

3333
<dependency>

‎flinkx-kafka/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,16 @@
2323
<artifactId>flinkx-core</artifactId>
2424
<version>1.6</version>
2525
<scope>provided</scope>
26+
<exclusions>
27+
<exclusion>
28+
<groupId>ch.qos.logback</groupId>
29+
<artifactId>logback-classic</artifactId>
30+
</exclusion>
31+
<exclusion>
32+
<groupId>ch.qos.logback</groupId>
33+
<artifactId>logback-core</artifactId>
34+
</exclusion>
35+
</exclusions>
2636
</dependency>
2737
<dependency>
2838
<groupId>org.apache.kafka</groupId>

‎flinkx-kafka09/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,16 @@
2323
<artifactId>flinkx-core</artifactId>
2424
<version>1.6</version>
2525
<scope>provided</scope>
26+
<exclusions>
27+
<exclusion>
28+
<groupId>ch.qos.logback</groupId>
29+
<artifactId>logback-classic</artifactId>
30+
</exclusion>
31+
<exclusion>
32+
<groupId>ch.qos.logback</groupId>
33+
<artifactId>logback-core</artifactId>
34+
</exclusion>
35+
</exclusions>
2636
</dependency>
2737
<dependency>
2838
<groupId>org.apache.kafka</groupId>

‎flinkx-kafka10/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,16 @@
2323
<artifactId>flinkx-core</artifactId>
2424
<version>1.6</version>
2525
<scope>provided</scope>
26+
<exclusions>
27+
<exclusion>
28+
<groupId>ch.qos.logback</groupId>
29+
<artifactId>logback-classic</artifactId>
30+
</exclusion>
31+
<exclusion>
32+
<groupId>ch.qos.logback</groupId>
33+
<artifactId>logback-core</artifactId>
34+
</exclusion>
35+
</exclusions>
2636
</dependency>
2737
<dependency>
2838
<groupId>org.apache.kafka</groupId>

‎flinkx-kafka11/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,16 @@
2323
<artifactId>flinkx-core</artifactId>
2424
<version>1.6</version>
2525
<scope>provided</scope>
26+
<exclusions>
27+
<exclusion>
28+
<groupId>ch.qos.logback</groupId>
29+
<artifactId>logback-classic</artifactId>
30+
</exclusion>
31+
<exclusion>
32+
<groupId>ch.qos.logback</groupId>
33+
<artifactId>logback-core</artifactId>
34+
</exclusion>
35+
</exclusions>
2636
</dependency>
2737
<dependency>
2838
<groupId>org.apache.kafka</groupId>

‎flinkx-kb/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,16 @@
2424
<artifactId>flinkx-core</artifactId>
2525
<version>1.6</version>
2626
<scope>provided</scope>
27+
<exclusions>
28+
<exclusion>
29+
<groupId>ch.qos.logback</groupId>
30+
<artifactId>logback-classic</artifactId>
31+
</exclusion>
32+
<exclusion>
33+
<groupId>ch.qos.logback</groupId>
34+
<artifactId>logback-core</artifactId>
35+
</exclusion>
36+
</exclusions>
2737
</dependency>
2838
</dependencies>
2939

‎flinkx-oraclelogminer/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,16 @@
2121
<artifactId>flinkx-core</artifactId>
2222
<version>1.6</version>
2323
<scope>provided</scope>
24+
<exclusions>
25+
<exclusion>
26+
<groupId>ch.qos.logback</groupId>
27+
<artifactId>logback-classic</artifactId>
28+
</exclusion>
29+
<exclusion>
30+
<groupId>ch.qos.logback</groupId>
31+
<artifactId>logback-core</artifactId>
32+
</exclusion>
33+
</exclusions>
2434
</dependency>
2535
</dependencies>
2636
</project>

0 commit comments

Comments
 (0)