Skip to content

Commit

Permalink
Revert "Adding azure-cosmos-package to databricks spark config (#972)" (
Browse files Browse the repository at this point in the history
#1002)

This reverts commit 3859fca.
  • Loading branch information
blrchen authored Jan 20, 2023
1 parent 97b42d9 commit 0b4f5f3
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pull_request_push_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
SPARK_CONFIG__SPARK_CLUSTER: databricks
SPARK_CONFIG__DATABRICKS__WORKSPACE_INSTANCE_URL: ${{secrets.DATABRICKS_HOST}}
DATABRICKS_WORKSPACE_TOKEN_VALUE: ${{secrets.DATABRICKS_WORKSPACE_TOKEN_VALUE}}
SPARK_CONFIG__DATABRICKS__CONFIG_TEMPLATE: '{"run_name":"FEATHR_FILL_IN","new_cluster":{"spark_version":"9.1.x-scala2.12","num_workers":1,"spark_conf":{"FEATHR_FILL_IN":"FEATHR_FILL_IN"},"instance_pool_id":"${{secrets.DATABRICKS_INSTANCE_POOL_ID}}"},"libraries":[{"maven": {"coordinates": "com.azure.cosmos.spark:azure-cosmos-spark_3-1_2-12:4.16.0"}}],"spark_jar_task":{"main_class_name":"FEATHR_FILL_IN","parameters":["FEATHR_FILL_IN"]}}'
SPARK_CONFIG__DATABRICKS__CONFIG_TEMPLATE: '{"run_name":"FEATHR_FILL_IN","new_cluster":{"spark_version":"9.1.x-scala2.12","num_workers":1,"spark_conf":{"FEATHR_FILL_IN":"FEATHR_FILL_IN"},"instance_pool_id":"${{secrets.DATABRICKS_INSTANCE_POOL_ID}}"},"libraries":[{"jar":"FEATHR_FILL_IN"}],"spark_jar_task":{"main_class_name":"FEATHR_FILL_IN","parameters":["FEATHR_FILL_IN"]}}'
REDIS_PASSWORD: ${{secrets.REDIS_PASSWORD}}
AZURE_CLIENT_ID: ${{secrets.AZURE_CLIENT_ID}}
AZURE_TENANT_ID: ${{secrets.AZURE_TENANT_ID}}
Expand Down
3 changes: 1 addition & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ dependencies {
implementation 'net.snowflake:snowflake-jdbc:3.13.18'
implementation 'net.snowflake:spark-snowflake_2.12:2.10.0-spark_3.2'
provided 'com.microsoft.azure:azure-eventhubs-spark_2.12:2.3.21'
implementation 'com.azure.cosmos.spark:azure-cosmos-spark_3-1_2-12:4.16.0'
provided 'com.azure.cosmos.spark:azure-cosmos-spark_3-2_2-12:4.11.1'
provided 'com.microsoft.sqlserver:mssql-jdbc:10.2.0.jre8'
provided 'org.eclipse.jetty:jetty-util:9.3.24.v20180605'
provided 'org.apache.kafka:kafka-clients:3.1.0'
Expand Down Expand Up @@ -130,7 +130,6 @@ project.ext.spec = [
'avro' : "org.apache.avro:avro:1.10.2",
"avroUtil": "com.linkedin.avroutil1:helper-all:0.2.100",
"azure": "com.microsoft.azure:azure-eventhubs-spark_2.12:2.3.21",
"spark_cosmos": "com.azure.cosmos.spark:azure-cosmos-spark_3-1_2-12:4.16.0",
'fastutil' : "it.unimi.dsi:fastutil:8.1.1",
'mvel' : "org.mvel:mvel2:2.2.8.Final",
'protobuf' : "com.google.protobuf:protobuf-java:2.6.1",
Expand Down
2 changes: 0 additions & 2 deletions feathr-impl/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ dependencies {
implementation spec.product.jackson.dataformat_hocon
implementation spec.product.jackson.jackson_core
implementation spec.product.spark_redis
implementation spec.product.spark_cosmos
implementation spec.product.fastutil
implementation spec.product.hadoop.mapreduce_client_core
implementation spec.product.mvel
Expand Down Expand Up @@ -78,7 +77,6 @@ dependencies {

testImplementation spec.product.equalsverifier
testImplementation spec.product.spark.spark_catalyst
testImplementation spec.product.spark_cosmos
testImplementation spec.product.mockito
testImplementation spec.product.scala.scalatest
testImplementation spec.product.testing
Expand Down

0 comments on commit 0b4f5f3

Please sign in to comment.