You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kyuubi.apache.org by ch...@apache.org on 2022/08/15 13:13:15 UTC
[incubator-kyuubi] branch master updated: [KYUUBI #3138] [Subtask] DorisSQLEngine - Add jdbc engine to dist
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/incubator-kyuubi.git
The following commit(s) were added to refs/heads/master by this push:
new c473634e7 [KYUUBI #3138] [Subtask] DorisSQLEngine - Add jdbc engine to dist
c473634e7 is described below
commit c473634e745c58d00f0dafa25e9ca5bafab30359
Author: Min <zh...@163.com>
AuthorDate: Mon Aug 15 21:13:03 2022 +0800
[KYUUBI #3138] [Subtask] DorisSQLEngine - Add jdbc engine to dist
### _Why are the changes needed?_
close https://github.com/apache/incubator-kyuubi/issues/3138#issue-1316764571
### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible
- [ ] Add screenshots for manual tests if appropriate
- [ ] [Run test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request
Closes #3146 from zhaomin1423/dist_doris.
Closes #3138
8edfb174 [Min] [KYUUBI #3138] [Subtask] DorisSQLEngine - Add jdbc engine to dist
Authored-by: Min <zh...@163.com>
Signed-off-by: Cheng Pan <ch...@apache.org>
---
build/dist | 5 ++++
externals/kyuubi-jdbc-engine/pom.xml | 58 +++---------------------------------
2 files changed, 9 insertions(+), 54 deletions(-)
diff --git a/build/dist b/build/dist
index ead5eb8b9..6ea731128 100755
--- a/build/dist
+++ b/build/dist
@@ -217,6 +217,7 @@ mkdir -p "$DISTDIR/externals/engines/flink"
mkdir -p "$DISTDIR/externals/engines/spark"
mkdir -p "$DISTDIR/externals/engines/trino"
mkdir -p "$DISTDIR/externals/engines/hive"
+mkdir -p "$DISTDIR/externals/engines/jdbc"
mkdir -p "$DISTDIR/beeline-jars"
echo "Kyuubi $VERSION $GITREVSTRING built for" > "$DISTDIR/RELEASE"
echo "Java $JAVA_VERSION" >> "$DISTDIR/RELEASE"
@@ -256,6 +257,10 @@ cp -r "$KYUUBI_HOME/externals/kyuubi-trino-engine/target/scala-$SCALA_VERSION/ja
# Copy hive engines
cp "$KYUUBI_HOME/externals/kyuubi-hive-sql-engine/target/kyuubi-hive-sql-engine_${SCALA_VERSION}-${VERSION}.jar" "$DISTDIR/externals/engines/hive"
+# Copy jdbc engines
+cp "$KYUUBI_HOME/externals/kyuubi-jdbc-engine/target/kyuubi-jdbc-engine_${SCALA_VERSION}-${VERSION}.jar" "$DISTDIR/externals/engines/jdbc"
+cp -r "$KYUUBI_HOME/externals/kyuubi-jdbc-engine/target/scala-$SCALA_VERSION/jars/" "$DISTDIR/externals/engines/jdbc"
+
# Copy kyuubi tools
if [[ -f "$KYUUBI_HOME/tools/spark-block-cleaner/target/spark-block-cleaner_${SCALA_VERSION}-${VERSION}.jar" ]]; then
mkdir -p "$DISTDIR/tools/spark-block-cleaner/kubernetes"
diff --git a/externals/kyuubi-jdbc-engine/pom.xml b/externals/kyuubi-jdbc-engine/pom.xml
index 5c72d3e91..eb84c6157 100644
--- a/externals/kyuubi-jdbc-engine/pom.xml
+++ b/externals/kyuubi-jdbc-engine/pom.xml
@@ -43,12 +43,6 @@
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-ha_${scala.binary.version}</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -85,57 +79,13 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <configuration>
- <shadedArtifactAttached>false</shadedArtifactAttached>
- <artifactSet>
- <includes>
- <include>org.scala-lang:scala-library</include>
- <include>com.fasterxml.jackson.core:jackson-annotations</include>
- <include>com.fasterxml.jackson.core:jackson-core</include>
- <include>com.fasterxml.jackson.core:jackson-databind</include>
- <include>com.fasterxml.jackson.module:jackson-module-scala_2.12</include>
- <include>org.apache.kyuubi:kyuubi-common_${scala.binary.version}</include>
- <include>org.apache.kyuubi:kyuubi-events_${scala.binary.version}</include>
- <include>org.apache.kyuubi:kyuubi-ha_${scala.binary.version}</include>
- <include>org.apache.curator:curator-client</include>
- <include>org.apache.curator:curator-framework</include>
- <include>org.apache.curator:curator-recipes</include>
- </includes>
- </artifactSet>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</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>
- <relocations>
- <relocation>
- <pattern>org.apache.curator</pattern>
- <shadedPattern>${kyuubi.shade.packageName}.org.apache.curator</shadedPattern>
- <includes>
- <include>org.apache.curator.**</include>
- </includes>
- </relocation>
- </relocations>
- </configuration>
+ <artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
- <phase>package</phase>
+ <id>prepare-test-jar</id>
+ <phase>test-compile</phase>
<goals>
- <goal>shade</goal>
+ <goal>test-jar</goal>
</goals>
</execution>
</executions>