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>

diff --git a/netconf/aaa-authn-odl-plugin/pom.xml b/netconf/aaa-authn-odl-plugin/pom.xml
index 1a9e45a6813f102baecdf555d5f16dcefb0c3dce..eca7d73d9115b4d33d5357fc6519ab0742a74942 100644 (file)
--- 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 e7ce39d363389656ff456d9852e0c683e656d0ca..a0bb97d8bbc6f8ddff7230e8394701ae0c9f6bf7 100644 (file)
--- 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 033e4aa1d13f63ed4cc3bb794dc9149e00a49dbd..06155a88a19095ab6e2be788d3bca2a1c8dd8db2 100644 (file)
--- 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 d57e170d88b204f05b9cf77a4bbf7739a751a0a9..c8a451bbdb03e8bffb927eec252a882d02bb321b 100644 (file)
--- 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 8dae99d6fea644c7f5ed9d5c3fb689f34984455b..fdb3096f872287c58e426af0bd6beebf55785260 100644 (file)
--- 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>