Skip to content

Commit

Permalink
fix pom conflict and rewrite hadoop source test.
Browse files Browse the repository at this point in the history
  • Loading branch information
@love-star
love-star committed Jan 31, 2023
1 parent ceef217 commit b875408
Show file tree
Hide file tree
Showing 9 changed files with 129 additions and 307 deletions.
3 changes: 0 additions & 3 deletions bitsail-connectors/bitsail-connectors-legacy/bitsail-connector-hadoop/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@

<artifactId>bitsail-connector-hadoop</artifactId>

<properties>
</properties>

<dependencies>
<dependency>
<groupId>com.bytedance.bitsail</groupId>
Expand Down
117 changes: 13 additions & 104 deletions bitsail-connectors/connector-hadoop/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,87 +36,27 @@
<dependencies>
<!-- Hadoop -->
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
</exclusion>
<exclusion>
<groupId>com.codahale.metrics</groupId>
<artifactId>metrics-core</artifactId>
</exclusion>
</exclusions>
<groupId>com.bytedance.bitsail</groupId>
<artifactId>bitsail-shaded-hadoop</artifactId>
<version>${revision}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
<groupId>com.bytedance.bitsail</groupId>
<artifactId>bitsail-shaded-hive</artifactId>
<version>${revision}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>guice-servlet</artifactId>
<groupId>com.google.inject.extensions</groupId>
</exclusion>
<exclusion>
<artifactId>guice</artifactId>
<groupId>com.google.inject</groupId>
</exclusion>
<exclusion>
<artifactId>jersey-guice</artifactId>
<groupId>com.sun.jersey.contribs</groupId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<artifactId>metrics-core</artifactId>
<groupId>com.codahale.metrics</groupId>
</exclusion>
<exclusion>
<artifactId>guava</artifactId>
<groupId>com.google.guava</groupId>
</exclusion>
<exclusion>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
<exclusion>
<artifactId>netty-common</artifactId>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<artifactId>netty-buffer</artifactId>
<groupId>io.netty</groupId>
</exclusion>
</exclusions>
<scope>provided</scope>
</dependency>

<dependency>
Expand Down Expand Up @@ -145,49 +85,18 @@
<groupId>com.bytedance.bitsail</groupId>
<artifactId>connector-print</artifactId>
<version>${revision}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.bytedance.bitsail</groupId>
<artifactId>bitsail-shaded-hive</artifactId>
<version>${revision}</version>
<exclusions>
<exclusion>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</exclusion>
<exclusion>
<artifactId>log4j</artifactId>
<groupId>log4j</groupId>
</exclusion>
<exclusion>
<artifactId>commons-net</artifactId>
<groupId>commons-net</groupId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.bytedance.bitsail</groupId>
<artifactId>bitsail-connector-test</artifactId>
<version>${revision}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
<version>${hadoop.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>guice</artifactId>
<groupId>com.google.inject</groupId>
</exclusion>
<exclusion>
<artifactId>guice-servlet</artifactId>
<groupId>com.google.inject.extensions</groupId>
<artifactId>hppc</artifactId>
<groupId>com.carrotsearch</groupId>
</exclusion>
</exclusions>
</dependency>
Expand Down
67 changes: 0 additions & 67 deletions ...c/test/java/com/bytedance/bitsail/connector/hadoop/source/HadoopOrcInputFormatITCase.java
View file

This file was deleted.

68 changes: 0 additions & 68 deletions ...st/java/com/bytedance/bitsail/connector/hadoop/source/HadoopParquetInputFormatITCase.java
View file

This file was deleted.

Loading

0 comments on commit b875408

Please sign in to comment.