This is an automated email from the ASF dual-hosted git repository.
diwu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris-shade.git
The following commit(s) were added to refs/heads/master by this push:
new 539d9ed Add Hadoop and Hive etc... shade package (#3)
539d9ed is described below
commit 539d9ed974ab87289f1f0815ef425e905c72e956
Author: Calvin Kirs <acm_ch...@yeah.net>
AuthorDate: Fri Mar 24 11:19:51 2023 +0800
Add Hadoop and Hive etc... shade package (#3)
* Add thrift-0.16.0 shade-package
* Add Haddop 2 shade package and rename guava and gson package
* Add hive3 shade package and rename guava and gson package
* Add Spring5 shade package
* Add Hudi-MR 0.13 shade package and rename guava and gson package
* Add Thrift 13 shade package
* Update license.yaml
---
.github/workflows/license.yaml | 39 ++++
.gitignore | 38 ++++
CHANGE-LOG.txt | 4 +-
hadoop-shade-2/pom.xml | 202 ++++++++++++++++++++
hive-shade-3/pom.xml | 218 ++++++++++++++++++++++
{thrift-shade-0.16 => hudi-mr-shade-0.13}/pom.xml | 33 ++--
pom.xml | 22 ++-
{thrift-shade-0.16 => spring-shade-5}/pom.xml | 31 +--
{thrift-shade-0.16 => thrift-shade-0.13}/pom.xml | 19 +-
9 files changed, 548 insertions(+), 58 deletions(-)
diff --git a/.github/workflows/license.yaml b/.github/workflows/license.yaml
new file mode 100644
index 0000000..7ab6efe
--- /dev/null
+++ b/.github/workflows/license.yaml
@@ -0,0 +1,39 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name: License
+
+on:
+ push:
+ pull_request:
+ branches:
+ - master
+ paths-ignore:
+ - '**/*.md'
+
+jobs:
+ license-header:
+ if: github.repository == 'apache/incubator-seatunnel'
+ name: License header
+ runs-on: ubuntu-latest
+ timeout-minutes: 10
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ submodules: true
+ - name: Check license header
+ uses: apache/skywalking-eyes@main
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b2a59f0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,38 @@
+# ignore file with wildcard anywhere
+*.swp
+*.pyc
+*.class
+*.iml
+*.jar
+*.log
+*.so.tmp
+*.flattened-pom.xml
+.idea
+.release.properties
+
+# ignore file with specifiy name anywhere
+.DS_Store
+.classpath
+nohup.out
+custom_env.sh
+custom_env_mac.sh
+derby.log
+dependency-reduced-pom.xml
+pom.xml.releaseBackup
+yarn.lock
+ut_dir
+package-lock.json
+
+# ignore all sub `/bin` and `/build` directory
+**/build/
+**/target/
+**/dist/
+**/log/
+
+# ignore project file
+.cproject
+.project
+.cache
+.settings/
+**/.idea/
+**/.vscode/
\ No newline at end of file
diff --git a/CHANGE-LOG.txt b/CHANGE-LOG.txt
index 354a62d..202faa9 100644
--- a/CHANGE-LOG.txt
+++ b/CHANGE-LOG.txt
@@ -1 +1,3 @@
-* release thrift-0.16.0 shade-package
\ No newline at end of file
+# Apache Doris Shade Dependencies
+
+This repository contains a number of shaded dependencies for the Apache Doris
project.
\ No newline at end of file
diff --git a/hadoop-shade-2/pom.xml b/hadoop-shade-2/pom.xml
new file mode 100644
index 0000000..f8c737c
--- /dev/null
+++ b/hadoop-shade-2/pom.xml
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>doris-shade</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>hadoop-shade-2</artifactId>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <hadoop.version>2.10.2</hadoop.version>
+ </properties>
+ <dependencies>
+ <!-- https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws
-->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-aws</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <!--
https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-huaweicloud -->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-huaweicloud</artifactId>
+ <version>2.8.3</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jackson-databind</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!--
https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aliyun -->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-aliyun</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <!--
https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-annotations -->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-annotations</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-auth
-->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <!--
https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-common -->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-hdfs
-->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>netty-all</artifactId>
+ <groupId>io.netty</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jackson-databind</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!--
https://mvnrepository.com/artifact/com.huaweicloud/esdk-obs-java-bundle -->
+ <dependency>
+ <groupId>com.huaweicloud</groupId>
+ <artifactId>esdk-obs-java-bundle</artifactId>
+ <version>3.21.8</version>
+ </dependency>
+
+
+ <!-- https://mvnrepository.com/artifact/com.qcloud.cos/hadoop-cos -->
+ <dependency>
+ <groupId>com.qcloud.cos</groupId>
+ <artifactId>hadoop-cos</artifactId>
+ <version>2.8.5-8.1.8</version>
+ </dependency>
+ </dependencies>
+ <profiles>
+ <!-- for custom internal repository -->
+ <profile>
+ <id>custom-env</id>
+ <activation>
+ <property>
+ <name>env.CUSTOM_MAVEN_REPO</name>
+ </property>
+ </activation>
+ <repositories>
+ <repository>
+ <id>custom-nexus</id>
+ <url>${env.CUSTOM_MAVEN_REPO}</url>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>custom-nexus</id>
+ <url>${env.CUSTOM_MAVEN_REPO}</url>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ <!-- for general repository -->
+ <profile>
+ <id>general-env</id>
+ <activation>
+ <property>
+ <name>!env.CUSTOM_MAVEN_REPO</name>
+ </property>
+ </activation>
+ <repositories>
+ <!-- for java-cup -->
+ <repository>
+ <id>cloudera-thirdparty</id>
+
<url>https://repository.cloudera.com/content/repositories/third-party/</url>
+ </repository>
+ <!-- for bdb je -->
+ <repository>
+ <id>oracleReleases</id>
+ <url>http://download.oracle.com/maven</url>
+ </repository>
+ <!-- for huawei obs sdk -->
+ <repository>
+ <id>huawei-obs-sdk</id>
+
<url>https://repo.huaweicloud.com/repository/maven/huaweicloudsdk/</url>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <!-- for cup-maven-plugin -->
+ <pluginRepository>
+ <id>spring-plugins</id>
+ <url>http://repo.spring.io/plugins-release/</url>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+
<createDependencyReducedPom>true</createDependencyReducedPom>
+
<dependencyReducedPomLocation>${project.basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <relocations>
+ <relocation>
+ <pattern>com.google.common</pattern>
+
<shadedPattern>shade.doris.hdfs.com.google.common</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/hive-shade-3/pom.xml b/hive-shade-3/pom.xml
new file mode 100644
index 0000000..5828dc4
--- /dev/null
+++ b/hive-shade-3/pom.xml
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.doris</groupId>
+ <artifactId>doris-shade</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>hive-shade-3</artifactId>
+
+ <properties>
+ <hive.version>3.1.3</hive.version>
+ <hive-storage-api.version>2.8.1</hive-storage-api.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-serde</artifactId>
+ <version>${hive.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libfb303</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!--
https://mvnrepository.com/artifact/org.apache.hive/hive-storage-api -->
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-storage-api</artifactId>
+ <version>${hive-storage-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-metastore</artifactId>
+ <version>${hive.version}</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>jdk.tools</groupId>
+ <artifactId>jdk.tools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ </exclusion>
+ <!-- confilict with parquet version in iceberg -->
+ <exclusion>
+ <groupId>org.apache.parquet</groupId>
+ <artifactId>parquet-hadoop-bundle</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-exec</artifactId>
+ <classifier>core</classifier>
+ <version>${hive.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.pentaho</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-vector-code-gen</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-llap-tez</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-shims</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-registry</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util-ajax</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-standalone-metastore</artifactId>
+ <version>3.1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-classification</artifactId>
+ <version>3.1.3</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+
<createDependencyReducedPom>true</createDependencyReducedPom>
+
<dependencyReducedPomLocation>${project.basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ <relocations>
+ <relocation>
+ <pattern>org.apache.commons.io</pattern>
+
<shadedPattern>shade.doris.org.apache.commons.io</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.google.common</pattern>
+
<shadedPattern>shade.doris.hive.com.google.common</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.fasterxml.jackson</pattern>
+
<shadedPattern>shade.doris.hive.com.fasterxml.jackson</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.google.gson</pattern>
+
<shadedPattern>shade.doris.hive.com.google.gson</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/thrift-shade-0.16/pom.xml b/hudi-mr-shade-0.13/pom.xml
similarity index 75%
copy from thrift-shade-0.16/pom.xml
copy to hudi-mr-shade-0.13/pom.xml
index 6785634..f7258d2 100644
--- a/thrift-shade-0.16/pom.xml
+++ b/hudi-mr-shade-0.13/pom.xml
@@ -22,24 +22,20 @@ under the License.
<parent>
<groupId>org.apache.doris</groupId>
<artifactId>doris-shade</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
- <artifactId>thrift-shade-0.16</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+
+ <artifactId>hudi-mr-shade-0.13</artifactId>
+
<properties>
- <libethrift.version>0.16.0</libethrift.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <hudi.version>0.13.0</hudi.version>
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>0.16.0</version>
- <exclusions>
- <exclusion>
- <artifactId>httpclient</artifactId>
- <groupId>org.apache.httpcomponents</groupId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.hudi</groupId>
+ <artifactId>hudi-hadoop-mr</artifactId>
+ <version>${hudi.version}</version>
</dependency>
</dependencies>
<build>
@@ -55,8 +51,7 @@ under the License.
<phase>package</phase>
<configuration>
<createDependencyReducedPom>true</createDependencyReducedPom>
-
<dependencyReducedPomLocation>${project.basedir}/target/dependency-reduced-pom.xml
- </dependencyReducedPomLocation>
+
<dependencyReducedPomLocation>${project.basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation>
<filters>
<filter>
<artifact>*:*</artifact>
@@ -69,8 +64,12 @@ under the License.
</filters>
<relocations>
<relocation>
- <pattern>org.apache.thrift</pattern>
-
<shadedPattern>shade.doris.org.apache.thrift</shadedPattern>
+ <pattern>com.google.common</pattern>
+
<shadedPattern>shade.doris.hudi.mr.com.google.common</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.google.gson</pattern>
+
<shadedPattern>shade.doris.hudi.mr.com.google.gson</shadedPattern>
</relocation>
</relocations>
</configuration>
diff --git a/pom.xml b/pom.xml
index 925267d..8539309 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,8 +15,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache</groupId>
@@ -25,7 +24,7 @@ under the License.
</parent>
<groupId>org.apache.doris</groupId>
<artifactId>doris-shade</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Archetype - doris-shade</name>
<url>https://doris.apache.org</url>
@@ -41,12 +40,23 @@ under the License.
<url>https://github.com/apache/doris-shade</url>
<connection>g...@github.com:apache/doris-shade.git</connection>
<developerConnection>scm:git:https://github.com/apache/doris-shade.git</developerConnection>
- </scm>
+ <tag>HEAD</tag>
+ </scm>
<modules>
- <module>thrift-shade-0.16</module>
+ <module>thrift-shade-0.13</module>
+ <module>hadoop-shade-2</module>
+ <module>hudi-mr-shade-0.13</module>
+ <module>hive-shade-3</module>
+ <module>spring-shade-5</module>
</modules>
+ <properties>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<profiles>
<profile>
<id>release</id>
@@ -79,7 +89,7 @@ under the License.
<artifactId>maven-shade-plugin</artifactId>
<configuration>
<transformers>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"
/>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
<projectName>Apache Doris-Shade</projectName>
<encoding>UTF-8</encoding>
diff --git a/thrift-shade-0.16/pom.xml b/spring-shade-5/pom.xml
similarity index 71%
copy from thrift-shade-0.16/pom.xml
copy to spring-shade-5/pom.xml
index 6785634..3a745a1 100644
--- a/thrift-shade-0.16/pom.xml
+++ b/spring-shade-5/pom.xml
@@ -22,24 +22,20 @@ under the License.
<parent>
<groupId>org.apache.doris</groupId>
<artifactId>doris-shade</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
- <artifactId>thrift-shade-0.16</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+
+ <artifactId>spring-shade-5</artifactId>
+
<properties>
- <libethrift.version>0.16.0</libethrift.version>
+ <spring.version>5.3.25</spring.version>
</properties>
+
<dependencies>
<dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>0.16.0</version>
- <exclusions>
- <exclusion>
- <artifactId>httpclient</artifactId>
- <groupId>org.apache.httpcomponents</groupId>
- </exclusion>
- </exclusions>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
</dependency>
</dependencies>
<build>
@@ -55,8 +51,7 @@ under the License.
<phase>package</phase>
<configuration>
<createDependencyReducedPom>true</createDependencyReducedPom>
-
<dependencyReducedPomLocation>${project.basedir}/target/dependency-reduced-pom.xml
- </dependencyReducedPomLocation>
+
<dependencyReducedPomLocation>${project.basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation>
<filters>
<filter>
<artifact>*:*</artifact>
@@ -67,12 +62,6 @@ under the License.
</excludes>
</filter>
</filters>
- <relocations>
- <relocation>
- <pattern>org.apache.thrift</pattern>
-
<shadedPattern>shade.doris.org.apache.thrift</shadedPattern>
- </relocation>
- </relocations>
</configuration>
</execution>
</executions>
diff --git a/thrift-shade-0.16/pom.xml b/thrift-shade-0.13/pom.xml
similarity index 80%
rename from thrift-shade-0.16/pom.xml
rename to thrift-shade-0.13/pom.xml
index 6785634..31ac858 100644
--- a/thrift-shade-0.16/pom.xml
+++ b/thrift-shade-0.13/pom.xml
@@ -15,25 +15,24 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.doris</groupId>
<artifactId>doris-shade</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
- <artifactId>thrift-shade-0.16</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <artifactId>thrift-shade-0.13</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
<properties>
- <libethrift.version>0.16.0</libethrift.version>
+ <libethrift.version>0.13.0</libethrift.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
- <version>0.16.0</version>
+ <version>${libethrift.version}</version>
<exclusions>
<exclusion>
<artifactId>httpclient</artifactId>
@@ -67,12 +66,6 @@ under the License.
</excludes>
</filter>
</filters>
- <relocations>
- <relocation>
- <pattern>org.apache.thrift</pattern>
-
<shadedPattern>shade.doris.org.apache.thrift</shadedPattern>
- </relocation>
- </relocations>
</configuration>
</execution>
</executions>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
