Skip to content

Commit

Permalink
rdar://114213400 Bump spark-call-home-listener to 0.2.31 (apache#1855)
Browse files Browse the repository at this point in the history
### What changes were proposed in this pull request?
Bump the `spark-call-home-listener` to 0.2.31.

### Why are the changes needed?
This version addresses API differences that are specific to Spark 3.4.0.  This differences caused failures.

During testing, it was also identified that there were problems introduced due to the circular dependencies between Spark and `spark-call-home`.  The builds were updated to exclude `spark-call-home-listener` from Spark.

### Does this PR introduce _any_ user-facing change?
No

### How was this patch tested?
The gradle build was updated to add new Spark 3.4 profiles, and the build-specific profiles were used in all building.  This demonstrated the API issue, causing the build to fail.  In addition new PR builds were introduced to perform this testing as part of each PR.  In addition, the tests were supplemented by builds and tests of Spark with the PR-built `spark-call-home-listener` were added to ensure that Spark was unaffected.

In addition, the latest Spark release image was patched to replace the `spark-call-home-listener` jar, and this was used to run `spark-perf` benchmarks.

### Was this patch authored or co-authored using generative AI tooling?
No

### Patch
https://github.pie.apple.com/pie-spark/spark-call-home/compare/f2eb2d0b2b...a93f3d08bb

- feat: Apply spark and scala profile (apache#115)
- fix: Handle default Spark for macros and exclude circular dependency (apache#116)
- build: Replace gala-platform-runtime with ubi9-minimal/java11-runtime (apache#118)
- build: Update base image for docker deploy (apache#119)
  • Loading branch information
Steve Vaughan Jr authored and GitHub Enterprise committed Sep 20, 2023
1 parent 66eec64 commit fd70205
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@
</dependency>
<dependency>
<groupId>com.apple.pie.data</groupId>
<artifactId>spark-call-home-listener_${scala.binary.version}_spark3.3.0</artifactId>
<artifactId>spark-call-home-listener_${scala.binary.version}_spark3.4.0</artifactId>
</dependency>
<dependency>
<groupId>org.apache.parquet</groupId>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@
<selenium.version>4.7.2</selenium.version>
<htmlunit-driver.version>4.7.2</htmlunit-driver.version>
<htmlunit.version>2.67.0</htmlunit.version>
<acispark.callhome.version>0.2.29</acispark.callhome.version>
<acispark.callhome.version>0.2.31</acispark.callhome.version>
<aciparquet.kms.version>1.1.6-apple</aciparquet.kms.version>
<maven-antrun.version>1.8</maven-antrun.version>
<commons-crypto.version>1.1.0</commons-crypto.version>
Expand Down Expand Up @@ -2744,7 +2744,7 @@
</dependency>
<dependency>
<groupId>com.apple.pie.data</groupId>
<artifactId>spark-call-home-listener_${scala.binary.version}_spark3.3.0</artifactId>
<artifactId>spark-call-home-listener_${scala.binary.version}_spark3.4.0</artifactId>
<version>${acispark.callhome.version}</version>
<exclusions>
<exclusion>
Expand Down

0 comments on commit fd70205

Please sign in to comment.