Merge "Do not pull javax.inject into features"

diff --combined features-aggregator/odl-openflowplugin-southbound/pom.xml
index f180d56c5dd5d75bd25a9c8cb22860967fae763c,34ad22f6b7f4beb13374e30b4448ac99885fdfb4..2ed3ceb26caf197d68e06d254dda32e09a342895
--- 1/features-aggregator/odl-openflowplugin-southbound/pom.xml
--- 2/features-aggregator/odl-openflowplugin-southbound/pom.xml
+++ b/features-aggregator/odl-openflowplugin-southbound/pom.xml
@@@ -11,7 -11,7 +11,7 @@@
      <groupId>org.opendaylight.openflowplugin</groupId>
      <artifactId>odl-openflowplugin-southbound</artifactId>
      <packaging>feature</packaging>
 -    <version>0.11.0-SNAPSHOT</version>
 +    <version>0.12.0-SNAPSHOT</version>
  
      <name>OpenDaylight :: Openflow Plugin :: Li southbound API implementation</name>
  
@@@ -43,7 -43,7 +43,7 @@@
              <dependency>
                  <groupId>org.opendaylight.serviceutils</groupId>
                  <artifactId>serviceutils-artifacts</artifactId>
 -                <version>0.6.0-SNAPSHOT</version>
 +                <version>0.7.0-SNAPSHOT</version>
                  <scope>import</scope>
                  <type>pom</type>
              </dependency>
@@@ -114,11 -114,6 +114,6 @@@
              <groupId>org.opendaylight.openflowplugin</groupId>
              <artifactId>openflowplugin-extension-onf</artifactId>
          </dependency>
-         <dependency>
-             <groupId>javax.inject</groupId>
-             <artifactId>javax.inject</artifactId>
-             <optional>true</optional>
-         </dependency>
          <dependency>
              <groupId>org.opendaylight.serviceutils</groupId>
              <artifactId>odl-serviceutils-srm</artifactId>