From 0b53b64edd1ce0f1027d694240d6cedb75a4ed14 Mon Sep 17 00:00:00 2001
From: Yann Bouzonie <yann@raw-labs.com>
Date: Mon, 29 Apr 2024 11:42:52 +0200
Subject: [PATCH] automatic module name for jinjava (#417)

---
 build.sbt                  | 1 -
 deps/others/build.sbt      | 8 ++++++--
 project/Dependencies.scala | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/build.sbt b/build.sbt
index ed51285d2..3c1ce9b4c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -376,7 +376,6 @@ lazy val jinjaSqlClient = (project in file("jinja-sql-client"))
     commonSettings,
     missingInterpolatorCompileSettings,
     testSettings,
-    Compile / packageBin / packageOptions += Package.ManifestAttributes("Automatic-Module-Name" -> "raw.python.jinja-sql"),
     libraryDependencies ++= Seq(
       jinjava
     )
diff --git a/deps/others/build.sbt b/deps/others/build.sbt
index 4b449c314..899ec7a2d 100644
--- a/deps/others/build.sbt
+++ b/deps/others/build.sbt
@@ -13,11 +13,14 @@ val jacksonModuleScala = "com.fasterxml.jackson.module" %% "jackson-module-scala
 
 val mysqlModule = "com.mysql" % "mysql-connector-j" % "8.1.0"
 
+val jinjava = "com.hubspot.jinjava" % "jinjava" % "2.7.2" exclude("com.google.code.findbugs", "annotations")
+
 libraryDependencies ++= Seq(
   jwtCore,
   scalaLogging,
   jacksonModuleScala,
-  mysqlModule
+  mysqlModule,
+  jinjava
 )
 
 // Map of artifact ID to module name
@@ -26,6 +29,7 @@ val moduleNames = Map(
   "scala-logging" -> "typesafe.scalalogging",
   "jackson-module-scala" -> "com.fasterxml.jackson.scala",
   "mysql-connector-j" -> "mysql.connector.j",
+  "jinjava" -> "jinjava"
 )
 
 def updatePom(pomFile: File, newVersion: String): Unit = {
@@ -157,4 +161,4 @@ createS3SyncScript := {
 
   // Notify that the task is completed
   println(s"Bash script created: $scriptFile")
-}
\ No newline at end of file
+}
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index e97cd4796..273c636f5 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -93,5 +93,5 @@ object Dependencies {
   // from sql-client
   val hikariCP = "com.zaxxer" % "HikariCP" % "5.1.0"
 
-  val jinjava = "com.hubspot.jinjava" % "jinjava" % "2.7.2" exclude("com.google.code.findbugs", "annotations")
+  val jinjava = "com.hubspot.jinjava" % "jinjava" % "2.7.2-rawlabs" exclude("com.google.code.findbugs", "annotations")
 }