Revert "Ship aaa-cli-jar.jar in the distribution"

This reverts commit c73a81ee42819e885c9f90ecf02d078649ab182e.

Change-Id: I596c13a7ff3a93f7bf4c61bf101881aa284f48aa
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/vpnservice/distribution/karaf/pom.xml b/vpnservice/distribution/karaf/pom.xml
index 06b1a1513dcedce8b8c4ee3cc903a716498a22d7..b3170215deb0fb5d15009c75d8d0331254c1280a 100644 (file)
--- a/vpnservice/distribution/karaf/pom.xml
+++ b/vpnservice/distribution/karaf/pom.xml
@@ -41,13 +41,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
-
-    <!-- External application -->
-    <dependency>
-      <groupId>org.opendaylight.aaa</groupId>
-      <artifactId>aaa-cli-jar</artifactId>
-      <version>0.6.0-SNAPSHOT</version>
-    </dependency>
   </dependencies>
 
   <build>
@@ -60,29 +53,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
           <skip>false</skip>
         </configuration>
       </plugin>
-      <!-- Ship the AAA CLI password-setting tool as an unversioned JAR -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-aaa-cli-jar</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/assembly/bin</outputDirectory>
-              <includeArtifactIds>aaa-cli-jar</includeArtifactIds>
-              <overWriteReleases>true</overWriteReleases>
-              <overWriteSnapshots>true</overWriteSnapshots>
-              <overWriteIfNewer>true</overWriteIfNewer>
-              <excludeTransitive>true</excludeTransitive>
-              <stripVersion>true</stripVersion>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>