Merge changes from topic 'ordm22'

* changes:
  fix some warnings
  Fixed Issues with PCE
  Update Renderer Module
  clean yang files
  Sync Common folder

diff --git a/olm/pom.xml b/olm/pom.xml
index 284a0f9d54ebe4766e3fbc64501e617df7b445d7..b47a57dc4ac367298feca43665481562afc2d9b8 100644 (file)
--- a/olm/pom.xml
+++ b/olm/pom.xml
@@ -75,7 +75,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>2.19.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml
index d0530c286d6888c01c04a346ca6c04a87694c6de..64174df7f7b808187757b7360ad2e7920a115a95 100644 (file)
--- a/servicehandler/pom.xml
+++ b/servicehandler/pom.xml
@@ -100,7 +100,6 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>2.19.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>