This is an automated email from the ASF dual-hosted git repository. chengpan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/kyuubi.git
The following commit(s) were added to refs/heads/master by this push: new d9e0d36243 [KYUUBI #7172] Shade kyuubi spark lineage module d9e0d36243 is described below commit d9e0d36243b93b0ddea97e1f1b0036d3f1acb2c0 Author: wforget <643348...@qq.com> AuthorDate: Wed Aug 27 11:44:12 2025 +0800 [KYUUBI #7172] Shade kyuubi spark lineage module ### Why are the changes needed? To avoid the issues of kyuubi util classes not being found when placing lineage plugin jar in $SPARK_HOME/jars . ### How was this patch tested? run `mvn clean -DskipTests package -am -pl extensions/spark/kyuubi-spark-lineage` logs: ``` [INFO] --- shade:3.5.2:shade (default) kyuubi-spark-lineage_2.12 --- [INFO] Including org.apache.kyuubi:kyuubi-util-scala_2.12:jar:1.11.0-SNAPSHOT in the shaded jar. [INFO] Including org.apache.kyuubi:kyuubi-util:jar:1.11.0-SNAPSHOT in the shaded jar. [INFO] Excluding org.scala-lang:scala-library:jar:2.12.19 from the shaded jar. [INFO] Excluding org.slf4j:slf4j-api:jar:1.7.36 from the shaded jar. [INFO] Excluding org.apache.atlas:atlas-client-v2:jar:2.3.0 from the shaded jar. [INFO] Excluding org.apache.atlas:atlas-intg:jar:2.3.0 from the shaded jar. [INFO] Excluding commons-validator:commons-validator:jar:1.6 from the shaded jar. [INFO] Excluding commons-beanutils:commons-beanutils:jar:1.9.2 from the shaded jar. [INFO] Excluding commons-digester:commons-digester:jar:1.8.1 from the shaded jar. [INFO] Excluding com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:jar:2.15.4 from the shaded jar. [INFO] Excluding com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:2.15.4 from the shaded jar. [INFO] Excluding com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.15.4 from the shaded jar. [INFO] Excluding jakarta.xml.bind:jakarta.xml.bind-api:jar:2.3.2 from the shaded jar. [INFO] Excluding jakarta.activation:jakarta.activation-api:jar:1.2.2 from the shaded jar. [INFO] Excluding javax.inject:javax.inject:jar:1 from the shaded jar. [INFO] Excluding commons-configuration:commons-configuration:jar:1.10 from the shaded jar. [INFO] Excluding org.apache.commons:commons-configuration2:jar:2.8.0 from the shaded jar. [INFO] Excluding org.apache.atlas:atlas-client-common:jar:2.3.0 from the shaded jar. [INFO] Excluding com.sun.jersey:jersey-client:jar:1.19 from the shaded jar. [INFO] Excluding com.sun.jersey.contribs:jersey-multipart:jar:1.19 from the shaded jar. [INFO] Excluding org.jvnet.mimepull:mimepull:jar:1.9.3 from the shaded jar. [INFO] Excluding com.sun.jersey:jersey-core:jar:1.19 from the shaded jar. [INFO] Excluding javax.ws.rs:jsr311-api:jar:1.1.1 from the shaded jar. [INFO] Excluding cglib:cglib:jar:2.2.2 from the shaded jar. [INFO] Excluding asm:asm:jar:3.3.1 from the shaded jar. [INFO] Excluding commons-lang:commons-lang:jar:2.6 from the shaded jar. [INFO] Dependency-reduced POM written at: /Users/wforget/work/git/kyuubi/extensions/spark/kyuubi-spark-lineage/dependency-reduced-pom.xml [WARNING] kyuubi-spark-lineage_2.12-1.11.0-SNAPSHOT.jar, kyuubi-util-1.11.0-SNAPSHOT.jar, kyuubi-util-scala_2.12-1.11.0-SNAPSHOT.jar define 4 overlapping resources: [WARNING] - META-INF/DEPENDENCIES [WARNING] - META-INF/LICENSE [WARNING] - META-INF/MANIFEST.MF [WARNING] - META-INF/NOTICE [WARNING] maven-shade-plugin has detected that some files are [WARNING] present in two or more JARs. When this happens, only one [WARNING] single version of the file is copied to the uber jar. [WARNING] Usually this is not harmful and you can skip these warnings, [WARNING] otherwise try to manually exclude artifacts based on [WARNING] mvn dependency:tree -Ddetail=true and the above output. [WARNING] See https://maven.apache.org/plugins/maven-shade-plugin/ [INFO] Replacing original artifact with shaded artifact. [INFO] Replacing /Users/wforget/work/git/kyuubi/extensions/spark/kyuubi-spark-lineage/target/kyuubi-spark-lineage_2.12-1.11.0-SNAPSHOT.jar with /Users/wforget/work/git/kyuubi/extensions/spark/kyuubi-spark-lineage/target/kyuubi-spark-lineage_2.12-1.11.0-SNAPSHOT-shaded.jar ``` ### Was this patch authored or co-authored using generative AI tooling? No Closes #7172 from wForget/lineage_shade. Closes #7172 7a5c453d2 [wforget] newline b90a9a729 [wforget] fix shade plugin conf 615239e58 [wforget] add licence and notice be9ebdb62 [wforget] new kyuubi spark lineage shaded module 9fccf41ae [wforget] fix style c2dde0a23 [wforget] Shade kyuubi spark lineage module Authored-by: wforget <643348...@qq.com> Signed-off-by: Cheng Pan <cheng...@apache.org> --- .../spark/kyuubi-spark-lineage-shaded/pom.xml | 90 +++++++++ .../src/main/resources/META-INF/LICENSE | 202 +++++++++++++++++++++ .../src/main/resources/META-INF/NOTICE | 5 + pom.xml | 1 + 4 files changed, 298 insertions(+) diff --git a/extensions/spark/kyuubi-spark-lineage-shaded/pom.xml b/extensions/spark/kyuubi-spark-lineage-shaded/pom.xml new file mode 100644 index 0000000000..476642d90f --- /dev/null +++ b/extensions/spark/kyuubi-spark-lineage-shaded/pom.xml @@ -0,0 +1,90 @@ +<?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.kyuubi</groupId> + <artifactId>kyuubi-parent</artifactId> + <version>1.11.0-SNAPSHOT</version> + <relativePath>../../../pom.xml</relativePath> + </parent> + + <artifactId>kyuubi-spark-lineage-shaded</artifactId> + <packaging>jar</packaging> + <name>Kyuubi Dev Spark Lineage Extension Shaded</name> + <url>https://kyuubi.apache.org/</url> + + <dependencies> + <dependency> + <groupId>org.apache.kyuubi</groupId> + <artifactId>kyuubi-spark-lineage_${scala.binary.version}</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <configuration> + <shadedArtifactAttached>false</shadedArtifactAttached> + <artifactSet> + <includes> + <include>org.apache.kyuubi:*</include> + </includes> + </artifactSet> + <filters> + <filter> + <artifact>*:*</artifact> + <excludes> + <exclude>**/*.proto</exclude> + <exclude>META-INF/*.SF</exclude> + <exclude>META-INF/LGPL2.1</exclude> + <exclude>META-INF/AL2.0</exclude> + <exclude>META-INF/ASL2.0</exclude> + <exclude>META-INF/*.DSA</exclude> + <exclude>META-INF/*.RSA</exclude> + <exclude>META-INF/DEPENDENCIES</exclude> + <exclude>META-INF/LICENSE.txt</exclude> + <exclude>META-INF/NOTICE.txt</exclude> + <exclude>META-INF/maven/**</exclude> + <exclude>LICENSE.txt</exclude> + <exclude>NOTICE.txt</exclude> + <exclude>mozilla/**</exclude> + <exclude>**/module-info.class</exclude> + </excludes> + </filter> + </filters> + <transformers> + <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"></transformer> + </transformers> + </configuration> + <executions> + <execution> + <goals> + <goal>shade</goal> + </goals> + <phase>package</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> diff --git a/extensions/spark/kyuubi-spark-lineage-shaded/src/main/resources/META-INF/LICENSE b/extensions/spark/kyuubi-spark-lineage-shaded/src/main/resources/META-INF/LICENSE new file mode 100644 index 0000000000..d645695673 --- /dev/null +++ b/extensions/spark/kyuubi-spark-lineage-shaded/src/main/resources/META-INF/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. diff --git a/extensions/spark/kyuubi-spark-lineage-shaded/src/main/resources/META-INF/NOTICE b/extensions/spark/kyuubi-spark-lineage-shaded/src/main/resources/META-INF/NOTICE new file mode 100644 index 0000000000..85fe494c78 --- /dev/null +++ b/extensions/spark/kyuubi-spark-lineage-shaded/src/main/resources/META-INF/NOTICE @@ -0,0 +1,5 @@ +Apache Kyuubi +Copyright 2021-2024 The Apache Software Foundation. + +This product includes software developed at +The Apache Software Foundation (https://www.apache.org/). diff --git a/pom.xml b/pom.xml index a0d8d16295..85a7cc27db 100644 --- a/pom.xml +++ b/pom.xml @@ -62,6 +62,7 @@ <module>extensions/spark/kyuubi-spark-connector-tpcds</module> <module>extensions/spark/kyuubi-spark-connector-tpch</module> <module>extensions/spark/kyuubi-spark-lineage</module> + <module>extensions/spark/kyuubi-spark-lineage-shaded</module> <module>extensions/spark/kyuubi-spark-jvm-quake</module> <module>externals/kyuubi-chat-engine</module> <module>externals/kyuubi-download</module>