Skip to content

[Fix](package)Revert be-extension package management changes due to class loading issues #58255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Fix](package)Revert be-extension package management changes due to class loading issues #58255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions fe/be-java-extensions/avro-scanner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ under the License.
<artifactId>avro-mapred</artifactId>
<version>${avro.version}</version>
</dependency>
<dependency>
<groupId>org.apache.doris</groupId>
<artifactId>java-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
Expand All @@ -58,8 +63,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.doris</groupId>
<artifactId>preload-extensions</artifactId>
<version>${project.version}</version>
<artifactId>hive-catalog-shade</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
34 changes: 28 additions & 6 deletions fe/be-java-extensions/hadoop-hudi-scanner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,35 +39,37 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.doris</groupId>
<artifactId>preload-extensions</artifactId>
<artifactId>java-common</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-client -->
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs-client</artifactId>
<version>${hadoop.version}</version>
<scope>provided</scope>
</dependency>

<!-- https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-common -->
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-aws</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
<scope>provided</scope>
</dependency>

<!-- https://mvnrepository.com/artifact/org.apache.hudi/hudi-common -->
Expand Down Expand Up @@ -116,6 +118,26 @@ under the License.
<version>${parquet.version}</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.apache.parquet/parquet-avro -->
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-avro</artifactId>
<version>${parquet.version}</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.apache.avro/avro -->
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>${avro.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>io.airlift</groupId>
<artifactId>concurrent</artifactId>
Expand Down
10 changes: 8 additions & 2 deletions fe/be-java-extensions/iceberg-metadata-scanner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,16 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.doris</groupId>
<artifactId>preload-extensions</artifactId>
<artifactId>java-common</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.iceberg</groupId>
<artifactId>iceberg-core</artifactId>
Expand Down
3 changes: 1 addition & 2 deletions fe/be-java-extensions/java-udf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.doris</groupId>
<artifactId>preload-extensions</artifactId>
<artifactId>java-common</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/com.esotericsoftware/reflectasm -->
<dependency>
Expand Down
3 changes: 1 addition & 2 deletions fe/be-java-extensions/jdbc-scanner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.doris</groupId>
<artifactId>preload-extensions</artifactId>
<artifactId>java-common</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
Expand Down
8 changes: 6 additions & 2 deletions fe/be-java-extensions/max-compute-scanner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.doris</groupId>
<artifactId>preload-extensions</artifactId>
<artifactId>java-common</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.aliyun.odps</groupId>
Expand Down Expand Up @@ -72,6 +71,11 @@ under the License.
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-memory-unsafe</artifactId>
<version>${arrow.version}</version>
</dependency>
</dependencies>

<build>
Expand Down
14 changes: 12 additions & 2 deletions fe/be-java-extensions/paimon-scanner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,14 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.doris</groupId>
<artifactId>preload-extensions</artifactId>
<artifactId>java-common</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-azure</artifactId>
</dependency>

<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-core</artifactId>
Expand All @@ -59,6 +63,12 @@ under the License.
<version>${paimon.version}</version>
</dependency>

<dependency>
<groupId>org.apache.doris</groupId>
<artifactId>hive-catalog-shade</artifactId>
<version>${doris.hive.catalog.shade.version}</version>
</dependency>

</dependencies>

<build>
Expand Down
9 changes: 4 additions & 5 deletions fe/be-java-extensions/preload-extensions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,24 +36,22 @@ under the License.
</properties>

<dependencies>
<dependency>
<groupId>org.apache.doris</groupId>
<artifactId>java-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-memory-unsafe</artifactId>
<version>${arrow.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-avro</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.version}</version>
<scope>compile</scope>
</dependency>
<!-- For Avro and Hudi Scanner PreLoad -->
<dependency>
Expand Down Expand Up @@ -87,6 +85,7 @@ under the License.
<!-- version of spark's jackson module is error -->
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-scala_${scala.binary.version}</artifactId>
<version>${jackson.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
Expand Down
3 changes: 1 addition & 2 deletions fe/be-java-extensions/trino-connector-scanner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,8 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.doris</groupId>
<artifactId>preload-extensions</artifactId>
<artifactId>java-common</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.trino</groupId>
Expand Down
Loading