Do not package javax.inject

We have a number of mis-specified dependencies as well as unnecessary
dependencies on infrautils.inject. Clean these up so we do not pull
in javax.inject jar.

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

diff --git a/features/odl-serviceutils-listener/pom.xml b/features/odl-serviceutils-listener/pom.xml
index c56d3e3b125246a2d3863449efad6c3ac9af6053..0920174c9941c0adb8cf2961ca33560070e2a286 100644 (file)
--- a/features/odl-serviceutils-listener/pom.xml
+++ b/features/odl-serviceutils-listener/pom.xml
@@ -42,12 +42,6 @@
     </dependencyManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.infrautils</groupId>
-            <artifactId>odl-infrautils-inject</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
             <artifactId>odl-infrautils-metrics</artifactId>

diff --git a/srm/impl/pom.xml b/srm/impl/pom.xml
index 8c85bebccd789dc89f258d510c7033a062c50df2..c9657f26320217224486ab57906af7f5ebbee350 100644 (file)
--- a/srm/impl/pom.xml
+++ b/srm/impl/pom.xml
@@ -48,10 +48,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
+      <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.aries.blueprint</groupId>
       <artifactId>blueprint-maven-plugin-annotation</artifactId>
+      <scope>provided</scope>
       <optional>true</optional>
     </dependency>
   </dependencies>

diff --git a/tools/api/pom.xml b/tools/api/pom.xml
index fa23d3933e79c2e8c8f071a0453c9b7476a17a6e..963f9be60748472caead4904483a7cbc11de075b 100644 (file)
--- a/tools/api/pom.xml
+++ b/tools/api/pom.xml
@@ -53,10 +53,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
+      <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>javax.annotation</groupId>
       <artifactId>javax.annotation-api</artifactId>
+      <scope>provided</scope>
       <optional>true</optional>
     </dependency>
     <dependency>

diff --git a/tools/listener-api/pom.xml b/tools/listener-api/pom.xml
index d8a2dc208a8eb0f25cb5767db8ccb8a847267b9e..7b5a9235d967b7d67efa4977f5d721cf897c2c06 100644 (file)
--- a/tools/listener-api/pom.xml
+++ b/tools/listener-api/pom.xml
@@ -18,12 +18,15 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.infrautils</groupId>
-            <artifactId>inject</artifactId>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
+            <scope>provided</scope>
             <optional>true</optional>
         </dependency>
         <dependency>