Remove unneeded dependency on odl-infrautils-inject

javax.inject should be provided by whatever runtime we work in,
hence we do not need to pull it in, nor do we need
odl-infrautils-inject.

JIRA: INFRAUTILS-65
Change-Id: I80d074c28c94e22ab75ac492bc6023e325bcf68e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/production/odl-neutron-northbound-api/pom.xml b/features/production/odl-neutron-northbound-api/pom.xml
index 6c26c2bdf06a61b34311b14dc5763b8fc1e0ac3a..2cf6ba195f35ebbfa8180d5bccd9d5edae84a78f 100644 (file)
--- a/features/production/odl-neutron-northbound-api/pom.xml
+++ b/features/production/odl-neutron-northbound-api/pom.xml
@@ -58,12 +58,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.infrautils</groupId>
-            <artifactId>odl-infrautils-inject</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>odl-aaa-shiro</artifactId>

diff --git a/integration/test-standalone/pom.xml b/integration/test-standalone/pom.xml
index c38b22995ad1034969079848fbb7a1f051945202..b489662a255541b35ed005e636900fa1dedba2d8 100644 (file)
--- a/integration/test-standalone/pom.xml
+++ b/integration/test-standalone/pom.xml
@@ -61,11 +61,6 @@
       <scope>compile</scope>
     </dependency>
 
-    <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.opendaylight.neutron</groupId>
       <artifactId>northbound-api</artifactId>

diff --git a/transcriber/pom.xml b/transcriber/pom.xml
index d780a69df717d813dc41ba9c63735b3dac945f23..94e3d3875bbf2f1f309072d6fbb33d45b5f7e4fb 100644 (file)
--- a/transcriber/pom.xml
+++ b/transcriber/pom.xml
@@ -78,6 +78,8 @@
     <dependency>
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
+      <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>javax.annotation</groupId>