X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=web%2Fservlet-jersey2%2Fpom.xml;h=bc7f4845e1977a76eb163f22fa678aeeb64bef23;hb=97edefc419656dc07d0b49fe33dcaaf32e295d7e;hp=d5fd9347859d4ea057e1cb6af91c45d0b5fa8ca9;hpb=6bf89650c13dca164933c05b738b4e866e4b6f03;p=aaa.git

diff --git a/web/servlet-jersey2/pom.xml b/web/servlet-jersey2/pom.xml
index d5fd93478..bc7f4845e 100644
--- a/web/servlet-jersey2/pom.xml
+++ b/web/servlet-jersey2/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>aaa-parent</artifactId>
-        <version>0.11.0-SNAPSHOT</version>
+        <version>0.14.10-SNAPSHOT</version>
         <relativePath>../../parent</relativePath>
     </parent>
 
@@ -21,20 +21,6 @@
     <name>ODL :: aaa :: ${project.artifactId}</name>
     <packaging>bundle</packaging>
 
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.glassfish.jersey</groupId>
-                <artifactId>jersey-bom</artifactId>
-                <version>2.25.1</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.aaa.web</groupId>
@@ -43,36 +29,23 @@
         <dependency>
             <groupId>org.glassfish.jersey.containers</groupId>
             <artifactId>jersey-container-servlet</artifactId>
-            <!-- Override the odlparent version -->
-            <version>2.25.1</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-client</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <groupId>com.guicedee.services</groupId>
+            <artifactId>javax.inject</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.kohsuke.metainf-services</groupId>
             <artifactId>metainf-services</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>osgi.cmpn</artifactId>
+        </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Include-Resource>{META-INF/services=${project.build.directory}/classes/META-INF/services}</Include-Resource>
-                        <Bundle-Activator>org.opendaylight.aaa.web.servlet.jersey2.osgi.Activator</Bundle-Activator>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>