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

Keep Spark version in a single place only (BeamModulePlugin) #23603

Merged
merged 1 commit into from
Oct 19, 2022
Merged

Keep Spark version in a single place only (BeamModulePlugin) #23603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,10 @@ class BeamModulePlugin implements Plugin<Project> {
def arrow_version = "5.0.0"
def jmh_version = "1.34"

// Export Spark versions, so they are defined in a single place only
project.ext.spark2_version = spark2_version
Copy link
Contributor

@aromanenko-dev aromanenko-dev Oct 18, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: It'd be worth to mention that spark 2 is deprecated in Beam

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll add some comments as part of #23728

project.ext.spark3_version = spark3_version

// A map of maps containing common libraries used per language. To use:
// dependencies {
// compile library.java.slf4j_api
Expand Down
4 changes: 2 additions & 2 deletions runners/spark/2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
def basePath = '..'
/* All properties required for loading the Spark build script */
project.ext {
// Set the version of all Spark-related dependencies here.
spark_version = '2.4.8'
// Spark 2 version as defined in BeamModulePlugin
spark_version = spark2_version
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As a side note - it's ambiguous to have two types of the naming style (underscore and camel case) in the same config file.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not going to fix all inconsistencies at once ;)

spark_scala_version = '2.11'
// Copy shared sources for Spark 2 to use Spark 3 as primary version in place
copySourceBase = true
Expand Down
6 changes: 3 additions & 3 deletions runners/spark/3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
def basePath = '..'
/* All properties required for loading the Spark build script */
project.ext {
// Set the version of all Spark-related dependencies here.
spark_version = '3.1.2'
// Spark 3 version as defined in BeamModulePlugin
spark_version = spark3_version
spark_scala_version = '2.12'
copySourceBase = false // disabled to use Spark 3 as primary dev version
archives_base_name = 'beam-runners-spark-3'
Expand All @@ -29,7 +29,7 @@ project.ext {
// Load the main build script which contains all build logic.
apply from: "$basePath/spark_runner.gradle"


// Additional supported Spark versions (used in compatibility tests)
def sparkVersions = [
"330": "3.3.0",
"321": "3.2.1"
Expand Down