From b121b05ba818d76be9990da901f13649f5ad68e7 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sun, 26 Jul 2020 15:52:47 +0200
Subject: [PATCH] Do not pull in javax.inject into runtime

We are not using injection on OSGi runtime, we should be relying on it
being provided by the injectipn framework when needed. Also minimize
dependencies on infrautils' inject.

JIRA: INFRAUTILS-65
Change-Id: I91010efe1139a12f8e8bc90765d1a555a748dcc2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 alivenessmonitor/alivenessmonitor-impl-protocols/pom.xml | 6 ++++++
 arputil/arputil-impl/pom.xml                             | 6 ++++++
 cloudscaler/api/pom.xml                                  | 4 ----
 cloudscaler/impl/pom.xml                                 | 2 ++
 features/odl-genius-api/pom.xml                          | 6 ------
 features/odl-genius-fcaps-application/pom.xml            | 6 ------
 ipv6util/api/pom.xml                                     | 4 ----
 ipv6util/impl/pom.xml                                    | 2 ++
 lockmanager/lockmanager-impl/pom.xml                     | 2 ++
 mdsalutil/mdsalutil-api/pom.xml                          | 6 ++++--
 mdsalutil/mdsalutil-impl/pom.xml                         | 4 ++++
 networkutils/networkutils/pom.xml                        | 2 ++
 12 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/alivenessmonitor/alivenessmonitor-impl-protocols/pom.xml b/alivenessmonitor/alivenessmonitor-impl-protocols/pom.xml
index 6b5b34d18..c7077a9fe 100644
--- a/alivenessmonitor/alivenessmonitor-impl-protocols/pom.xml
+++ b/alivenessmonitor/alivenessmonitor-impl-protocols/pom.xml
@@ -49,6 +49,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>blueprint-maven-plugin-annotation</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
diff --git a/arputil/arputil-impl/pom.xml b/arputil/arputil-impl/pom.xml
index 15602df98..7b00bc411 100644
--- a/arputil/arputil-impl/pom.xml
+++ b/arputil/arputil-impl/pom.xml
@@ -78,9 +78,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>metrics-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.infrautils</groupId>
+      <artifactId>inject</artifactId>
+    </dependency>
     <dependency>
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
+      <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <!-- Testing Dependencies -->
     <dependency>
diff --git a/cloudscaler/api/pom.xml b/cloudscaler/api/pom.xml
index 811434240..a8f50f497 100644
--- a/cloudscaler/api/pom.xml
+++ b/cloudscaler/api/pom.xml
@@ -54,9 +54,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
     </dependency>
-    <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-    </dependency>
   </dependencies>
 </project>
diff --git a/cloudscaler/impl/pom.xml b/cloudscaler/impl/pom.xml
index 06a774630..16492a3e6 100644
--- a/cloudscaler/impl/pom.xml
+++ b/cloudscaler/impl/pom.xml
@@ -89,6 +89,8 @@
     <dependency>
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
+      <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>javax.annotation</groupId>
diff --git a/features/odl-genius-api/pom.xml b/features/odl-genius-api/pom.xml
index 4da0a3b3c..184de6620 100644
--- a/features/odl-genius-api/pom.xml
+++ b/features/odl-genius-api/pom.xml
@@ -126,12 +126,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.infrautils</groupId>
       <artifactId>odl-infrautils-jobcoordinator</artifactId>
diff --git a/features/odl-genius-fcaps-application/pom.xml b/features/odl-genius-fcaps-application/pom.xml
index 59cc50614..91bc901d2 100644
--- a/features/odl-genius-fcaps-application/pom.xml
+++ b/features/odl-genius-fcaps-application/pom.xml
@@ -77,12 +77,6 @@
       <classifier>features</classifier>
     </dependency>
 
-    <!-- External libraries to wrap -->
-    <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-    </dependency>
-
     <!-- Bundles from this project -->
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
diff --git a/ipv6util/api/pom.xml b/ipv6util/api/pom.xml
index 26326b74e..58497fb78 100644
--- a/ipv6util/api/pom.xml
+++ b/ipv6util/api/pom.xml
@@ -40,10 +40,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>yang-ext</artifactId>
     </dependency>
-    <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
diff --git a/ipv6util/impl/pom.xml b/ipv6util/impl/pom.xml
index 19f2263b1..1653daf2d 100644
--- a/ipv6util/impl/pom.xml
+++ b/ipv6util/impl/pom.xml
@@ -35,6 +35,8 @@ 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>
   </dependencies>
   <build>
diff --git a/lockmanager/lockmanager-impl/pom.xml b/lockmanager/lockmanager-impl/pom.xml
index 7a5119529..104947fd5 100644
--- a/lockmanager/lockmanager-impl/pom.xml
+++ b/lockmanager/lockmanager-impl/pom.xml
@@ -41,6 +41,8 @@ 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>
diff --git a/mdsalutil/mdsalutil-api/pom.xml b/mdsalutil/mdsalutil-api/pom.xml
index 165ca2280..3b3fedcff 100644
--- a/mdsalutil/mdsalutil-api/pom.xml
+++ b/mdsalutil/mdsalutil-api/pom.xml
@@ -91,8 +91,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>infrautils-util</artifactId>
     </dependency>
     <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>
diff --git a/mdsalutil/mdsalutil-impl/pom.xml b/mdsalutil/mdsalutil-impl/pom.xml
index 642885c84..0c1161fae 100644
--- a/mdsalutil/mdsalutil-impl/pom.xml
+++ b/mdsalutil/mdsalutil-impl/pom.xml
@@ -43,6 +43,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.opendaylight.openflowplugin.model</groupId>
       <artifactId>model-flow-service</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.infrautils</groupId>
+      <artifactId>inject</artifactId>
+    </dependency>
     <dependency>
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
diff --git a/networkutils/networkutils/pom.xml b/networkutils/networkutils/pom.xml
index 18f157703..36e5cd9f7 100644
--- a/networkutils/networkutils/pom.xml
+++ b/networkutils/networkutils/pom.xml
@@ -51,6 +51,8 @@ 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.opendaylight.genius</groupId>
-- 
2.36.6