From b711ddfaada27cf69a7f518bcaa447b45902da81 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 1 Jun 2021 13:25:21 +0200
Subject: [PATCH] Use GuicedEE for javax.inject

javax.inject is an ancient artifact, which use the version published
by GuicedEE, as it is a proper bundle as well as a JPMS module.

Change-Id: Ifc6fa52925cad2b10e3fb2e7ff2146f6da39a0ba
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 applications/arbitratorreconciliation/impl/pom.xml | 2 +-
 applications/device-ownership-service/pom.xml      | 2 +-
 applications/forwardingrules-manager/pom.xml       | 2 +-
 applications/of-switch-config-pusher/pom.xml       | 2 +-
 applications/reconciliation-framework/pom.xml      | 2 +-
 applications/southbound-cli/pom.xml                | 2 +-
 applications/topology-lldp-discovery/pom.xml       | 2 +-
 applications/topology-manager/pom.xml              | 2 +-
 openflowplugin-impl/pom.xml                        | 2 +-
 test-provider/pom.xml                              | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/applications/arbitratorreconciliation/impl/pom.xml b/applications/arbitratorreconciliation/impl/pom.xml
index 8577b9991d..ea35f72b47 100644
--- a/applications/arbitratorreconciliation/impl/pom.xml
+++ b/applications/arbitratorreconciliation/impl/pom.xml
@@ -22,7 +22,7 @@
             <artifactId>upgrade</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.inject</groupId>
+            <groupId>com.guicedee.services</groupId>
             <artifactId>javax.inject</artifactId>
             <optional>true</optional>
         </dependency>
diff --git a/applications/device-ownership-service/pom.xml b/applications/device-ownership-service/pom.xml
index ec24ee4c1b..573cc59bd0 100644
--- a/applications/device-ownership-service/pom.xml
+++ b/applications/device-ownership-service/pom.xml
@@ -18,7 +18,7 @@
             <artifactId>mdsal-eos-binding-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.inject</groupId>
+            <groupId>com.guicedee.services</groupId>
             <artifactId>javax.inject</artifactId>
             <optional>true</optional>
         </dependency>
diff --git a/applications/forwardingrules-manager/pom.xml b/applications/forwardingrules-manager/pom.xml
index 58df8848cf..4d72c48efc 100644
--- a/applications/forwardingrules-manager/pom.xml
+++ b/applications/forwardingrules-manager/pom.xml
@@ -14,7 +14,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>javax.inject</groupId>
+      <groupId>com.guicedee.services</groupId>
       <artifactId>javax.inject</artifactId>
       <optional>true</optional>
     </dependency>
diff --git a/applications/of-switch-config-pusher/pom.xml b/applications/of-switch-config-pusher/pom.xml
index 919f131d19..b6ce76534c 100644
--- a/applications/of-switch-config-pusher/pom.xml
+++ b/applications/of-switch-config-pusher/pom.xml
@@ -43,7 +43,7 @@
             <artifactId>infrautils-util</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.inject</groupId>
+            <groupId>com.guicedee.services</groupId>
             <artifactId>javax.inject</artifactId>
             <optional>true</optional>
         </dependency>
diff --git a/applications/reconciliation-framework/pom.xml b/applications/reconciliation-framework/pom.xml
index d76e29b401..090c52e71e 100644
--- a/applications/reconciliation-framework/pom.xml
+++ b/applications/reconciliation-framework/pom.xml
@@ -47,7 +47,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.inject</groupId>
+            <groupId>com.guicedee.services</groupId>
             <artifactId>javax.inject</artifactId>
             <optional>true</optional>
         </dependency>
diff --git a/applications/southbound-cli/pom.xml b/applications/southbound-cli/pom.xml
index 65525843a1..f1a4b92fba 100644
--- a/applications/southbound-cli/pom.xml
+++ b/applications/southbound-cli/pom.xml
@@ -51,7 +51,7 @@
             <artifactId>forwardingrules-manager</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.inject</groupId>
+            <groupId>com.guicedee.services</groupId>
             <artifactId>javax.inject</artifactId>
             <optional>true</optional>
         </dependency>
diff --git a/applications/topology-lldp-discovery/pom.xml b/applications/topology-lldp-discovery/pom.xml
index b1090f3511..a265b82537 100644
--- a/applications/topology-lldp-discovery/pom.xml
+++ b/applications/topology-lldp-discovery/pom.xml
@@ -59,7 +59,7 @@
       <artifactId>model-topology</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.inject</groupId>
+      <groupId>com.guicedee.services</groupId>
       <artifactId>javax.inject</artifactId>
       <optional>true</optional>
     </dependency>
diff --git a/applications/topology-manager/pom.xml b/applications/topology-manager/pom.xml
index d7e0d2151e..d3e688d790 100644
--- a/applications/topology-manager/pom.xml
+++ b/applications/topology-manager/pom.xml
@@ -57,7 +57,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>javax.inject</groupId>
+      <groupId>com.guicedee.services</groupId>
       <artifactId>javax.inject</artifactId>
       <optional>true</optional>
     </dependency>
diff --git a/openflowplugin-impl/pom.xml b/openflowplugin-impl/pom.xml
index a6a89dc09e..4d8e7ee746 100644
--- a/openflowplugin-impl/pom.xml
+++ b/openflowplugin-impl/pom.xml
@@ -97,7 +97,7 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>javax.inject</groupId>
+            <groupId>com.guicedee.services</groupId>
             <artifactId>javax.inject</artifactId>
             <optional>true</optional>
         </dependency>
diff --git a/test-provider/pom.xml b/test-provider/pom.xml
index cf2aa7c098..37a5bf7df3 100644
--- a/test-provider/pom.xml
+++ b/test-provider/pom.xml
@@ -48,7 +48,7 @@
             <artifactId>commons-lang</artifactId>
           </dependency>
         <dependency>
-            <groupId>javax.inject</groupId>
+            <groupId>com.guicedee.services</groupId>
             <artifactId>javax.inject</artifactId>
             <optional>true</optional>
         </dependency>
-- 
2.36.6