Merge branch 'master' into java-client-terminate-query

confluentinc · May 16, 2020 · ca272a1 · ca272a1
2 parents ceeee5b + dd4f928
commit ca272a1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/ksqldb-rest-app/pom.xml b/ksqldb-rest-app/pom.xml
@@ -155,7 +155,7 @@
 
         <dependency>
             <groupId>com.kjetland</groupId>
-            <artifactId>mbknor-jackson-jsonschema_2.12</artifactId>
+            <artifactId>mbknor-jackson-jsonschema_${kafka.scala.version}</artifactId>
             <version>1.0.39</version>
             <scope>test</scope>
         </dependency>

diff --git a/pom.xml b/pom.xml
@@ -129,6 +129,7 @@
         <!-- Only used to provide login module implementation for tests -->
         <jetty.version>9.4.28.v20200408</jetty.version>
         <git-commit-id-plugin.version>2.2.1</git-commit-id-plugin.version>
+        <scala.version>2.13.2</scala.version>
     </properties>
 
     <dependencyManagement>
@@ -433,6 +434,21 @@
                 <version>${icu.version}</version>
             </dependency>
 
+            <!-- We need to fix our Scala versions as otherwise our depdendencies bring in
+            different versions via different routes
+            https://github.com/confluentinc/common/pull/260 -->
+            <dependency>
+                <groupId>org.scala-lang</groupId>
+                <artifactId>scala-library</artifactId>
+                <version>${scala.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.scala-lang</groupId>
+                <artifactId>scala-reflect</artifactId>
+                <version>${scala.version}</version>
+            </dependency>
+
             <!-- Required for running tests -->
             <dependency>
                 <groupId>junit</groupId>