From 802d47e55cd9c70b84c71de543dd84ca74f54f43 Mon Sep 17 00:00:00 2001
From: Hongxin Liang <honnix@users.noreply.github.com>
Date: Thu, 28 Sep 2023 15:36:50 +0200
Subject: [PATCH 1/3] Fix bom by appending scala version

Signed-off-by: Hongxin Liang <honnix@users.noreply.github.com>
---
 flytekit-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flytekit-bom/pom.xml b/flytekit-bom/pom.xml
index 96f480709..4e667c6f2 100644
--- a/flytekit-bom/pom.xml
+++ b/flytekit-bom/pom.xml
@@ -92,7 +92,7 @@
       </dependency>
       <dependency>
         <groupId>org.flyte</groupId>
-        <artifactId>flytekit-scala-tests</artifactId>
+        <artifactId>flytekit-scala-tests_2.13</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>

From 4d1b75cc10454704b1f534c9e41c6dbdae4e812f Mon Sep 17 00:00:00 2001
From: Hongxin Liang <honnix@users.noreply.github.com>
Date: Thu, 28 Sep 2023 15:46:32 +0200
Subject: [PATCH 2/3] Only Scala 2.13

Signed-off-by: Hongxin Liang <honnix@users.noreply.github.com>
---
 flytekit-bom/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/flytekit-bom/pom.xml b/flytekit-bom/pom.xml
index 4e667c6f2..8d8aa732e 100644
--- a/flytekit-bom/pom.xml
+++ b/flytekit-bom/pom.xml
@@ -80,11 +80,6 @@
         <artifactId>flytekit-java</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.flyte</groupId>
-        <artifactId>flytekit-scala_2.12</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.flyte</groupId>
         <artifactId>flytekit-scala_2.13</artifactId>

From c07ada074c734b24077226895567c0c0e5b50db6 Mon Sep 17 00:00:00 2001
From: Hongxin Liang <honnix@users.noreply.github.com>
Date: Thu, 28 Sep 2023 17:23:01 +0200
Subject: [PATCH 3/3] Add 2.12 back

Signed-off-by: Hongxin Liang <honnix@users.noreply.github.com>
---
 flytekit-bom/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/flytekit-bom/pom.xml b/flytekit-bom/pom.xml
index 8d8aa732e..4e667c6f2 100644
--- a/flytekit-bom/pom.xml
+++ b/flytekit-bom/pom.xml
@@ -80,6 +80,11 @@
         <artifactId>flytekit-java</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.flyte</groupId>
+        <artifactId>flytekit-scala_2.12</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.flyte</groupId>
         <artifactId>flytekit-scala_2.13</artifactId>