Skip to content

Commit

Permalink
Downgrade Spark job runtime to use protobuf v2 to make maven jar work. (
Browse files Browse the repository at this point in the history
#637)

* Use protobuf v2 to make maven jar work.

* Bump version for v0.7.2 hotfix
  • Loading branch information
blrchen authored Sep 3, 2022
1 parent 8859830 commit 8752544
Show file tree
Hide file tree
Showing 6 changed files with 2,324 additions and 4,932 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ThisBuild / resolvers += Resolver.mavenLocal
ThisBuild / scalaVersion := "2.12.15"
ThisBuild / version := "0.7.1"
ThisBuild / version := "0.7.2"
ThisBuild / organization := "com.linkedin.feathr"
ThisBuild / organizationName := "linkedin"
val sparkVersion = "3.1.3"
Expand Down Expand Up @@ -39,7 +39,7 @@ val localAndCloudCommonDependencies = Seq(
"com.redislabs" %% "spark-redis" % "3.0.0",
"org.scalatest" %% "scalatest" % "3.0.9" % "test",
"org.apache.xbean" % "xbean-asm6-shaded" % "4.10",
"com.google.protobuf" % "protobuf-java" % "3.19.4",
"com.google.protobuf" % "protobuf-java" % "2.6.1",
"net.snowflake" % "snowflake-jdbc" % "3.13.18",
"net.snowflake" % "spark-snowflake_2.12" % "2.10.0-spark_3.2",
"org.apache.commons" % "commons-lang3" % "3.12.0",
Expand Down
2 changes: 1 addition & 1 deletion feathr_project/feathr/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@
TYPEDEF_ARRAY_DERIVED_FEATURE=f"array<feathr_derived_feature_{REGISTRY_TYPEDEF_VERSION}>"
TYPEDEF_ARRAY_ANCHOR_FEATURE=f"array<feathr_anchor_feature_{REGISTRY_TYPEDEF_VERSION}>"

FEATHR_MAVEN_ARTIFACT="com.linkedin.feathr:feathr_2.12:0.7.1"
FEATHR_MAVEN_ARTIFACT="com.linkedin.feathr:feathr_2.12:0.7.2"
2 changes: 1 addition & 1 deletion feathr_project/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

setup(
name='feathr',
version='0.7.1',
version='0.7.2',
long_description=long_description,
long_description_content_type="text/markdown",
author_email="[email protected]",
Expand Down
4 changes: 2 additions & 2 deletions feathr_project/test/test_user_workspace/feathr_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ spark_config:
# Feathr Job configuration. Support local paths, path start with http(s)://, and paths start with abfs(s)://
# this is the default location so end users don't have to compile the runtime again.
# feathr_runtime_location: wasbs://[email protected]/feathr-assembly-LATEST.jar
feathr_runtime_location: "../../target/scala-2.12/feathr-assembly-0.7.1.jar"
feathr_runtime_location: "../../target/scala-2.12/feathr-assembly-0.7.2.jar"
databricks:
# workspace instance
workspace_instance_url: 'https://adb-2474129336842816.16.azuredatabricks.net/'
Expand All @@ -93,7 +93,7 @@ spark_config:
# Feathr Job location. Support local paths, path start with http(s)://, and paths start with dbfs:/
work_dir: 'dbfs:/feathr_getting_started'
# this is the default location so end users don't have to compile the runtime again.
feathr_runtime_location: "../../target/scala-2.12/feathr-assembly-0.7.1.jar"
feathr_runtime_location: "../../target/scala-2.12/feathr-assembly-0.7.2.jar"

online_store:
redis:
Expand Down
Loading

0 comments on commit 8752544

Please sign in to comment.