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

Jump to bottom

Consistent Spark version for test and production #1767

Merged
merged 1 commit into from
Feb 19, 2021
Merged

Consistent Spark version for test and production #1767

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
10 changes: 5 additions & 5 deletions integration_tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,31 +29,31 @@
<version>0.4.0-SNAPSHOT</version>

<properties>
<spark.test.version>3.0.0</spark.test.version>
<spark.test.version>${spark300.version}</spark.test.version>
</properties>
<profiles>
<profile>
<id>spark301dbtests</id>
<properties>
<spark.test.version>3.0.1-databricks</spark.test.version>
<spark.test.version>${spark301db.version}</spark.test.version>
</properties>
</profile>
<profile>
<id>spark301tests</id>
<properties>
<spark.test.version>3.0.1</spark.test.version>
<spark.test.version>${spark301.version}</spark.test.version>
</properties>
</profile>
<profile>
<id>spark302tests</id>
<properties>
<spark.test.version>3.0.2-SNAPSHOT</spark.test.version>
<spark.test.version>${spark302.version}</spark.test.version>
</properties>
</profile>
<profile>
<id>spark311tests</id>
<properties>
<spark.test.version>3.1.1-SNAPSHOT</spark.test.version>
<spark.test.version>${spark311.version}</spark.test.version>
</properties>
</profile>
</profiles>
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<spark.version>3.0.0</spark.version>
<spark.version>${spark300.version}</spark.version>
<cuda.version>cuda10-1</cuda.version>
<cudf.version>0.18-SNAPSHOT</cudf.version>
<scala.binary.version>2.12</scala.binary.version>
Expand Down Expand Up @@ -174,6 +174,7 @@
If you update a dependendy version so it is no longer a SNAPSHOT
please update the snapshot-shims profile as well so it is accurate -->
<spark301.version>3.0.1</spark301.version>
<spark301db.version>3.0.1-databricks</spark301db.version>
<spark302.version>3.0.2-SNAPSHOT</spark302.version>
<spark311.version>3.1.1-SNAPSHOT</spark311.version>
<mockito.version>3.6.0</mockito.version>
Expand Down
2 changes: 1 addition & 1 deletion tests-spark310+/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<version>0.4.0-SNAPSHOT</version>

<properties>
<spark.test.version>3.1.0-SNAPSHOT</spark.test.version>
<spark.test.version>${spark311.version}</spark.test.version>
</properties>

<dependencies>
Expand Down
12 changes: 6 additions & 6 deletions tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,31 +31,31 @@
<version>0.4.0-SNAPSHOT</version>

<properties>
<spark.test.version>3.0.0</spark.test.version>
<spark.test.version>${spark300.version}</spark.test.version>
</properties>
<profiles>
<profile>
<id>spark301dbtests</id>
<properties>
<spark.test.version>3.0.1-databricks</spark.test.version>
<spark.test.version>${spark301db.version}</spark.test.version>
</properties>
</profile>
<profile>
<id>spark301tests</id>
<properties>
<spark.test.version>3.0.1</spark.test.version>
<spark.test.version>${spark301.version}</spark.test.version>
</properties>
</profile>
<profile>
<id>spark302tests</id>
<properties>
<spark.test.version>3.0.2-SNAPSHOT</spark.test.version>
<spark.test.version>${spark302.version}</spark.test.version>
</properties>
</profile>
<profile>
<id>spark311tests</id>
<properties>
<spark.test.version>3.1.1-SNAPSHOT</spark.test.version>
<spark.test.version>${spark311.version}</spark.test.version>
</properties>
</profile>
</profiles>
Expand All @@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_${scala.binary.version}</artifactId>
<version>${spark.test.version}</version>
<version>${spark.test.version}</version>
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
Expand Down