From 5cfa78e332732f3a99a2eec60cb18c6744576d8e Mon Sep 17 00:00:00 2001 From: Garland Zhang Date: Thu, 21 Aug 2025 15:33:44 +0000 Subject: [PATCH 1/2] Upgrade dbconnect in scala job to use 17.0 and scala 2.13 --- contrib/templates/scala-job/library/template_variables.tmpl | 6 +++--- .../scala-job/template/{{.project_name}}/build.sbt.tmpl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/templates/scala-job/library/template_variables.tmpl b/contrib/templates/scala-job/library/template_variables.tmpl index 3b666b1e..94507b31 100644 --- a/contrib/templates/scala-job/library/template_variables.tmpl +++ b/contrib/templates/scala-job/library/template_variables.tmpl @@ -3,15 +3,15 @@ {{- end }} {{ define `dbr_version` -}} - 16.4 + 17.0 {{- end }} {{ define `scala_major_minor_version` -}} - 2.12 + 2.13 {{- end }} {{ define `scala_version` -}} - {{template `scala_major_minor_version` .}}.18 + {{template `scala_major_minor_version` .}}.16 {{- end}} {{ define `java_version` -}} diff --git a/contrib/templates/scala-job/template/{{.project_name}}/build.sbt.tmpl b/contrib/templates/scala-job/template/{{.project_name}}/build.sbt.tmpl index 81d3cb0a..103423b3 100644 --- a/contrib/templates/scala-job/template/{{.project_name}}/build.sbt.tmpl +++ b/contrib/templates/scala-job/template/{{.project_name}}/build.sbt.tmpl @@ -6,7 +6,7 @@ name := "{{.project_name}}" organization := "{{template `organization` .}}" version := "{{template `version` .}}" -libraryDependencies += "com.databricks" % "databricks-connect" % "{{template `dbr_version` .}}.+" +libraryDependencies += "com.databricks" %% "databricks-connect" % "{{template `dbr_version` .}}.+" libraryDependencies += "org.slf4j" % "slf4j-simple" % "2.0.16" libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.19" % Test From f9573cc226bfda766709e0eedb408a59061c1599 Mon Sep 17 00:00:00 2001 From: Garland Zhang Date: Thu, 21 Aug 2025 15:41:33 +0000 Subject: [PATCH 2/2] also update client image version --- .../{{.project_name}}/resources/{{.project_name}}.job.yml.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/templates/scala-job/template/{{.project_name}}/resources/{{.project_name}}.job.yml.tmpl b/contrib/templates/scala-job/template/{{.project_name}}/resources/{{.project_name}}.job.yml.tmpl index 89f47fc3..6a384ebf 100644 --- a/contrib/templates/scala-job/template/{{.project_name}}/resources/{{.project_name}}.job.yml.tmpl +++ b/contrib/templates/scala-job/template/{{.project_name}}/resources/{{.project_name}}.job.yml.tmpl @@ -12,6 +12,6 @@ resources: environments: - environment_key: default spec: - client: "3" + client: "4" jar_dependencies: - ${workspace.artifact_path}/.internal/{{.project_name}}-assembly-{{template `version` .}}.jar