Skip to content
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

Add scala version suffix on scala modules #888

Closed
wants to merge 8 commits into from
Closed

Add scala version suffix on scala modules #888

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1ca31de
Add scala version suffix on scala modules
pan3793 Aug 3, 2021
cac9653
Enable kyuubi-extension-spark-3-1 in daily publish snapshot
pan3793 Aug 3, 2021
2cf4793
fix
pan3793 Aug 3, 2021
a154775
Fix engine jar name
pan3793 Aug 3, 2021
5178847
Fixup
pan3793 Aug 3, 2021
6090c79
Fix shade
pan3793 Aug 3, 2021
16cb263
remove hardcode scala version in pom
pan3793 Aug 3, 2021
571eb9c
comments
pan3793 Aug 3, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/publish-snapshot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ jobs:
ASF_PASSWORD: ${{ secrets.NEXUS_PW }}
run: |
rm -rf ~/.m2/repository/org/apache/kyuubi
./build/mvn clean deploy -DskipTests -Pspark-provided -s ./build/release/asf-settings.xml
./build/mvn clean deploy -DskipTests -Pkyuubi-extension-spark-3-1,spark-provided -s ./build/release/asf-settings.xml
10 changes: 5 additions & 5 deletions build/dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,22 +191,22 @@ echo "Build flags: $@" >> "$DISTDIR/RELEASE"
cp -r "$KYUUBI_HOME/kyuubi-assembly/target/scala-$SCALA_VERSION/jars/" "$DISTDIR/jars"

# Copy spark engines
cp "$KYUUBI_HOME/externals/kyuubi-spark-sql-engine/target/kyuubi-spark-sql-engine-$VERSION.jar" "$DISTDIR/externals/engines/spark"
cp "$KYUUBI_HOME/externals/kyuubi-spark-sql-engine/target/kyuubi-spark-sql-engine_${SCALA_VERSION}-${VERSION}.jar" "$DISTDIR/externals/engines/spark"

# Copy kyuubi tools
if [[ -f "$KYUUBI_HOME/tools/spark-block-cleaner/target/spark-block-cleaner-$VERSION.jar" ]]; then
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"
mkdir -p "$DISTDIR/tools/spark-block-cleaner/jars"
cp -r "$KYUUBI_HOME/tools/spark-block-cleaner/kubernetes/" "$DISTDIR/tools/spark-block-cleaner/"
cp "$KYUUBI_HOME/tools/spark-block-cleaner/target/spark-block-cleaner-$VERSION.jar" "$DISTDIR/tools/spark-block-cleaner/jars/"
cp "$KYUUBI_HOME/tools/spark-block-cleaner/target/spark-block-cleaner_${SCALA_VERSION}-${VERSION}.jar" "$DISTDIR/tools/spark-block-cleaner/jars/"
fi

# Copy Kyuubi extension
SPARK_EXTENSION_VERSIONS=('3-1')
for SPARK_EXTENSION_VERSION in ${SPARK_EXTENSION_VERSIONS[@]}; do
if [[ -f $"$KYUUBI_HOME/dev/kyuubi-extension-spark-$SPARK_EXTENSION_VERSION/target/kyuubi-extension-spark-$SPARK_EXTENSION_VERSION-$VERSION.jar" ]]; then
if [[ -f $"$KYUUBI_HOME/dev/kyuubi-extension-spark-$SPARK_EXTENSION_VERSION/target/kyuubi-extension-spark-$SPARK_EXTENSION_VERSION_${SCALA_VERSION}-${VERSION}.jar" ]]; then
mkdir -p "$DISTDIR/extension"
cp "$KYUUBI_HOME/dev/kyuubi-extension-spark-$SPARK_EXTENSION_VERSION/target/kyuubi-extension-spark-$SPARK_EXTENSION_VERSION-$VERSION.jar" "$DISTDIR/extension"
cp "$KYUUBI_HOME/dev/kyuubi-extension-spark-$SPARK_EXTENSION_VERSION/target/kyuubi-extension-spark-$SPARK_EXTENSION_VERSION_${SCALA_VERSION}-${VERSION}.jar" "$DISTDIR/extension"
fi
done

Expand Down
16 changes: 8 additions & 8 deletions dev/kyuubi-codecov/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,50 +27,50 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>kyuubi-codecov</artifactId>
<artifactId>kyuubi-codecov_2.12</artifactId>
<packaging>pom</packaging>
<name>Kyuubi Project Dev Code Coverage</name>

<dependencies>
<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-common</artifactId>
<artifactId>kyuubi-common_2.12</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-ctl</artifactId>
<artifactId>kyuubi-ctl_2.12</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-zookeeper</artifactId>
<artifactId>kyuubi-zookeeper_2.12</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-ha</artifactId>
<artifactId>kyuubi-ha_2.12</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-metrics</artifactId>
<artifactId>kyuubi-metrics_2.12</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-server</artifactId>
<artifactId>kyuubi-server_2.12</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-spark-sql-engine</artifactId>
<artifactId>kyuubi-spark-sql-engine_2.12</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dev/kyuubi-extension-spark-3-1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>kyuubi-extension-spark-3-1</artifactId>
<artifactId>kyuubi-extension-spark-3-1_2.12</artifactId>
<packaging>jar</packaging>
<name>Kyuubi Project Dev Spark Extensions (for Spark 3.1)</name>

Expand Down
2 changes: 1 addition & 1 deletion dev/kyuubi-tpcds/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>kyuubi-tpcds</artifactId>
<artifactId>kyuubi-tpcds_2.12</artifactId>
<packaging>jar</packaging>
<name>Kyuubi Project Dev TPCDS Generator</name>

Expand Down
4 changes: 2 additions & 2 deletions externals/kyuubi-spark-monitor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>kyuubi-spark-monitor</artifactId>
<artifactId>kyuubi-spark-monitor_2.12</artifactId>
<packaging>jar</packaging>
<name>Kyuubi Project Spark Monitor</name>

<dependencies>
<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-common</artifactId>
<artifactId>kyuubi-common_2.12</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
12 changes: 6 additions & 6 deletions externals/kyuubi-spark-sql-engine/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,26 +27,26 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>kyuubi-spark-sql-engine</artifactId>
<artifactId>kyuubi-spark-sql-engine_2.12</artifactId>
<name>Kyuubi Project Engine Spark SQL</name>
<packaging>jar</packaging>

<dependencies>
<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-common</artifactId>
<artifactId>kyuubi-common_2.12</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-ha</artifactId>
<artifactId>kyuubi-ha_2.12</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-spark-monitor</artifactId>
<artifactId>kyuubi-spark-monitor_2.12</artifactId>
<version>${project.version}</version>
</dependency>

Expand All @@ -58,7 +58,7 @@

<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-common</artifactId>
<artifactId>kyuubi-common_2.12</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down Expand Up @@ -165,7 +165,7 @@

<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-zookeeper</artifactId>
<artifactId>kyuubi-zookeeper_2.12</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Expand Down
18 changes: 9 additions & 9 deletions kubernetes/integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,32 +26,32 @@
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>kubernetes-integration-tests_2.12</artifactId>
<name>Kyuubi Kubernetes Integration Tests</name>
<modelVersion>4.0.0</modelVersion>

<artifactId>kubernetes-integration-tests</artifactId>

<dependencies>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
</dependency>

<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-common</artifactId>
<artifactId>kyuubi-common_2.12</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-common</artifactId>
<artifactId>kyuubi-common_2.12</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
<scope>test</scope>
</dependency>

<!-- for hive driver related dependency -->
<dependency>
<groupId>org.apache.kyuubi</groupId>
Expand Down
12 changes: 6 additions & 6 deletions kyuubi-assembly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,38 +28,38 @@
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>kyuubi-assembly</artifactId>
<artifactId>kyuubi-assembly_2.12</artifactId>
<packaging>pom</packaging>
<name>Kyuubi Project Assembly</name>

<dependencies>
<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-common</artifactId>
<artifactId>kyuubi-common_2.12</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-ha</artifactId>
<artifactId>kyuubi-ha_2.12</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-metrics</artifactId>
<artifactId>kyuubi-metrics_2.12</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-server</artifactId>
<artifactId>kyuubi-server_2.12</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-ctl</artifactId>
<artifactId>kyuubi-ctl_2.12</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion kyuubi-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>kyuubi-common</artifactId>
<artifactId>kyuubi-common_2.12</artifactId>
<packaging>jar</packaging>
<name>Kyuubi Project Common</name>

Expand Down
10 changes: 5 additions & 5 deletions kyuubi-ctl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>kyuubi-ctl</artifactId>
<artifactId>kyuubi-ctl_2.12</artifactId>
<packaging>jar</packaging>
<name>Kyuubi Project Control</name>

<dependencies>
<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-common</artifactId>
<artifactId>kyuubi-common_2.12</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-ha</artifactId>
<artifactId>kyuubi-ha_2.12</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down Expand Up @@ -85,7 +85,7 @@

<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-common</artifactId>
<artifactId>kyuubi-common_2.12</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand All @@ -105,7 +105,7 @@

<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-zookeeper</artifactId>
<artifactId>kyuubi-zookeeper_2.12</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions kyuubi-ha/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>kyuubi-ha</artifactId>
<artifactId>kyuubi-ha_2.12</artifactId>
<packaging>jar</packaging>
<name>Kyuubi Project High Availability</name>

<dependencies>
<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-common</artifactId>
<artifactId>kyuubi-common_2.12</artifactId>
<version>${project.version}</version>
</dependency>

Expand All @@ -55,7 +55,7 @@

<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-common</artifactId>
<artifactId>kyuubi-common_2.12</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand All @@ -75,7 +75,7 @@

<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-zookeeper</artifactId>
<artifactId>kyuubi-zookeeper_2.12</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Expand Down
9 changes: 6 additions & 3 deletions kyuubi-hive-jdbc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<!--
A scala-free module in runtime scope.
-->
<artifactId>kyuubi-hive-jdbc</artifactId>
<name>Kyuubi Project Hive JDBC Client</name>
<packaging>jar</packaging>
Expand Down Expand Up @@ -64,20 +67,20 @@

<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-common</artifactId>
<artifactId>kyuubi-common_2.12</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>

<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-spark-sql-engine</artifactId>
<artifactId>kyuubi-spark-sql-engine_2.12</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-spark-sql-engine</artifactId>
<artifactId>kyuubi-spark-sql-engine_2.12</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
Expand Down
Loading