diff --git a/course-mw/course-actors-common/pom.xml b/course-mw/course-actors-common/pom.xml index 454c99884..7efc5396d 100644 --- a/course-mw/course-actors-common/pom.xml +++ b/course-mw/course-actors-common/pom.xml @@ -104,13 +104,13 @@ org.powermock powermock-api-mockito2 - ${powermock.api.mockito2.version} + ${powermock.version} test org.powermock powermock-module-junit4 - ${powermock.module.junit4.version} + ${powermock.version} test @@ -176,7 +176,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M4 + 3.0.0 diff --git a/course-mw/course-actors/pom.xml b/course-mw/course-actors/pom.xml index f729c6f7b..f583f8eff 100644 --- a/course-mw/course-actors/pom.xml +++ b/course-mw/course-actors/pom.xml @@ -45,13 +45,13 @@ org.powermock powermock-api-mockito2 - ${powermock.api.mockito2.version} + ${powermock.version} test org.powermock powermock-module-junit4 - ${powermock.module.junit4.version} + ${powermock.version} test @@ -80,7 +80,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M4 + 3.0.0 diff --git a/course-mw/enrolment-actor/pom.xml b/course-mw/enrolment-actor/pom.xml index c60502eff..9e814342c 100644 --- a/course-mw/enrolment-actor/pom.xml +++ b/course-mw/enrolment-actor/pom.xml @@ -48,9 +48,9 @@ test - it.ozimov + com.github.codemonstur embedded-redis - 0.7.1 + 1.1.0 test diff --git a/course-mw/pom.xml b/course-mw/pom.xml index 38568dd8b..f0a5057ab 100644 --- a/course-mw/pom.xml +++ b/course-mw/pom.xml @@ -10,8 +10,7 @@ 1.0.0-beta5 2.22.0 - 2.0.7 - 2.0.0-beta.5 + 2.0.9 sunbird-util @@ -93,7 +92,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M4 + 3.0.0 diff --git a/course-mw/sunbird-util/sunbird-cache-utils/pom.xml b/course-mw/sunbird-util/sunbird-cache-utils/pom.xml index a2e59fabf..2f92d724e 100644 --- a/course-mw/sunbird-util/sunbird-cache-utils/pom.xml +++ b/course-mw/sunbird-util/sunbird-cache-utils/pom.xml @@ -38,7 +38,7 @@ org.powermock powermock-module-junit4 - 1.6.5 + ${powermock.version} test @@ -49,8 +49,8 @@ org.powermock - powermock-api-mockito - 1.6.5 + powermock-api-mockito2 + ${powermock.version} test @@ -81,7 +81,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M4 + 3.0.0 **/*Spec.java diff --git a/course-mw/sunbird-util/sunbird-cassandra-utils/pom.xml b/course-mw/sunbird-util/sunbird-cassandra-utils/pom.xml index 23a2a0c80..88030c7da 100644 --- a/course-mw/sunbird-util/sunbird-cassandra-utils/pom.xml +++ b/course-mw/sunbird-util/sunbird-cassandra-utils/pom.xml @@ -81,13 +81,13 @@ org.powermock powermock-api-mockito2 - ${powermock.api.mockito2.version} + ${powermock.version} test org.powermock powermock-module-junit4 - ${powermock.module.junit4.version} + ${powermock.version} test @@ -108,7 +108,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M4 + 3.0.0 --illegal-access=warn diff --git a/course-mw/sunbird-util/sunbird-es-utils/pom.xml b/course-mw/sunbird-util/sunbird-es-utils/pom.xml index 068b378ee..0f9de7c67 100644 --- a/course-mw/sunbird-util/sunbird-es-utils/pom.xml +++ b/course-mw/sunbird-util/sunbird-es-utils/pom.xml @@ -6,7 +6,6 @@ org.sunbird 1.0-SNAPSHOT - org.sunbird sunbird-es-utils 1.0-SNAPSHOT Sunbird ElasticSearch Utils @@ -69,7 +68,7 @@ org.powermock powermock-module-junit4 - 1.6.5 + ${powermock.version} test @@ -80,8 +79,8 @@ org.powermock - powermock-api-mockito - 1.6.5 + powermock-api-mockito2 + ${powermock.version} test @@ -102,7 +101,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M4 + 3.0.0 --illegal-access=warn diff --git a/course-mw/sunbird-util/sunbird-notification/dependency-reduced-pom.xml b/course-mw/sunbird-util/sunbird-notification/dependency-reduced-pom.xml deleted file mode 100644 index 98c1d9579..000000000 --- a/course-mw/sunbird-util/sunbird-notification/dependency-reduced-pom.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - sunbird-util - org.sunbird - 1.0-SNAPSHOT - - 4.0.0 - org.sunbird - sunbird-notification - 1.0-SNAPSHOT - - src/main/java - src/test/java - - - maven-compiler-plugin - 3.8.1 - - 11 - - - - maven-shade-plugin - 3.0.0 - - - package - - shade - - - - - classworlds:classworlds - junit:junit - jmock:* - *:xml-apis - org.apache.maven:lib:tests - - - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.5 - - - jacoco-initialize - - prepare-agent - - - - jacoco-site - package - - report - - - - - ${basedir}/target/coverage-reports/jacoco-unit.exec - ${basedir}/target/coverage-reports/jacoco-unit.exec - - - - - - - junit - junit - 4.13.1 - test - - - hamcrest-core - org.hamcrest - - - - - org.mockito - mockito-core - 2.22.0 - test - - - byte-buddy - net.bytebuddy - - - byte-buddy-agent - net.bytebuddy - - - objenesis - org.objenesis - - - - - org.powermock - powermock-api-mockito2 - 2.0.7 - test - - - powermock-api-support - org.powermock - - - - - org.powermock - powermock-module-junit4 - 2.0.0-beta.5 - test - - - powermock-module-junit4-common - org.powermock - - - hamcrest-core - org.hamcrest - - - - - - UTF-8 - - - diff --git a/course-mw/sunbird-util/sunbird-notification/pom.xml b/course-mw/sunbird-util/sunbird-notification/pom.xml index c6c867a3c..1d7105042 100644 --- a/course-mw/sunbird-util/sunbird-notification/pom.xml +++ b/course-mw/sunbird-util/sunbird-notification/pom.xml @@ -105,13 +105,13 @@ org.powermock powermock-api-mockito2 - ${powermock.api.mockito2.version} + ${powermock.version} test org.powermock powermock-module-junit4 - ${powermock.module.junit4.version} + ${powermock.version} test diff --git a/course-mw/sunbird-util/sunbird-platform-core/actor-core/pom.xml b/course-mw/sunbird-util/sunbird-platform-core/actor-core/pom.xml index a72618a67..e793bb75c 100644 --- a/course-mw/sunbird-util/sunbird-platform-core/actor-core/pom.xml +++ b/course-mw/sunbird-util/sunbird-platform-core/actor-core/pom.xml @@ -103,7 +103,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M4 + 3.0.0 diff --git a/course-mw/sunbird-util/sunbird-platform-core/auth-verifier/pom.xml b/course-mw/sunbird-util/sunbird-platform-core/auth-verifier/pom.xml index f42d214e6..b03659a70 100644 --- a/course-mw/sunbird-util/sunbird-platform-core/auth-verifier/pom.xml +++ b/course-mw/sunbird-util/sunbird-platform-core/auth-verifier/pom.xml @@ -34,13 +34,13 @@ org.powermock powermock-api-mockito2 - ${powermock.api.mockito2.version} + ${powermock.version} test org.powermock powermock-module-junit4 - ${powermock.module.junit4.version} + ${powermock.version} test @@ -71,7 +71,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M4 + 3.0.0 --illegal-access=warn diff --git a/course-mw/sunbird-util/sunbird-platform-core/common-util/pom.xml b/course-mw/sunbird-util/sunbird-platform-core/common-util/pom.xml index 518e96ec7..a3a909559 100644 --- a/course-mw/sunbird-util/sunbird-platform-core/common-util/pom.xml +++ b/course-mw/sunbird-util/sunbird-platform-core/common-util/pom.xml @@ -14,8 +14,7 @@ 2.5.19 2.22.0 - 2.0.7 - 2.0.0-beta.5 + 2.0.9 org.sunbird cloud-store-sdk 1.4.6 @@ -181,13 +180,13 @@ org.powermock powermock-api-mockito2 - ${powermock.api.mockito2.version} + ${powermock.version} test org.powermock powermock-module-junit4 - ${powermock.module.junit4.version} + ${powermock.version} test @@ -289,7 +288,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M4 + 3.0.0 --illegal-access=warn diff --git a/course-mw/sunbird-util/sunbird-platform-core/sunbird-commons/dependency-reduced-pom.xml b/course-mw/sunbird-util/sunbird-platform-core/sunbird-commons/dependency-reduced-pom.xml deleted file mode 100644 index 2a6d86668..000000000 --- a/course-mw/sunbird-util/sunbird-platform-core/sunbird-commons/dependency-reduced-pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - 4.0.0 - org.sunbird - sunbird-commons - Sunbird Commons - 1.0-SNAPSHOT - - - - maven-shade-plugin - 3.0.0 - - - package - - shade - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - com.google.guava:guava - - - - - reference.conf - - - org.sunbird.middleware.Application - - - - - - - - - - - UTF-8 - - - diff --git a/service/dependency-reduced-pom.xml b/service/dependency-reduced-pom.xml deleted file mode 100644 index fd4449d2e..000000000 --- a/service/dependency-reduced-pom.xml +++ /dev/null @@ -1,233 +0,0 @@ - - - 4.0.0 - org.sunbird - learning-service - play2 - learning-service - 1.0-SNAPSHOT - - ${basedir}/app - ${basedir}/test - - - ${basedir}/conf - - - - - maven-compiler-plugin - 3.8.1 - - 11 - - - - maven-shade-plugin - 3.0.0 - - - package - - shade - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - reference.conf - - - org.sunbird.middleware.Application - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.0.0 - - - generate-sources - - add-source - - - - actors - cassandra-dac - utils - cache - - - - - - - com.google.code.play2-maven-plugin - play2-maven-plugin - ${play2.plugin.version} - true - - - com.google.code.play2-maven-plugin - play2-provider-play24 - ${play2.plugin.version} - - - - - maven-surefire-plugin - 3.0.0-M4 - - - **/*Spec.java - **/*Test.java - - - - - org.jacoco - jacoco-maven-plugin - 0.7.5.201505241946 - - - jacoco-initialize - - prepare-agent - - - - jacoco-site - package - - report - - - - - ${basedir}/target/coverage-reports/jacoco-unit.exec - ${basedir}/target/coverage-reports/jacoco-unit.exec - - **/common/** - **/routes/** - **/Reverse*/** - **/*.javascript/** - - - - - - - - - false - - scalaz-bintray - Scalaz Bintray - releases - https://dl.bintray.com/scalaz/releases/ - - - - - - false - - typesafe-releases-plugins - https://repo.typesafe.com/typesafe/releases/ - - - - - com.typesafe.play - play-specs2_2.11 - 2.4.6 - test - - - gson - com.google.code.gson - - - play-test_2.11 - com.typesafe.play - - - specs2-core_2.11 - org.specs2 - - - specs2-junit_2.11 - org.specs2 - - - specs2-mock_2.11 - org.specs2 - - - - - com.typesafe.akka - akka-testkit_${scala.major.version} - 2.5.16 - test - - - org.powermock - powermock-module-junit4 - 1.6.5 - test - - - junit - junit - - - powermock-module-junit4-common - org.powermock - - - - - org.powermock - powermock-api-mockito - 1.6.5 - test - - - mockito-core - org.mockito - - - powermock-api-mockito-common - org.powermock - - - - - junit - junit - 4.13.1 - test - - - - 2.11.8 - 1.0.0-beta5 - 2.7.2 - - - diff --git a/service/pom.xml b/service/pom.xml index da9f1bd2f..187b05b21 100644 --- a/service/pom.xml +++ b/service/pom.xml @@ -30,12 +30,10 @@ 2.7.2 1.0.0-rc5 - 1.0.0 2.11 2.11.12 2.22.0 - 2.0.7 - 2.0.0-beta.5 + 2.0.9 @@ -195,13 +193,13 @@ org.powermock powermock-api-mockito2 - ${powermock.api.mockito2.version} + ${powermock.version} test org.powermock powermock-module-junit4 - ${powermock.module.junit4.version} + ${powermock.version} test @@ -254,18 +252,10 @@ ${play2.plugin.version} true - - com.google.code.sbt-compiler-maven-plugin - sbt-compiler-maven-plugin - ${sbt-compiler.plugin.version} - - -feature -deprecation -Xfatal-warnings - - org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + 3.0.0 false