Merge "Add get-cipher-suites command"

[aaa.git] / aaa-authn-sts / pom.xml

diff --git a/aaa-authn-sts/pom.xml b/aaa-authn-sts/pom.xml
index 77c9f9da6a13d18113f69afe5e80ce7afda15406..e16846898bea2c0df5bfec1ebaef10f37f4ec2b8 100644 (file)
--- a/aaa-authn-sts/pom.xml
+++ b/aaa-authn-sts/pom.xml
@@ -4,25 +4,22 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.aaa</groupId>
-        <artifactId>aaa.project</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
+        <artifactId>aaa-parent</artifactId>
+        <version>0.5.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>aaa-authn-sts</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-authn</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-authn-api</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -35,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -63,14 +60,14 @@
             <artifactId>org.apache.felix.dependencymanager</artifactId>
             <scope>provided</scope>
         </dependency>
-        <!-- Testing Dependencies -->     
+        <!-- Testing Dependencies -->
         <dependency>
             <groupId>com.sun.jersey.jersey-test-framework</groupId>
             <artifactId>jersey-test-framework-grizzly2</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
+            <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty-servlet-tester</artifactId>
             <scope>test</scope>
         </dependency>
@@ -99,7 +96,10 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Import-Package>*,com.sun.jersey.spi.container.servlet</Import-Package>
+                        <Import-Package>
+                            *,
+                            com.sun.jersey.spi.container.servlet
+                        </Import-Package>
                         <Web-ContextPath>/oauth2</Web-ContextPath>
                         <Bundle-Activator>org.opendaylight.aaa.sts.Activator</Bundle-Activator>
                         <manifestLocation>${project.basedir}/META-INF</manifestLocation>