This is an automated email from the ASF dual-hosted git repository.
fanjia pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new c974a4175 [Bug][Connector-V2] Fix avro conflicts (#2294)
c974a4175 is described below
commit c974a417507b6a5844de18b0994ac663c69c0086
Author: TyrantLucifer <[email protected]>
AuthorDate: Fri Jul 29 13:21:01 2022 +0800
[Bug][Connector-V2] Fix avro conflicts (#2294)
* [Bug][Connector-V2] Fix avro conflicts (#2289)
* [Bug][Connector-V2] Fix avro conflicts (apache#2289)
* [Bug][Connector-V2] Fix dependency error (#2289)
---
pom.xml | 1 +
seatunnel-apis/seatunnel-api-flink/pom.xml | 11 +++++++++++
.../apache/seatunnel/flink/assertion/AssertExecutorTest.java | 10 +++++-----
tools/dependencies/known-dependencies.txt | 3 ---
4 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 693c6db83..68588e467 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,6 +124,7 @@
<flink.version>1.13.6</flink.version>
<hudi.version>0.11.1</hudi.version>
<orc.version>1.5.6</orc.version>
+ <avro.version>1.8.2</avro.version>
<hive.exec.version>2.3.9</hive.exec.version>
<commons.logging.version>1.2</commons.logging.version>
<commons.beanutils.version>1.9.4</commons.beanutils.version>
diff --git a/seatunnel-apis/seatunnel-api-flink/pom.xml
b/seatunnel-apis/seatunnel-api-flink/pom.xml
index 3afdc7cc7..0668fb2c6 100644
--- a/seatunnel-apis/seatunnel-api-flink/pom.xml
+++ b/seatunnel-apis/seatunnel-api-flink/pom.xml
@@ -91,6 +91,17 @@
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-avro</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>avro</artifactId>
+ <groupId>org.apache.avro</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ <version>${avro.version}</version>
</dependency>
</dependencies>
diff --git
a/seatunnel-connectors/seatunnel-connectors-flink/seatunnel-connector-flink-assert/src/test/java/org/apache/seatunnel/flink/assertion/AssertExecutorTest.java
b/seatunnel-connectors/seatunnel-connectors-flink/seatunnel-connector-flink-assert/src/test/java/org/apache/seatunnel/flink/assertion/AssertExecutorTest.java
index 1ddd866b9..c109e54e1 100644
---
a/seatunnel-connectors/seatunnel-connectors-flink/seatunnel-connector-flink-assert/src/test/java/org/apache/seatunnel/flink/assertion/AssertExecutorTest.java
+++
b/seatunnel-connectors/seatunnel-connectors-flink/seatunnel-connector-flink-assert/src/test/java/org/apache/seatunnel/flink/assertion/AssertExecutorTest.java
@@ -20,10 +20,10 @@ package org.apache.seatunnel.flink.assertion;
import org.apache.seatunnel.flink.assertion.rule.AssertFieldRule;
import junit.framework.TestCase;
-import org.apache.commons.compress.utils.Lists;
import org.apache.flink.api.common.typeinfo.Types;
import org.apache.flink.types.Row;
+import java.util.ArrayList;
import java.util.List;
public class AssertExecutorTest extends TestCase {
@@ -37,7 +37,7 @@ public class AssertExecutorTest extends TestCase {
}
public void testFailWithType() {
- List<AssertFieldRule> rules = Lists.newArrayList();
+ List<AssertFieldRule> rules = new ArrayList<>();
AssertFieldRule rule1 = new AssertFieldRule();
rule1.setFieldName("name");
rule1.setFieldType(Types.INT);
@@ -48,7 +48,7 @@ public class AssertExecutorTest extends TestCase {
}
public void testFailWithValue() {
- List<AssertFieldRule> rules = Lists.newArrayList();
+ List<AssertFieldRule> rules = new ArrayList<>();
AssertFieldRule rule1 = getFieldRule4Name();
AssertFieldRule rule2 = getFieldRule4Age();
@@ -64,7 +64,7 @@ public class AssertExecutorTest extends TestCase {
rule.setFieldName("age");
rule.setFieldType(Types.INT);
- List<AssertFieldRule.AssertValueRule> valueRules =
Lists.newArrayList();
+ List<AssertFieldRule.AssertValueRule> valueRules = new ArrayList<>();
AssertFieldRule.AssertValueRule valueRule = new
AssertFieldRule.AssertValueRule();
valueRule.setFieldValueRuleType(AssertFieldRule.AssertValueRuleType.NOT_NULL);
@@ -87,7 +87,7 @@ public class AssertExecutorTest extends TestCase {
rule.setFieldName("name");
rule.setFieldType(Types.STRING);
- List<AssertFieldRule.AssertValueRule> valueRules =
Lists.newArrayList();
+ List<AssertFieldRule.AssertValueRule> valueRules = new ArrayList<>();
AssertFieldRule.AssertValueRule valueRule = new
AssertFieldRule.AssertValueRule();
valueRule.setFieldValueRuleType(AssertFieldRule.AssertValueRuleType.NOT_NULL);
diff --git a/tools/dependencies/known-dependencies.txt
b/tools/dependencies/known-dependencies.txt
index fd6f9ad8a..c7b8aaca2 100755
--- a/tools/dependencies/known-dependencies.txt
+++ b/tools/dependencies/known-dependencies.txt
@@ -42,7 +42,6 @@ audience-annotations-0.5.0.jar
audience-annotations-0.7.0.jar
avatica-core-1.20.0.jar
avatica-metrics-1.20.0.jar
-avro-1.10.0.jar
avro-1.7.7.jar
avro-1.8.2.jar
aws-java-sdk-core-1.12.37.jar
@@ -70,7 +69,6 @@ commons-compiler-3.0.9.jar
commons-compiler-3.1.6.jar
commons-compress-1.18.jar
commons-compress-1.19.jar
-commons-compress-1.20.jar
commons-compress-1.21.jar
commons-compress-1.4.1.jar
commons-compress-1.8.1.jar
@@ -724,7 +722,6 @@ xmlbeans-3.1.0.jar
xmlenc-0.52.jar
xz-1.0.jar
xz-1.5.jar
-xz-1.8.jar
zkclient-0.3.jar
zookeeper-3.3.1.jar
zookeeper-3.4.10.jar
