Cleanup aaa-cli dependencies

We do not need ehcache, do not pull it in.

Change-Id: I604168264b696ac2b6d2065b78bb5f97e2727107
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/aaa-cli/pom.xml b/aaa-cli/pom.xml
index 890761f3983186d1c63aa2b805439f97a989b61a..30c57d1b6646a25909223d508b676d4670b61166 100644 (file)
--- a/aaa-cli/pom.xml
+++ b/aaa-cli/pom.xml
@@ -23,27 +23,23 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <packaging>bundle</packaging>
 
   <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.aaa</groupId>
+      <artifactId>aaa-authn-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.aaa</groupId>
       <artifactId>aaa-cert</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.aaa</groupId>
-      <artifactId>aaa-authn-api</artifactId>
+      <artifactId>aaa-password-service-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.karaf.shell</groupId>
       <artifactId>org.apache.karaf.shell.core</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.aaa</groupId>
-      <artifactId>aaa-shiro</artifactId>
-    </dependency>
   </dependencies>
 
     <build>

diff --git a/features/odl-aaa-cli/pom.xml b/features/odl-aaa-cli/pom.xml
index 0af33f49ffd8e71e9264241a9c96109dd606ba07..56f49a5eabf8c4153c6980b0096bc642816f2312 100644 (file)
--- a/features/odl-aaa-cli/pom.xml
+++ b/features/odl-aaa-cli/pom.xml
@@ -64,16 +64,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>net.sf.ehcache</groupId>
-            <artifactId>ehcache</artifactId>
-        </dependency>
-        <dependency>
-            <!-- This is necessary for a full javax.transaction.xa for ehcache -->
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jta_1.1_spec</artifactId>
-            <version>1.1.1</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>aaa-cli</artifactId>

diff --git a/features/odl-aaa-shiro/pom.xml b/features/odl-aaa-shiro/pom.xml
index 4ac33aedaed51d47bb4ab58b1f1687e5c6f02e55..4f81c52099190a0dd42ef53cd5ba1adca6def156 100644 (file)
--- a/features/odl-aaa-shiro/pom.xml
+++ b/features/odl-aaa-shiro/pom.xml
@@ -143,6 +143,13 @@
             <type>cfg</type>
             <classifier>config</classifier>
         </dependency>
+
+        <dependency>
+            <!-- This is necessary for a full javax.transaction.xa for ehcache -->
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
+            <version>1.1.1</version>
+        </dependency>
     </dependencies>
 
     <build>