Skip to content

Commit 77571fd

Browse files
rakeshkashyap123rkashyap
andauthored
Fix broken CI tests and test release code (#894)
* Release branch test * Add v to version number * add back some missing dependencies * Add snowflake, cosmos dependencies to buildscript dependency * Fix snowflake version * Add snowflake and cosmos as a dependency * Add few more missing dependencies * Remove META-INF * Add sql server dependency * Add spark-core 3.1 dependency * add spark sql kafka * Add jetty * add compileOnly implementations * Latest version of cosmos * Latest version of cosmos * add sqllite dependency * upgrade to spark 3.2 * Experiment by changing to only provided * Change to implementation of snowflake componenets * update version * Align all implementations before provided in gradle file Co-authored-by: rkashyap <rkashyap@linkedin.com>
1 parent e9495d4 commit 77571fd

File tree

4 files changed

+25
-3
lines changed

4 files changed

+25
-3
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ build
217217
.bloop/
218218
project/.bloop
219219
metals.sbt
220+
feathr-data-models/src/mainGeneratedDataTemplate/
220221

221222
.bsp/sbt.json
222223

build.gradle

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ jar {
5555
from {
5656
configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
5757
}
58+
exclude 'META-INF/*.RSA', 'META-INF/*.SF','META-INF/*.DSA'
59+
zip64 = true
5860
}
5961

6062
dependencies {
@@ -64,6 +66,16 @@ dependencies {
6466
implementation project(":feathr-impl")
6567
// needed to include data models in jar
6668
extraLibs project(path: ':feathr-data-models', configuration: 'dataTemplate')
69+
implementation 'net.snowflake:snowflake-jdbc:3.13.18'
70+
implementation 'net.snowflake:spark-snowflake_2.12:2.10.0-spark_3.2'
71+
provided 'com.microsoft.azure:azure-eventhubs-spark_2.12:2.3.21'
72+
provided 'com.azure.cosmos.spark:azure-cosmos-spark_3-2_2-12:4.11.1'
73+
provided 'com.microsoft.sqlserver:mssql-jdbc:10.2.0.jre8'
74+
provided 'org.eclipse.jetty:jetty-util:9.3.24.v20180605'
75+
provided 'org.apache.kafka:kafka-clients:3.1.0'
76+
provided 'org.apache.spark:spark-core_2.12:3.1.3'
77+
provided 'org.apache.spark:spark-sql-kafka-0-10_2.12:3.1.3'
78+
provided 'org.postgresql:postgresql:42.3.4'
6779
}
6880

6981
ext {
@@ -105,22 +117,31 @@ project.ext.spec = [
105117
'spark_hive' : "org.apache.spark:spark-hive_$ver.scala_rt:$ver.spark",
106118
'spark_sql' : "org.apache.spark:spark-sql_$ver.scala_rt:$ver.spark",
107119
'spark_catalyst' : "org.apache.spark:spark-catalyst_$ver.scala_rt:$ver.spark",
120+
"spark_sql_kafka" : "org.apache.spark:spark-sql-kafka-0-10_$ver.scala_rt:3.1.3"
108121
],
109122
'scala' : [
110123
'scala_library' : "org.scala-lang:scala-library:$ver.scala",
111124
'scalatest' : "org.scalatest:scalatest_$ver.scala_rt:3.0.0",
112125
],
113126
'avro' : "org.apache.avro:avro:1.10.2",
114127
"avroUtil": "com.linkedin.avroutil1:helper-all:0.2.100",
128+
"azure": "com.microsoft.azure:azure-eventhubs-spark_2.12:2.3.21",
115129
'fastutil' : "it.unimi.dsi:fastutil:8.1.1",
116130
'mvel' : "org.mvel:mvel2:2.2.8.Final",
117-
'protobuf' : "com.google.protobuf:protobuf-java:3.19.4",
131+
'protobuf' : "com.google.protobuf:protobuf-java:2.6.1",
118132
'guava' : "com.google.guava:guava:25.0-jre",
119133
'xbean' : "org.apache.xbean:xbean-asm6-shaded:4.10",
120134
'log4j' : "log4j:log4j:1.2.17",
135+
'jetty': "org.eclipse.jetty:jetty-util:9.3.24.v20180605",
136+
'kafka': "org.apache.kafka:kafka-clients:3.1.0",
137+
121138
'json' : "org.json:json:20180130",
139+
'sqlserver': "com.microsoft.sqlserver:mssql-jdbc:10.2.0.jre8",
140+
'postgresql': "org.postgresql:postgresql:42.3.4",
122141
'equalsverifier' : "nl.jqno.equalsverifier:equalsverifier:3.1.12",
123142
'mockito' : "org.mockito:mockito-core:3.1.0",
143+
'snowflake-jdbc' : "net.snowflake:3.13.18",
144+
"spark-snowflake_2.12" : "net.snowflake:2.10.0-spark_3.2",
124145
"mockito_inline": "org.mockito:mockito-inline:2.28.2",
125146
'testing' : "org.testng:testng:6.14.3",
126147
'jdiagnostics' : "org.anarres.jdiagnostics:jdiagnostics:1.0.7",

feathr-impl/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ dependencies {
5656
implementation spec.product.guava
5757
implementation spec.product.xbean
5858
implementation spec.product.json
59-
implementation spec.product.avroUtil
6059
implementation spec.product.antlr
6160
implementation spec.product.antlrRuntime
6261

6362
implementation spec.product.jackson.jackson_databind
63+
provided spec.product.avroUtil
6464
provided spec.product.typesafe_config
6565
provided spec.product.log4j
6666
provided spec.product.hadoop.common

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
version=0.11.1-rc1
1+
version=v0.10.3-rc5
22
SONATYPE_AUTOMATIC_RELEASE=true
33
POM_ARTIFACT_ID=feathr_2.12

0 commit comments

Comments
 (0)