update

apache · Oct 11, 2024 · 0756b4d · 0756b4d
1 parent 505ca01
commit 0756b4d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -541,7 +541,7 @@ jobs:
       run: |
         Rscript -e "install.packages(c('knitr', 'rmarkdown', 'testthat', 'e1071', 'survival', 'arrow', 'xml2'), repos='https://cloud.r-project.org/')"
         Rscript -e "pkg_list <- as.data.frame(installed.packages()[,c(1, 3:4)]); pkg_list[is.na(pkg_list$Priority), 1:2, drop = FALSE]"
-        shell: cmd
+      shell: cmd
     # SparkR build does not need Python. However, it shows warnings when the Python version is too low during
     # the attempt to look up Python Data Sources for session initialization. The Windows 2019 runner
     # includes Python 3.7, which Spark does not support. Therefore, we simply install the proper Python

diff --git a/assembly/pom.xml b/assembly/pom.xml
@@ -117,6 +117,12 @@
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-connect-client-jvm_${scala.binary.version}</artifactId>
       <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.spark</groupId>
+          <artifactId>spark-connect-shims_${scala.binary.version}</artifactId>
+        </exclusion>
+      </exclusions>
       <scope>provided</scope>
     </dependency>