Add com.guicedee/javax.inject

javax.inject/javax.inject is an ancient jar, which is not a bundle,
nor JPMS-enabled. Add a repackaged alternative, which is at least
a proper module.

JIRA: OLDPARENT-247
Change-Id: I295652f45a5dbe52f6d9c64042af3b2642ac3769
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features-test/pom.xml b/features-test/pom.xml
index 42bcd9e13ff14c122905a30999d0edb7b78b9d87..0609e737f3b566057198d48ee0097f8378c9ea9b 100644 (file)
--- a/features-test/pom.xml
+++ b/features-test/pom.xml
@@ -88,7 +88,7 @@
             <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/odlparent-dependency-check/pom.xml b/odlparent-dependency-check/pom.xml
index e368c215db34e85b42f252fd7f7cdf101c0b0ae9..54973cb79851cfa84bf13b06726088820f0c2ca6 100644 (file)
--- a/odlparent-dependency-check/pom.xml
+++ b/odlparent-dependency-check/pom.xml
@@ -79,6 +79,10 @@
             <groupId>com.google.truth</groupId>
             <artifactId>truth</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.guicedee.services</groupId>
+            <artifactId>javax.inject</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index f54b966d8a0428be27566fc0308386623dd5b34f..f26ed0ebe1e484caee5d76347b55d519a293dc16 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -743,12 +743,21 @@
       </dependency>
 
       <!-- Annotations -->
+      <!-- FIXME: ODLPARENT-246: remove this declaration -->
       <dependency>
         <groupId>javax.inject</groupId>
         <artifactId>javax.inject</artifactId>
         <version>1</version>
         <optional>true</optional>
       </dependency>
+      <!-- A better alternative for javax.inject, from https://guicedee.com/ -->
+      <dependency>
+        <groupId>com.guicedee.services</groupId>
+        <artifactId>javax.inject</artifactId>
+        <version>1.0.19.9</version>
+        <scope>provided</scope>
+        <optional>true</optional>
+      </dependency>
 
       <!-- jung, a graph library -->
       <dependency>