andygrove opened a new pull request, #6398: URL: https://github.com/apache/datafusion-comet/pull/6398
## Which issue does this PR close? Closes #6380. ## Rationale for this change The 2026-09-29 nightly failed in the Spark 4.2 SQL test build before running any test. `dev/diffs/4.2.0.diff` still sets `<comet.version>1.1.0-SNAPSHOT</comet.version>`, so sbt asked for `comet-spark-spark4.2_2.13:1.1.0-SNAPSHOT`, while the Maven step had installed Comet as `1.2.0-SNAPSHOT`. The 4.2 diff landed in #4950 about 100 minutes before #6311 moved main to `1.2.0-SNAPSHOT`. The #6311 branch predated the new file, so it bumped only the four Spark diffs that existed when it was written. The two PRs don't conflict, and the Spark 4.2 suite runs only nightly or with the `run-spark-4.2-tests` label, so the merge queue never ran the combination. ## What changes are included in this PR? Sets `<comet.version>` in `dev/diffs/4.2.0.diff` to `1.2.0-SNAPSHOT`, matching the other Spark diffs. The diff is regenerated from a clean `v4.2.0` checkout, following the Spark SQL tests guide, so the `index` hash for `pom.xml` changes along with the version line. That is the same two-line change #6311 made to the other diffs. ## How are these changes tested? - `git apply --check` of the new diff succeeds on a clean Spark `v4.2.0` checkout. In the patched `pom.xml`, `comet.version` is `1.2.0-SNAPSHOT`, and the `comet-spark` dependency uses it. - `git grep '1.1.0-SNAPSHOT'` finds no other references on main outside the changelog. - The `run-spark-4.2-tests` label on this PR runs the Spark 4.2 SQL suite, which is the real check. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
