This is an automated email from the ASF dual-hosted git repository. kirs pushed a commit to branch 1.1.x in repository https://gitbox.apache.org/repos/asf/doris-shade.git
commit a6d1c0d546e2868d9f33861649d37a34049ff3a9 Author: Calvin Kirs <[email protected]> AuthorDate: Tue Apr 9 19:31:46 2024 +0800 one step --- hadoop-aws-shade-2/pom.xml | 77 ---------- hadoop-cloud-shade-2/pom.xml | 211 -------------------------- hadoop-shade-2/pom.xml | 111 -------------- hive-catalog-shade/pom.xml | 66 ++++++++- hive-shade-3/pom.xml | 344 ------------------------------------------- hudi-mr-shade-0.13/pom.xml | 151 ------------------- kerby-shade-1.0/pom.xml | 76 ---------- pom.xml | 11 +- spring-shade-5/pom.xml | 71 --------- thrift-shade-0.13/pom.xml | 75 ---------- 10 files changed, 67 insertions(+), 1126 deletions(-) diff --git a/hadoop-aws-shade-2/pom.xml b/hadoop-aws-shade-2/pom.xml deleted file mode 100644 index 4e76c35..0000000 --- a/hadoop-aws-shade-2/pom.xml +++ /dev/null @@ -1,77 +0,0 @@ -<?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.5-SNAPSHOT</version> - </parent> - - <artifactId>hadoop-aws-shade-2</artifactId> - - <properties> - <hadoop.version>2.10.2</hadoop.version> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-aws</artifactId> - <version>${hadoop.version}</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>com.google.common</pattern> - <shadedPattern>shade.doris.hadoop.com.google.common</shadedPattern> - </relocation> - </relocations> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file diff --git a/hadoop-cloud-shade-2/pom.xml b/hadoop-cloud-shade-2/pom.xml deleted file mode 100644 index 1cb4326..0000000 --- a/hadoop-cloud-shade-2/pom.xml +++ /dev/null @@ -1,211 +0,0 @@ -<?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.5-SNAPSHOT</version> - </parent> - - <artifactId>hadoop-cloud-shade-2</artifactId> - - <properties> - <hadoop.version>2.10.2</hadoop.version> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - - - <dependencies> - <!-- 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> - <exclusions> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - </exclusion> - <exclusion> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </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> - <exclusions> - <exclusion> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </exclusion> - <exclusion> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - </exclusion> - <exclusion> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - </exclusion> - <exclusion> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-reload4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - </exclusion> - </exclusions> - </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> - <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.hadoop.cloud.com.google.common</shadedPattern> - </relocation> - <relocation> - <pattern>com.fasterxml.jackson</pattern> - <shadedPattern>shade.doris.hadoop.cloud.com.fasterxml.jackson</shadedPattern> - </relocation> - <relocation> - <pattern>io.netty</pattern> - <shadedPattern>shade.doris.hadoop.io.netty</shadedPattern> - </relocation> - </relocations> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file diff --git a/hadoop-shade-2/pom.xml b/hadoop-shade-2/pom.xml deleted file mode 100644 index 5226808..0000000 --- a/hadoop-shade-2/pom.xml +++ /dev/null @@ -1,111 +0,0 @@ -<?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.5-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-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> - - </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>com.google.common</pattern> - <shadedPattern>shade.doris.hdfs.com.google.common</shadedPattern> - </relocation> - <relocation> - <pattern>io.netty</pattern> - <shadedPattern>shade.doris.hadoop.io.netty</shadedPattern> - </relocation> - </relocations> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file diff --git a/hive-catalog-shade/pom.xml b/hive-catalog-shade/pom.xml index c1f1697..eb041a0 100644 --- a/hive-catalog-shade/pom.xml +++ b/hive-catalog-shade/pom.xml @@ -20,7 +20,7 @@ under the License. <parent> <groupId>org.apache.doris</groupId> <artifactId>doris-shade</artifactId> - <version>1.0.5-SNAPSHOT</version> + <version>CK-1.0.0.1-SNAPSHOT</version> </parent> <artifactId>hive-catalog-shade</artifactId> @@ -56,6 +56,66 @@ under the License. <artifactId>hadoop-auth</artifactId> <version>${hadoop.version}</version> </dependency> + <dependency> + <groupId>org.apache.avro</groupId> + <artifactId>avro</artifactId> + <version>1.11.3</version> + </dependency> + <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind --> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>2.15.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>2.15.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-yaml</artifactId> + <version>2.15.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.ivy</groupId> + <artifactId>ivy</artifactId> + <version>2.5.2</version> + </dependency> + <!-- https://mvnrepository.com/artifact/org.apache.parquet/parquet-hadoop-bundle --> + <dependency> + <groupId>org.apache.parquet</groupId> + <artifactId>parquet-hadoop-bundle</artifactId> + <version>1.13.1</version> + </dependency> + <!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk18on --> + <!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on --> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + <version>1.70</version> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>32.1.2-jre</version> + </dependency> + + <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson --> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.10</version> + </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> </dependencyManagement> <dependencies> @@ -169,6 +229,10 @@ under the License. <groupId>tomcat</groupId> <artifactId>jasper-compiler</artifactId> </exclusion> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </exclusion> <!-- confilict with parquet version in iceberg --> <exclusion> <groupId>org.apache.parquet</groupId> diff --git a/hive-shade-3/pom.xml b/hive-shade-3/pom.xml deleted file mode 100644 index 7bf9357..0000000 --- a/hive-shade-3/pom.xml +++ /dev/null @@ -1,344 +0,0 @@ -<?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.5-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> - <hadoop.version>3.3.4</hadoop.version> - </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <version>${hadoop.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - <version>${hadoop.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs-client</artifactId> - <version>${hadoop.version}</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-auth</artifactId> - <version>${hadoop.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - <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> - <exclusion> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.orc</groupId> - <artifactId>orc-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-yarn-server-common</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-yarn-api</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> - <exclusion> - <groupId>org.apache.calcite</groupId> - <artifactId>calcite-core</artifactId> - </exclusion> - <exclusion> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - </exclusion> - <exclusion> - <groupId>commons-pool</groupId> - <artifactId>commons-pool</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.derby</groupId> - <artifactId>derby</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.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</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> - <exclusions> - <exclusion> - <groupId>org.apache.thrift</groupId> - <artifactId>libthrift</artifactId> - </exclusion> - <exclusion> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - </exclusion> - <exclusion> - <groupId>io.dropwizard.metrics</groupId> - <artifactId>metrics-core</artifactId> - </exclusion> - <exclusion> - <groupId>io.dropwizard.metrics</groupId> - <artifactId>metrics-json</artifactId> - </exclusion> - <exclusion> - <groupId>io.dropwizard.metrics</groupId> - <artifactId>metrics-jvm</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.calcite</groupId> - <artifactId>calcite-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-1.2-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.orc</groupId> - <artifactId>orc-core</artifactId> - </exclusion> - </exclusions> - </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> - <relocation> - <pattern>io.netty</pattern> - <shadedPattern>shade.doris.hive.io.netty</shadedPattern> - </relocation> - </relocations> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/hudi-mr-shade-0.13/pom.xml b/hudi-mr-shade-0.13/pom.xml deleted file mode 100644 index c0a6ffa..0000000 --- a/hudi-mr-shade-0.13/pom.xml +++ /dev/null @@ -1,151 +0,0 @@ -<?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.5-SNAPSHOT</version> - </parent> - - <artifactId>hudi-mr-shade-0.13</artifactId> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <hudi.version>0.13.0</hudi.version> - </properties> - <dependencies> - <dependency> - <groupId>org.apache.hudi</groupId> - <artifactId>hudi-hadoop-mr</artifactId> - <version>${hudi.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.orc</groupId> - <artifactId>orc-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-annotations</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-auth</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.commons</groupId> - <artifactId>commons-math3</artifactId> - </exclusion> - <exclusion> - <groupId>com.github.ben-manes.caffeine</groupId> - <artifactId>caffeine</artifactId> - </exclusion> - <exclusion> - <groupId>io.dropwizard.metrics</groupId> - <artifactId>metrics-core</artifactId> - </exclusion> - <exclusion> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </exclusion> - <exclusion> - <groupId>org.checkerframework</groupId> - <artifactId>checker-qual</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>fluent-hc</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - <exclusion> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - </exclusion> - </exclusions> - </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>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> - <relocation> - <pattern>com.fasterxml.jackson</pattern> - <shadedPattern>shade.doris.hudi.mr.com.fasterxml.jackson</shadedPattern> - </relocation> - </relocations> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file diff --git a/kerby-shade-1.0/pom.xml b/kerby-shade-1.0/pom.xml deleted file mode 100644 index e715b35..0000000 --- a/kerby-shade-1.0/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ -<?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.5-SNAPSHOT</version> - </parent> - - <artifactId>kerby-shade-1.0</artifactId> - - <properties> - <kerby.version>1.0.1</kerby.version> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.kerby</groupId> - <artifactId>kerb-simplekdc</artifactId> - <version>${kerby.version}</version> - </dependency> - <dependency> - <groupId>org.apache.kerby</groupId> - <artifactId>kerb-core</artifactId> - <version>${kerby.version}</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> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file diff --git a/pom.xml b/pom.xml index c05b90d..125f74d 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ under the License. </parent> <groupId>org.apache.doris</groupId> <artifactId>doris-shade</artifactId> - <version>1.0.5-SNAPSHOT</version> + <version>CK-1.0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Archetype - doris-shade</name> <url>https://doris.apache.org</url> @@ -44,14 +44,6 @@ under the License. </scm> <modules> - <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> - <module>hadoop-cloud-shade-2</module> - <module>hadoop-aws-shade-2</module> - <module>kerby-shade-1.0</module> <module>hive-catalog-shade</module> </modules> @@ -133,6 +125,7 @@ under the License. </plugins> </pluginManagement> <plugins> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> diff --git a/spring-shade-5/pom.xml b/spring-shade-5/pom.xml deleted file mode 100644 index bc53190..0000000 --- a/spring-shade-5/pom.xml +++ /dev/null @@ -1,71 +0,0 @@ -<?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.5-SNAPSHOT</version> - </parent> - - <artifactId>spring-shade-5</artifactId> - - <properties> - <spring.version>5.3.25</spring.version> - </properties> - - <dependencies> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <version>${spring.version}</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> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file diff --git a/thrift-shade-0.13/pom.xml b/thrift-shade-0.13/pom.xml deleted file mode 100644 index 0ba5fc7..0000000 --- a/thrift-shade-0.13/pom.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?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.5-SNAPSHOT</version> - </parent> - <artifactId>thrift-shade-0.13</artifactId> - <version>1.0.5-SNAPSHOT</version> - <properties> - <libethrift.version>0.13.0</libethrift.version> - </properties> - <dependencies> - <dependency> - <groupId>org.apache.thrift</groupId> - <artifactId>libthrift</artifactId> - <version>${libethrift.version}</version> - <exclusions> - <exclusion> - <artifactId>httpclient</artifactId> - <groupId>org.apache.httpcomponents</groupId> - </exclusion> - </exclusions> - </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> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
