From 1eb10a4a00b6fcfe45f3ad4931aaf79d3d0bafa2 Mon Sep 17 00:00:00 2001
From: George Gastaldi <gegastaldi@gmail.com>
Date: Tue, 16 Jun 2020 11:43:44 -0300
Subject: [PATCH 1/2] Bump to Scala 2.13 (including Kafka dependency)

Fixes #10025
---
 bom/runtime/pom.xml                     | 4 ++--
 build-parent/pom.xml                    | 6 +++---
 integration-tests/kafka-streams/pom.xml | 2 +-
 integration-tests/kafka/pom.xml         | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
index 863b28a209af9..9529caf65a55f 100644
--- a/bom/runtime/pom.xml
+++ b/bom/runtime/pom.xml
@@ -133,7 +133,7 @@
         <kafka2.version>2.5.0</kafka2.version>
         <zookeeper.version>3.5.7</zookeeper.version>
         <!-- Scala is used by Kafka so we need to choose a compatible version -->
-        <scala.version>2.12.9</scala.version>
+        <scala.version>2.13.2</scala.version>
         <tika.version>1.22</tika.version>
         <ooxml-schemas.version>1.4</ooxml-schemas.version>
         <aws-lambda-java.version>1.1.0</aws-lambda-java.version>
@@ -1804,7 +1804,7 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.kafka</groupId>
-                <artifactId>kafka_2.12</artifactId>
+                <artifactId>kafka_2.13</artifactId>
                 <version>${kafka2.version}</version>
                 <exclusions>
                     <exclusion>
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index 3482e7d258315..6bdc8b8f7b774 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -18,14 +18,14 @@
         <!-- Maven plugin versions -->
         <elasticsearch-maven-plugin.version>6.15</elasticsearch-maven-plugin.version>
         <elasticsearch-server.version>7.7.0</elasticsearch-server.version>
-        <scala-maven-plugin.version>4.1.1</scala-maven-plugin.version>
+        <scala-maven-plugin.version>4.4.0</scala-maven-plugin.version>
 
         <!-- These properties are needed in order for them to be resolvable by the generated projects -->
         <!-- Quarkus uses jboss-parent and it comes with 3.8.0-jboss-2, we don't want that in the templates -->
         <compiler-plugin.version>3.8.1</compiler-plugin.version>
         <kotlin.version>1.3.72</kotlin.version>
-        <scala.version>2.12.8</scala.version>
-        <scala-plugin.version>4.1.1</scala-plugin.version>
+        <scala.version>2.13.2</scala.version>
+        <scala-plugin.version>4.4.0</scala-plugin.version>
 
         <version.surefire.plugin>2.22.1</version.surefire.plugin>
         <failsafe-plugin.version>${version.surefire.plugin}</failsafe-plugin.version>
diff --git a/integration-tests/kafka-streams/pom.xml b/integration-tests/kafka-streams/pom.xml
index 17c6f3789a530..405628f514351 100644
--- a/integration-tests/kafka-streams/pom.xml
+++ b/integration-tests/kafka-streams/pom.xml
@@ -74,7 +74,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
-            <artifactId>kafka_2.12</artifactId>
+            <artifactId>kafka_2.13</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/integration-tests/kafka/pom.xml b/integration-tests/kafka/pom.xml
index 71dd6d3656cf7..aadb4676e2d2e 100644
--- a/integration-tests/kafka/pom.xml
+++ b/integration-tests/kafka/pom.xml
@@ -98,7 +98,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
-            <artifactId>kafka_2.12</artifactId>
+            <artifactId>kafka_2.13</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

From 9a1d79fa81dca79445af9d28f275b14a0a89719e Mon Sep 17 00:00:00 2001
From: George Gastaldi <gegastaldi@gmail.com>
Date: Tue, 16 Jun 2020 11:45:28 -0300
Subject: [PATCH 2/2] Removed bad option in scala plugin

---
 .../resources/templates/basic-rest/scala/pom.xml-template.ftl    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/scala/pom.xml-template.ftl b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/scala/pom.xml-template.ftl
index 991446679dbda..e40dd789cd37f 100644
--- a/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/scala/pom.xml-template.ftl
+++ b/devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/scala/pom.xml-template.ftl
@@ -123,7 +123,6 @@
                         <arg>-feature</arg>
                         <arg>-explaintypes</arg>
                         <arg>-target:jvm-1.8</arg>
-                        <arg>-Ypartial-unification</arg>
                     </args>
                 </configuration>
             </plugin>