Skip to content

Commit

Permalink
Issue #LR-740 chore: Upgraded the scala major version from 2.11 to 2.12
Browse files Browse the repository at this point in the history
  • Loading branch information
@AmiableAnil
AmiableAnil committed Feb 22, 2024
1 parent d14e96b commit b331a51
Show file tree
Hide file tree
Showing 15 changed files with 35 additions and 473 deletions.
6 changes: 3 additions & 3 deletions course-mw/course-actors-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
<version>${powermock.api.mockito2.version}</version>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>${powermock.module.junit4.version}</version>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -176,7 +176,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M4</version>
<version>3.0.0</version>
<configuration>
<!-- <skipTests>true</skipTests> -->
<includes>
Expand Down
6 changes: 3 additions & 3 deletions course-mw/course-actors/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
<version>${powermock.api.mockito2.version}</version>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>${powermock.module.junit4.version}</version>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -80,7 +80,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M4</version>
<version>3.0.0</version>
<configuration>
<!-- <skipTests>true</skipTests> -->
<includes>
Expand Down
4 changes: 2 additions & 2 deletions course-mw/enrolment-actor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>it.ozimov</groupId>
<groupId>com.github.codemonstur</groupId>
<artifactId>embedded-redis</artifactId>
<version>0.7.1</version>
<version>1.1.0</version>
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/mockwebserver -->
Expand Down
5 changes: 2 additions & 3 deletions course-mw/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
<properties>
<play2.plugin.version>1.0.0-beta5</play2.plugin.version>
<mockito.core.version>2.22.0</mockito.core.version>
<powermock.api.mockito2.version>2.0.7</powermock.api.mockito2.version>
<powermock.module.junit4.version>2.0.0-beta.5</powermock.module.junit4.version>
<powermock.version>2.0.9</powermock.version>
</properties>
<modules>
<module>sunbird-util</module>
Expand Down Expand Up @@ -93,7 +92,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M4</version>
<version>3.0.0</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down
8 changes: 4 additions & 4 deletions course-mw/sunbird-util/sunbird-cache-utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>1.6.5</version>
<version>${powermock.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -49,8 +49,8 @@
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>1.6.5</version>
<artifactId>powermock-api-mockito2</artifactId>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -81,7 +81,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M4</version>
<version>3.0.0</version>
<configuration>
<includes>
<include>**/*Spec.java</include>
Expand Down
6 changes: 3 additions & 3 deletions course-mw/sunbird-util/sunbird-cassandra-utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
<version>${powermock.api.mockito2.version}</version>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>${powermock.module.junit4.version}</version>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -108,7 +108,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M4</version>
<version>3.0.0</version>
<configuration>
<argLine>
--illegal-access=warn
Expand Down
9 changes: 4 additions & 5 deletions course-mw/sunbird-util/sunbird-es-utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<groupId>org.sunbird</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<groupId>org.sunbird</groupId>
<artifactId>sunbird-es-utils</artifactId>
<version>1.0-SNAPSHOT</version>
<name>Sunbird ElasticSearch Utils</name>
Expand Down Expand Up @@ -69,7 +68,7 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>1.6.5</version>
<version>${powermock.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -80,8 +79,8 @@
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>1.6.5</version>
<artifactId>powermock-api-mockito2</artifactId>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -102,7 +101,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M4</version>
<version>3.0.0</version>
<configuration>
<argLine>
--illegal-access=warn
Expand Down
138 changes: 0 additions & 138 deletions course-mw/sunbird-util/sunbird-notification/dependency-reduced-pom.xml
View file

This file was deleted.

4 changes: 2 additions & 2 deletions course-mw/sunbird-util/sunbird-notification/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,13 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
<version>${powermock.api.mockito2.version}</version>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>${powermock.module.junit4.version}</version>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion course-mw/sunbird-util/sunbird-platform-core/actor-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M4</version>
<version>3.0.0</version>
<configuration>
<!-- <skipTests>true</skipTests> -->
<includes>
Expand Down
6 changes: 3 additions & 3 deletions course-mw/sunbird-util/sunbird-platform-core/auth-verifier/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
<version>${powermock.api.mockito2.version}</version>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>${powermock.module.junit4.version}</version>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -71,7 +71,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M4</version>
<version>3.0.0</version>
<configuration>
<argLine>
--illegal-access=warn
Expand Down
9 changes: 4 additions & 5 deletions course-mw/sunbird-util/sunbird-platform-core/common-util/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
<!-- <versions.jacoco>0.7.6.201602180812</versions.jacoco> -->
<learner.akka.version>2.5.19</learner.akka.version>
<mockito.core.version>2.22.0</mockito.core.version>
<powermock.api.mockito2.version>2.0.7</powermock.api.mockito2.version>
<powermock.module.junit4.version>2.0.0-beta.5</powermock.module.junit4.version>
<powermock.version>2.0.9</powermock.version>
<CLOUD_STORAGE_GROUP_ID>org.sunbird</CLOUD_STORAGE_GROUP_ID>
<CLOUD_STORE_ARTIFACT_ID>cloud-store-sdk</CLOUD_STORE_ARTIFACT_ID>
<CLOUD_STORE_VERSION>1.4.6</CLOUD_STORE_VERSION>
Expand Down Expand Up @@ -181,13 +180,13 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
<version>${powermock.api.mockito2.version}</version>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>${powermock.module.junit4.version}</version>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -289,7 +288,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M4</version>
<version>3.0.0</version>
<configuration>
<argLine>
--illegal-access=warn
Expand Down
Loading

0 comments on commit b331a51

Please sign in to comment.