remove opendaylight-karaf-empty

opendaylight-karaf-empty is for testing
purpose and outdated

Issue-ID: APPC-1651
Change-Id: I768b7afa9a60db6413f71320fd11575b1fafce97
Signed-off-by: Taka Cho <takamune.cho@att.com>

diff --git a/appc-directed-graph/dg-loader/features/pom.xml b/appc-directed-graph/dg-loader/features/pom.xml
index acbb816..0df6946 100644 (file)
--- a/appc-directed-graph/dg-loader/features/pom.xml
+++ b/appc-directed-graph/dg-loader/features/pom.xml
@@ -55,14 +55,6 @@
         </dependency>
 
 
-        <!-- dependency for opendaylight-karaf-empty for use by testing -->
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>opendaylight-karaf-empty</artifactId>
-            <type>zip</type>
-        </dependency>
-
-
         <dependency>
             <!-- Required for launching the feature tests -->
             <groupId>org.opendaylight.odlparent</groupId>

diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-features/pom.xml b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-features/pom.xml
index a6c1d09..6eba6b0 100644 (file)
--- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-features/pom.xml
+++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-features/pom.xml
@@ -70,32 +70,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!--<plugin>
-              &lt;!&ndash; launches the feature test, which validates that your karaf feature
-                can be installed inside of a karaf container. It doesn't validate that your
-                functionality works correctly, just that you have all of the dependent bundles
-                defined correctly. &ndash;&gt;
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-surefire-plugin</artifactId>
-              <version>2.16</version>
-              <configuration>
-                <systemPropertyVariables>
-                  <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
-                  <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-                  <karaf.distro.version>${odl.karaf.empty.distro.version}</karaf.distro.version>
-                </systemPropertyVariables>
-                <dependenciesToScan>
-                  <dependency>org.opendaylight.yangtools:features-test</dependency>
-                </dependenciesToScan>
-                <classpathDependencyExcludes>
-                  &lt;!&ndash; The dependencies which bring in AbstractDataBrokerTest class
-                    brings in a second PaxExam container which results in the feature tests failing
-                    with a message similar to: "ERROR o.ops4j.pax.exam.spi.PaxExamRuntime - Ambiguous
-                    TestContainer ..." This excludes the container we don't want to use. &ndash;&gt;
-                  <classpathDependencyExcludes>org.ops4j.pax.exam:pax-exam-container-native</classpathDependencyExcludes>
-                </classpathDependencyExcludes>
-              </configuration>
-            </plugin>-->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>

diff --git a/pom.xml b/pom.xml
index edb26a5..db67e38 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,6 @@ limitations under the License.
         <odl.ietf-inet-types.version>1.5.1</odl.ietf-inet-types.version>
         <odl.controller.config.api.version>0.7.1</odl.controller.config.api.version>
         <odl.commons.opendaylight.version>2.0.5</odl.commons.opendaylight.version>
-        <odl.karaf.empty.distro.version>1.8.3-Carbon</odl.karaf.empty.distro.version>
 
     </properties>
 
@@ -263,12 +262,6 @@ limitations under the License.
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>opendaylight-karaf-empty</artifactId>
-                <version>${odl.karaf.empty.distro.version}</version>
-                <type>zip</type>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>ietf-inet-types-2013-07-15</artifactId>