Collapse AAA feature repositories

Per AAA project design choice, AAA will now only provide one feature
repository.  In the past, two were present (one for shiro and one for
the existing impl).  Since now the two are one in the same, it no
longer makes since to provide separate features or repositories. The
name features-aaa (the old one) was a much better sounding name so we
stuck with that instead of features-aaa-shiro.

Change-Id: Idb97e60ef77328322f671f3436d180107586eda1
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>

diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index 7d03626fbbce8b4783b81b69572bc704454d2122..ec9e4b5abe07808f97bb6607caec63157c128628 100644 (file)
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -51,13 +51,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>features-aaa-shiro</artifactId>
-                <version>${aaa.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
 
             <!-- ALTO -->
             <dependency>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index d9dbcafaed73ad39695a25a06e4e8f0ceb79b904..7baa627fd9a7f3f4d273d6b31865b8657d504441 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -62,12 +62,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>features-aaa-shiro</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
 
         <!-- ALTO -->
         <dependency>