From 45f20607fae9008c0fac49d29d3fd44be03a0d88 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sun, 9 May 2021 22:25:49 +0200
Subject: [PATCH] Migrate javax.inject artifact references

We are using GuicedEE instead of the ancient (and broken) javax.inject
jar. Migrate references.

Change-Id: I262c155b97aefced7a834de3db0efd839cf45fbf
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 netconf/aaa-authn-odl-plugin/pom.xml       | 3 +--
 netconf/mdsal-netconf-notification/pom.xml | 2 +-
 netconf/sal-netconf-connector/pom.xml      | 3 +--
 restconf/restconf-nb-bierman02/pom.xml     | 2 +-
 restconf/restconf-nb-rfc8040/pom.xml       | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/netconf/aaa-authn-odl-plugin/pom.xml b/netconf/aaa-authn-odl-plugin/pom.xml
index 1a9e45a681..eca7d73d91 100644
--- a/netconf/aaa-authn-odl-plugin/pom.xml
+++ b/netconf/aaa-authn-odl-plugin/pom.xml
@@ -39,9 +39,8 @@
             <artifactId>osgi.cmpn</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.inject</groupId>
+            <groupId>com.guicedee.services</groupId>
             <artifactId>javax.inject</artifactId>
-            <scope>provided</scope>
             <optional>true</optional>
         </dependency>
     </dependencies>
diff --git a/netconf/mdsal-netconf-notification/pom.xml b/netconf/mdsal-netconf-notification/pom.xml
index e7ce39d363..a0bb97d8bb 100644
--- a/netconf/mdsal-netconf-notification/pom.xml
+++ b/netconf/mdsal-netconf-notification/pom.xml
@@ -58,7 +58,7 @@
             <artifactId>netconf-util</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.inject</groupId>
+            <groupId>com.guicedee.services</groupId>
             <artifactId>javax.inject</artifactId>
             <optional>true</optional>
         </dependency>
diff --git a/netconf/sal-netconf-connector/pom.xml b/netconf/sal-netconf-connector/pom.xml
index 033e4aa1d1..06155a88a1 100644
--- a/netconf/sal-netconf-connector/pom.xml
+++ b/netconf/sal-netconf-connector/pom.xml
@@ -100,9 +100,8 @@
       <artifactId>netconf-util</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.inject</groupId>
+      <groupId>com.guicedee.services</groupId>
       <artifactId>javax.inject</artifactId>
-      <scope>provided</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
diff --git a/restconf/restconf-nb-bierman02/pom.xml b/restconf/restconf-nb-bierman02/pom.xml
index d57e170d88..c8a451bbdb 100644
--- a/restconf/restconf-nb-bierman02/pom.xml
+++ b/restconf/restconf-nb-bierman02/pom.xml
@@ -27,7 +27,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/restconf/restconf-nb-rfc8040/pom.xml b/restconf/restconf-nb-rfc8040/pom.xml
index 8dae99d6fe..fdb3096f87 100644
--- a/restconf/restconf-nb-rfc8040/pom.xml
+++ b/restconf/restconf-nb-rfc8040/pom.xml
@@ -29,7 +29,7 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>javax.inject</groupId>
+      <groupId>com.guicedee.services</groupId>
       <artifactId>javax.inject</artifactId>
       <optional>true</optional>
     </dependency>
-- 
2.36.6