From 16c649ae1185e5b22740516d3a33bc985ebe4d04 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 8 Jun 2021 08:26:40 +0200
Subject: [PATCH] Use GuicedEE javax.inject

This artifact is a proper jar and a JPMS module, use it instead
of the ancient javax.inject zip.

Change-Id: I8996c1a7c02180786b14e9b0d395e4e104fb98b9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml | 3 +--
 hwvtepsouthbound/hwvtepsouthbound-it/pom.xml   | 2 +-
 library/impl/pom.xml                           | 3 +--
 southbound/southbound-impl/pom.xml             | 3 +--
 southbound/southbound-it/pom.xml               | 2 +-
 utils/mdsal-utils/pom.xml                      | 3 +--
 utils/ovsdb-it-utils/pom.xml                   | 2 +-
 7 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml
index 6df3231eb..57ee01dd7 100644
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml
@@ -43,9 +43,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>mdsal-eos-binding-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.inject</groupId>
+      <groupId>com.guicedee.services</groupId>
       <artifactId>javax.inject</artifactId>
-      <scope>provided</scope>
       <optional>true</optional>
     </dependency>
     <!-- project specific dependencies -->
diff --git a/hwvtepsouthbound/hwvtepsouthbound-it/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-it/pom.xml
index b1dc2cddc..fc416f943 100644
--- a/hwvtepsouthbound/hwvtepsouthbound-it/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-it/pom.xml
@@ -78,7 +78,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>javax.inject</groupId>
+      <groupId>com.guicedee.services</groupId>
       <artifactId>javax.inject</artifactId>
       <scope>compile</scope>
     </dependency>
diff --git a/library/impl/pom.xml b/library/impl/pom.xml
index fee551b6a..07d27bb91 100644
--- a/library/impl/pom.xml
+++ b/library/impl/pom.xml
@@ -82,9 +82,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>aaa-cert</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/southbound/southbound-impl/pom.xml b/southbound/southbound-impl/pom.xml
index 9cb6d024c..1ee7ebf59 100644
--- a/southbound/southbound-impl/pom.xml
+++ b/southbound/southbound-impl/pom.xml
@@ -89,9 +89,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>diagstatus-api</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/southbound/southbound-it/pom.xml b/southbound/southbound-it/pom.xml
index aa97de8fd..d969a5674 100644
--- a/southbound/southbound-it/pom.xml
+++ b/southbound/southbound-it/pom.xml
@@ -77,7 +77,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>javax.inject</groupId>
+      <groupId>com.guicedee.services</groupId>
       <artifactId>javax.inject</artifactId>
       <scope>compile</scope>
     </dependency>
diff --git a/utils/mdsal-utils/pom.xml b/utils/mdsal-utils/pom.xml
index c14592b84..f1606b36d 100644
--- a/utils/mdsal-utils/pom.xml
+++ b/utils/mdsal-utils/pom.xml
@@ -29,9 +29,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>mdsal-binding-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.inject</groupId>
+      <groupId>com.guicedee.services</groupId>
       <artifactId>javax.inject</artifactId>
-      <scope>provided</scope>
       <optional>true</optional>
     </dependency>
 
diff --git a/utils/ovsdb-it-utils/pom.xml b/utils/ovsdb-it-utils/pom.xml
index f682a5a32..c9a62b8c6 100644
--- a/utils/ovsdb-it-utils/pom.xml
+++ b/utils/ovsdb-it-utils/pom.xml
@@ -81,7 +81,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <scope>compile</scope>
     </dependency>
     <dependency>
-        <groupId>javax.inject</groupId>
+        <groupId>com.guicedee.services</groupId>
         <artifactId>javax.inject</artifactId>
         <scope>compile</scope>
     </dependency>
-- 
2.36.6