Merge "Remove unnecessary uses of odlparent properties"

diff --combined features/netconf/pom.xml
index 3edc9a4b54f683e0f3e34ab5b7ab130c7d451071,13b2ad100c75dc00fc05f2def8c0755551fa9ea6..b79e70badd9140036ce1bff4fac4532efa9ff112
--- 1/features/netconf/pom.xml
--- 2/features/netconf/pom.xml
+++ b/features/netconf/pom.xml
@@@ -74,13 -74,6 +74,13 @@@
    </dependencyManagement>
  
    <dependencies>
 +    <dependency>
 +      <groupId>org.opendaylight.aaa</groupId>
 +      <artifactId>features-aaa-shiro</artifactId>
 +      <version>${aaa.version}</version>
 +      <classifier>features</classifier>
 +      <type>xml</type>
 +    </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>features-protocol-framework</artifactId>
@@@ -214,6 -207,14 +214,14 @@@
        <groupId>io.netty</groupId>
        <artifactId>netty-transport</artifactId>
      </dependency>
+     <dependency>
+       <groupId>org.bouncycastle</groupId>
+       <artifactId>bcpkix-jdk15on</artifactId>
+     </dependency>
+     <dependency>
+       <groupId>org.bouncycastle</groupId>
+       <artifactId>bcprov-jdk15on</artifactId>
+     </dependency>
      <dependency>
        <groupId>${project.groupId}</groupId>
        <artifactId>netconf-client</artifactId>

diff --combined features/restconf/pom.xml
index 2d762094936df9af0c8b8adf004d364a2a6b1571,e4e49514c777e9595e9f84aafa8eca762a6e675c..d130180040ce8048b0015ab189f71ed9f336d6b0
--- 1/features/restconf/pom.xml
--- 2/features/restconf/pom.xml
+++ b/features/restconf/pom.xml
@@@ -25,11 -25,12 +25,11 @@@
      <controller.mdsal.version>1.3.0-SNAPSHOT</controller.mdsal.version>
      <features.test.version>1.6.0-SNAPSHOT</features.test.version>
      <jersey-servlet.version>1.17</jersey-servlet.version>
 -
      <mdsal.version>2.0.0-SNAPSHOT</mdsal.version>
      <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
      <restconf.version>1.3.0-SNAPSHOT</restconf.version>
 -    <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
      <surefire.version>2.15</surefire.version>
 +    <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
  
      <features.file>features.xml</features.file>
      <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
@@@ -61,11 -62,12 +61,11 @@@
      </dependency>
      <dependency>
        <groupId>org.opendaylight.aaa</groupId>
 -      <artifactId>features-aaa</artifactId>
 +      <artifactId>features-aaa-shiro</artifactId>
        <version>${aaa.version}</version>
        <classifier>features</classifier>
        <type>xml</type>
      </dependency>
 -
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal-remote</artifactId>
@@@ -86,17 -88,14 +86,14 @@@
      <dependency>
        <groupId>com.sun.jersey</groupId>
        <artifactId>jersey-core</artifactId>
-       <version>${jersey.version}</version>
      </dependency>
      <dependency>
        <groupId>com.sun.jersey</groupId>
        <artifactId>jersey-server</artifactId>
-       <version>${jersey.version}</version>
      </dependency>
      <dependency>
        <groupId>com.sun.jersey</groupId>
        <artifactId>jersey-servlet</artifactId>
-       <version>${jersey.version}</version>
      </dependency>
      <dependency>
        <groupId>io.netty</groupId>