Minor clean-up: Remove junit-dep and add missing scope test

[integration/distribution.git] / features-index / pom.xml

diff --git a/features-index/pom.xml b/features-index/pom.xml
index cbd6a24d761a3cbd4a279400e6be69dbdc204445..0e729bec80fb5771e9b9d3c6908ff050be2b3c9d 100644 (file)
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -17,7 +17,7 @@
     </parent>
     <artifactId>features-integration-index</artifactId>
     <packaging>jar</packaging>
-    <name>${project.groupId}:${project.artifactId}</name>
+    <name>distribution:${project.artifactId}</name>
     <description>Sub-project gathering feature repositories of all ODL projects participating in distribution.</description>
     <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
     <licenses>
@@ -46,13 +46,6 @@
             <type>xml</type>
         </dependency>
         <!-- feature repository dependencies from other ODL projects -->
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>features-aaa-api</artifactId>
-            <version>${feature.aaa.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>features-aaa</artifactId>
@@ -62,7 +55,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>features-aaa-authz</artifactId>
+            <artifactId>features-aaa-shiro</artifactId>
             <version>${feature.aaa.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
@@ -186,6 +179,13 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.dluxapps</groupId>
+            <artifactId>features-dluxapps</artifactId>
+            <version>${feature.dluxapps.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.eman</groupId>
             <artifactId>eman-features</artifactId>
@@ -424,6 +424,7 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <!-- No snapshot artifacts available due to Bug 7404
         <dependency>
             <groupId>org.opendaylight.sdninterfaceapp</groupId>
             <artifactId>features-sdninterfaceapp</artifactId>
@@ -431,6 +432,7 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
         <dependency>
             <groupId>org.opendaylight.sfc</groupId>
             <artifactId>features-sfc</artifactId>
@@ -459,6 +461,7 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+
         <dependency>
             <groupId>org.opendaylight.sxp</groupId>
             <artifactId>features</artifactId>
@@ -529,14 +532,9 @@
             <version>${feature.odlparent.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit-dep</artifactId>
-            <scope>test</scope>
-        </dependency>
         <!-- dependency for opendaylight-karaf-empty for use by testing -->
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
+            <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>opendaylight-karaf-empty</artifactId>
             <version>${feature.odlparent.version}</version>
             <type>zip</type>
@@ -550,6 +548,20 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <!-- This generates the META-INF/maven/dependencies.properties file
+                     which is required by the versionAsInProject() used in SingleFeatureTest -->
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>maven-paxexam-plugin</artifactId>
+                <executions>
+                  <execution>
+                   <id>generate-dependencies.properties-file</id>
+                   <goals>
+                     <goal>generate-depends-file</goal>
+                   </goals>
+                  </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.karaf.tooling</groupId>
                 <artifactId>karaf-maven-plugin</artifactId>
@@ -607,7 +619,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <systemPropertyVariables>
-                        <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
+                        <karaf.distro.groupId>org.opendaylight.odlparent</karaf.distro.groupId>
                         <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
                         <karaf.distro.version>${feature.odlparent.version}</karaf.distro.version>
                     </systemPropertyVariables>