Skip to content

Commit e836d83

Browse files
Sahil-tarentoSahil-tarento
committed
KB-13035 : Update build configuration for scala 2.12.21 for course-service,lms
1 parent 335fb07 commit e836d83

File tree

12 files changed

+27
-27
lines changed

12 files changed

+27
-27
lines changed

‎course-mw/course-actors-common/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@
4444
</dependency>
4545
<dependency>
4646
<groupId>com.typesafe.akka</groupId>
47-
<artifactId>akka-actor_2.11</artifactId>
47+
<artifactId>akka-actor_2.12</artifactId>
4848
<version>2.5.22</version>
4949
</dependency>
5050
<dependency>
5151
<groupId>com.typesafe.akka</groupId>
52-
<artifactId>akka-slf4j_2.11</artifactId>
52+
<artifactId>akka-slf4j_2.12</artifactId>
5353
<version>2.5.22</version>
5454
</dependency>
5555
<dependency>
@@ -80,7 +80,7 @@
8080
</dependency>
8181
<dependency>
8282
<groupId>com.typesafe.akka</groupId>
83-
<artifactId>akka-testkit_2.11</artifactId>
83+
<artifactId>akka-testkit_2.12</artifactId>
8484
<version>2.5.22</version>
8585
<scope>test</scope>
8686
</dependency>

‎course-mw/course-actors/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</dependency>
3333
<dependency>
3434
<groupId>com.typesafe.akka</groupId>
35-
<artifactId>akka-testkit_2.11</artifactId>
35+
<artifactId>akka-testkit_2.12</artifactId>
3636
<version>2.5.22</version>
3737
<scope>test</scope>
3838
</dependency>

‎course-mw/enrolment-actor/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<artifactId>enrolment-actor</artifactId>
55
<version>1.0-SNAPSHOT</version>
66
<properties>
7-
<scala.version>2.11.12</scala.version>
8-
<scala.major.version>2.11</scala.major.version>
7+
<scala.version>2.12.21</scala.version>
8+
<scala.major.version>2.12</scala.major.version>
99
<scoverage.plugin.version>1.4.1</scoverage.plugin.version>
1010
</properties>
1111

‎course-mw/enrolment-actor/src/main/scala/org/sunbird/enrolments/ContentConsumptionActor.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ class ContentConsumptionActor @Inject() extends BaseEnrolmentActor {
399399
)
400400
val formattedMap = JsonUtil.convertWithDateFormat(m, classOf[util.Map[String, Object]], dateFormatter)
401401
if (fields.contains(JsonKey.ASSESSMENT_SCORE))
402-
formattedMap.putAll(mapAsJavaMap(Map(JsonKey.ASSESSMENT_SCORE -> getScore(userId, courseId, m.get("contentId").asInstanceOf[String], batchId, request.getRequestContext))))
402+
formattedMap.putAll(scala.collection.JavaConverters.mapAsJavaMap(Map(JsonKey.ASSESSMENT_SCORE -> getScore(userId, courseId, m.get("contentId").asInstanceOf[String], batchId, request.getRequestContext))))
403403
formattedMap
404404
}).asJava
405405
response.put(JsonKey.RESPONSE, filteredContents)

‎course-mw/enrolment-actor/src/main/scala/org/sunbird/enrolments/ExtendedContentConsumptionActor.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ class ExtendedContentConsumptionActor @Inject() extends BaseEnrolmentActor {
335335
)
336336
val formattedMap = JsonUtil.convertWithDateFormat(m, classOf[util.Map[String, Object]], dateFormatter)
337337
if (fields.contains(JsonKey.ASSESSMENT_SCORE))
338-
formattedMap.putAll(mapAsJavaMap(Map(JsonKey.ASSESSMENT_SCORE -> getScore(userId, courseId, m.get("contentId").asInstanceOf[String], batchId, request.getRequestContext))))
338+
formattedMap.putAll(scala.collection.JavaConverters.mapAsJavaMap(Map(JsonKey.ASSESSMENT_SCORE -> getScore(userId, courseId, m.get("contentId").asInstanceOf[String], batchId, request.getRequestContext))))
339339
formattedMap
340340
}).asJava
341341
response.put(JsonKey.RESPONSE, filteredContents)

‎course-mw/enrolment-actor/src/main/scala/org/sunbird/enrolments/ExtendedCourseEnrollmentActor.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1266,7 +1266,7 @@ class ExtendedCourseEnrollmentActor @Inject()(@Named("course-batch-notification-
12661266
}
12671267
val formattedMap = JsonUtil.convertWithDateFormat(resultMap, classOf[util.Map[String, Object]], dateFormatter)
12681268
if (fields.contains(JsonKey.ASSESSMENT_SCORE))
1269-
formattedMap.putAll(mapAsJavaMap(Map(JsonKey.ASSESSMENT_SCORE -> getScore(userId, courseId, m.get(Constants.CONTENT_ID).asInstanceOf[String], batchId, request.getRequestContext))))
1269+
formattedMap.putAll(scala.collection.JavaConverters.mapAsJavaMap(Map(JsonKey.ASSESSMENT_SCORE -> getScore(userId, courseId, m.get(Constants.CONTENT_ID).asInstanceOf[String], batchId, request.getRequestContext))))
12701270
formattedMap
12711271
}.asJava
12721272
enrolment.put("contentList", filteredContents)

‎course-mw/sunbird-util/cache-utils/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<name>Cache Utils</name>
1515
<properties>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
17-
<scala.version>2.11.12</scala.version>
18-
<scala.major.version>2.11</scala.major.version>
17+
<scala.version>2.12.21</scala.version>
18+
<scala.major.version>2.12</scala.major.version>
1919
<scoverage.plugin.version>1.4.1</scoverage.plugin.version>
2020
</properties>
2121
<dependencies>

‎course-mw/sunbird-util/sunbird-platform-core/actor-core/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
</dependency>
3232
<dependency>
3333
<groupId>com.typesafe.akka</groupId>
34-
<artifactId>akka-actor_2.11</artifactId>
34+
<artifactId>akka-actor_2.12</artifactId>
3535
<version>${learner.akka.version}</version>
3636
</dependency>
3737
<dependency>
3838
<groupId>com.typesafe.akka</groupId>
39-
<artifactId>akka-slf4j_2.11</artifactId>
39+
<artifactId>akka-slf4j_2.12</artifactId>
4040
<version>${learner.akka.version}</version>
4141
</dependency>
4242
<dependency>

‎course-mw/sunbird-util/sunbird-platform-core/actor-util/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@
1818
<dependencies>
1919
<dependency>
2020
<groupId>com.typesafe.akka</groupId>
21-
<artifactId>akka-actor_2.11</artifactId>
21+
<artifactId>akka-actor_2.12</artifactId>
2222
<version>${learner.akka.version}</version>
2323
</dependency>
2424
<dependency>
2525
<groupId>com.typesafe.akka</groupId>
26-
<artifactId>akka-slf4j_2.11</artifactId>
26+
<artifactId>akka-slf4j_2.12</artifactId>
2727
<version>${learner.akka.version}</version>
2828
</dependency>
2929
<!-- https://mvnrepository.com/artifact/org.scala-lang/scala-library -->
3030
<dependency>
3131
<groupId>org.scala-lang</groupId>
3232
<artifactId>scala-library</artifactId>
33-
<version>2.11.11</version>
33+
<version>2.12.21</version>
3434
</dependency>
3535

3636
<dependency>

‎course-mw/sunbird-util/sunbird-platform-core/common-util/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
</dependency>
2828
<dependency>
2929
<groupId>com.typesafe.akka</groupId>
30-
<artifactId>akka-actor_2.11</artifactId>
30+
<artifactId>akka-actor_2.12</artifactId>
3131
<version>${learner.akka.version}</version>
3232
</dependency>
3333
<dependency>
3434
<groupId>com.typesafe.akka</groupId>
35-
<artifactId>akka-slf4j_2.11</artifactId>
35+
<artifactId>akka-slf4j_2.12</artifactId>
3636
<version>${learner.akka.version}</version>
3737
</dependency>
3838
<dependency>
@@ -231,7 +231,7 @@
231231
</exclusion>
232232
<exclusion>
233233
<groupId>com.fasterxml.jackson.module</groupId>
234-
<artifactId>jackson-module-scala_2.11</artifactId>
234+
<artifactId>jackson-module-scala_2.12</artifactId>
235235
</exclusion>
236236
<exclusion>
237237
<artifactId>slf4j-log4j12</artifactId>
@@ -241,7 +241,7 @@
241241
</dependency>
242242
<dependency>
243243
<groupId>com.fasterxml.jackson.module</groupId>
244-
<artifactId>jackson-module-scala_2.11</artifactId>
244+
<artifactId>jackson-module-scala_2.12</artifactId>
245245
<version>2.10.1</version>
246246
</dependency>
247247
<dependency>

0 commit comments

Comments
 (0)