From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 15 Oct 2021 11:39:23 +0000 (+0200)
Subject: Bump Scala to 2.13.6
X-Git-Tag: v4.0.4~6
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=fb9cb91d371f7bbd0ff2e199673ce61b64d16b19

Bump Scala to 2.13.6

https://github.com/scala/scala/releases/tag/v2.13.6

Change-Id: I6fba6c4d7856446d54cb016ec3a93f4976375a0a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml
index d6531a47ef..6a3babd91d 100644
--- a/bundle-parent/pom.xml
+++ b/bundle-parent/pom.xml
@@ -34,12 +34,12 @@
             <dependency>
                 <groupId>org.scala-lang</groupId>
                 <artifactId>scala-library</artifactId>
-                <version>2.13.5</version>
+                <version>2.13.6</version>
             </dependency>
             <dependency>
                 <groupId>org.scala-lang</groupId>
                 <artifactId>scala-reflect</artifactId>
-                <version>2.13.5</version>
+                <version>2.13.6</version>
             </dependency>
             <dependency>
                 <groupId>org.scala-lang.modules</groupId>
diff --git a/features/odl-controller-scala/src/main/history/dependencies.xml b/features/odl-controller-scala/src/main/history/dependencies.xml
index 6d6f907284..4e572c6e35 100644
--- a/features/odl-controller-scala/src/main/history/dependencies.xml
+++ b/features/odl-controller-scala/src/main/history/dependencies.xml
@@ -3,7 +3,7 @@
     <feature version="0.0.0">
         <bundle>mvn:org.scala-lang.modules/scala-java8-compat_2.13/0.9.1</bundle>
         <bundle>mvn:org.scala-lang.modules/scala-parser-combinators_2.13/1.1.2</bundle>
-        <bundle>mvn:org.scala-lang/scala-library/2.13.5</bundle>
-        <bundle>mvn:org.scala-lang/scala-reflect/2.13.5</bundle>
+        <bundle>mvn:org.scala-lang/scala-library/2.13.6</bundle>
+        <bundle>mvn:org.scala-lang/scala-reflect/2.13.6</bundle>
     </feature>
 </features>