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

Build transport with lyft version of spark #83

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Build transport with lyft version of spark #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c01e05
Build with lyft version of spark
s-pedamallu Jul 21, 2021
93c670b
fixes build failures?
s-pedamallu Jul 27, 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 defaultEnvironment.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ subprojects {
project.ext.setProperty('trino-version', '352')
project.ext.setProperty('airlift-slice-version', '0.39')
project.ext.setProperty('spark-group', 'org.apache.spark')
project.ext.setProperty('spark-version', '2.3.0')
project.ext.setProperty('spark-version', '3.1.1')
}
4 changes: 2 additions & 2 deletions transportable-udfs-plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ def writeVersionInfo = { file ->
entry(key: "transport-version", value: version)
entry(key: "hive-version", value: '1.2.2')
entry(key: "trino-version", value: '352')
entry(key: "spark-version", value: '2.3.0')
entry(key: "scala-version", value: '2.11.8')
entry(key: "spark-version", value: '3.1.1')
entry(key: "scala-version", value: '2.12.10')
}
}

Expand Down
2 changes: 1 addition & 1 deletion transportable-udfs-plugin/src/main/java/com/linkedin/transport/plugin/Defaults.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ private static final String getVersion(final String platform) {
JavaLanguageVersion.of(8),
ImmutableList.of(
DependencyConfiguration.builder(IMPLEMENTATION, "com.linkedin.transport:transportable-udfs-spark", TRANSPORT_VERSION).build(),
DependencyConfiguration.builder(COMPILE_ONLY, "org.apache.spark:spark-sql_2.11", SPARK_VERSION).build()
DependencyConfiguration.builder(COMPILE_ONLY, "org.apache.spark:spark-sql_2.12", SPARK_VERSION).build()
),
ImmutableList.of(
DependencyConfiguration.builder(RUNTIME_ONLY, "com.linkedin.transport:transportable-udfs-test-spark", TRANSPORT_VERSION).build()
Expand Down
8 changes: 4 additions & 4 deletions transportable-udfs-spark/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ dependencies {
compile project(':transportable-udfs-utils')
// For spark-core and spark-sql dependencies, we exclude transitive dependency on 'jackson-module-paranamer',
// since this is required for the LinkedIn version of spark-core and spark-sql.
compileOnly(group: project.ext.'spark-group', name: 'spark-core_2.11', version: project.ext.'spark-version') {
compileOnly(group: project.ext.'spark-group', name: 'spark-core_2.12', version: project.ext.'spark-version') {
exclude module: 'jackson-module-paranamer'
}
compileOnly(group: project.ext.'spark-group', name: 'spark-sql_2.11', version: project.ext.'spark-version') {
compileOnly(group: project.ext.'spark-group', name: 'spark-sql_2.12', version: project.ext.'spark-version') {
exclude module: 'jackson-module-paranamer'
}
compileOnly('com.fasterxml.jackson.module:jackson-module-paranamer:2.6.7')
testCompile(group: project.ext.'spark-group', name: 'spark-core_2.11', version: project.ext.'spark-version') {
testCompile(group: project.ext.'spark-group', name: 'spark-core_2.12', version: project.ext.'spark-version') {
exclude module: 'jackson-module-paranamer'
}
testCompile(group: project.ext.'spark-group', name: 'spark-sql_2.11', version: project.ext.'spark-version') {
testCompile(group: project.ext.'spark-group', name: 'spark-sql_2.12', version: project.ext.'spark-version') {
exclude module: 'jackson-module-paranamer'
}
testCompile('com.fasterxml.jackson.module:jackson-module-paranamer:2.6.7')
Expand Down
6 changes: 3 additions & 3 deletions transportable-udfs-test/transportable-udfs-test-spark/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ dependencies {
compile project(":transportable-udfs-spark")
compile project(":transportable-udfs-test:transportable-udfs-test-api")
compile project(":transportable-udfs-test:transportable-udfs-test-spi")
compile('com.databricks:spark-avro_2.11:4.0.0')
compile(group: project.ext.'spark-group', name: 'spark-core_2.11', version: project.ext.'spark-version') {
compile('org.apache.spark:spark-avro_2.12:3.1.1')
compile(group: project.ext.'spark-group', name: 'spark-core_2.12', version: project.ext.'spark-version') {
exclude module: 'jackson-module-paranamer'
}
compile(group: project.ext.'spark-group', name: 'spark-sql_2.11', version: project.ext.'spark-version') {
compile(group: project.ext.'spark-group', name: 'spark-sql_2.12', version: project.ext.'spark-version') {
exclude module: 'jackson-module-paranamer'
}
compile('com.fasterxml.jackson.module:jackson-module-scala_2.11:2.7.9')
Expand Down