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

[SPARK-49080][SQL][TEST] Upgrade mssql-jdbc to 12.8.0.jre11 and MsSQLServer docker image tag to 2022-CU14-ubuntu-22.04 #47569

Closed
wants to merge 2 commits into from
Closed

[SPARK-49080][SQL][TEST] Upgrade mssql-jdbc to 12.8.0.jre11 and MsSQLServer docker image tag to 2022-CU14-ubuntu-22.04 #47569

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
70f4c8a
upgrade
wayneguow Aug 1, 2024
a38a9e7
update
wayneguow Aug 2, 2024
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 ...egration-tests/src/test/scala/org/apache/spark/sql/jdbc/MsSQLServerDatabaseOnDocker.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package org.apache.spark.sql.jdbc

class MsSQLServerDatabaseOnDocker extends DatabaseOnDocker {
override val imageName = sys.env.getOrElse("MSSQLSERVER_DOCKER_IMAGE_NAME",
"mcr.microsoft.com/mssql/server:2022-CU12-GDR1-ubuntu-22.04")
"mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04")
override val env = Map(
"SA_PASSWORD" -> "Sapass123",
"ACCEPT_EULA" -> "Y"
Expand Down
4 changes: 2 additions & 2 deletions ...egration-tests/src/test/scala/org/apache/spark/sql/jdbc/MsSqlServerIntegrationSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ import org.apache.spark.sql.types.{BinaryType, DecimalType}
import org.apache.spark.tags.DockerTest

/**
* To run this test suite for a specific version (e.g., 2019-CU13-ubuntu-20.04):
* To run this test suite for a specific version (e.g., 2022-CU14-ubuntu-22.04):
* {{{
* ENABLE_DOCKER_INTEGRATION_TESTS=1
* MSSQLSERVER_DOCKER_IMAGE_NAME=mcr.microsoft.com/mssql/server:2019-CU13-ubuntu-20.04
* MSSQLSERVER_DOCKER_IMAGE_NAME=mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04
* ./build/sbt -Pdocker-integration-tests
* "docker-integration-tests/testOnly org.apache.spark.sql.jdbc.MsSqlServerIntegrationSuite"
* }}}
Expand Down
4 changes: 2 additions & 2 deletions ...ation-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MsSqlServerIntegrationSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import org.apache.spark.sql.types._
import org.apache.spark.tags.DockerTest

/**
* To run this test suite for a specific version (e.g., 2019-CU13-ubuntu-20.04):
* To run this test suite for a specific version (e.g., 2022-CU14-ubuntu-22.04):
* {{{
* ENABLE_DOCKER_INTEGRATION_TESTS=1
* MSSQLSERVER_DOCKER_IMAGE_NAME=mcr.microsoft.com/mssql/server:2019-CU13-ubuntu-20.04
* MSSQLSERVER_DOCKER_IMAGE_NAME=mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04
* ./build/sbt -Pdocker-integration-tests "testOnly *v2*MsSqlServerIntegrationSuite"
* }}}
*/
Expand Down
4 changes: 2 additions & 2 deletions ...gration-tests/src/test/scala/org/apache/spark/sql/jdbc/v2/MsSqlServerNamespaceSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ import org.apache.spark.sql.util.CaseInsensitiveStringMap
import org.apache.spark.tags.DockerTest

/**
* To run this test suite for a specific version (e.g., 2019-CU13-ubuntu-20.04):
* To run this test suite for a specific version (e.g., 2022-CU14-ubuntu-22.04):
* {{{
* ENABLE_DOCKER_INTEGRATION_TESTS=1
* MSSQLSERVER_DOCKER_IMAGE_NAME=mcr.microsoft.com/mssql/server:2019-CU13-ubuntu-20.04
* MSSQLSERVER_DOCKER_IMAGE_NAME=mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04
* ./build/sbt -Pdocker-integration-tests "testOnly *v2.MsSqlServerNamespaceSuite"
* }}}
*/
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@
<mysql.connector.version>9.0.0</mysql.connector.version>
<postgresql.version>42.7.3</postgresql.version>
<db2.jcc.version>11.5.9.0</db2.jcc.version>
<mssql.jdbc.version>12.6.3.jre11</mssql.jdbc.version>
<mssql.jdbc.version>12.8.0.jre11</mssql.jdbc.version>
<ojdbc11.version>23.4.0.24.05</ojdbc11.version>
</properties>
<repositories>
Expand Down