Move karaf-util dependency

from bundles-test to features-test

The new karaf-util artifact introduced in
https://git.opendaylight.org/gerrit/#/c/61293/ should not be a
dependency of bundles-test but rather of features-test IMHO.

This is because bundles-test actually not have a compile time dependency
to the CustomBundleUrlStreamHandlerFactory from karaf-util; only
features-test (in PerRepoTestRunner).

However, bundles-test is also used in infrautils' ready.  Bumping to
odlparent 2.0.4 (which includes this) fell over with "...
odl-infrautils-ready ... Unable to resolve
org.opendaylight.odlparent.karaf-util...", because of the
<Embed-Dependency>bundles-test-lib in ready-impl.

We could add karaf-util to the <Embed-Dependency> of ready-impl to work
around this, at least temporarily to unblock, but the root cause is that
the dependency is wrong.

Change-Id: I031fbbc8fb9d8eebba3550ef0683b8363397d8a8
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/bundles-test-lib/pom.xml b/bundles-test-lib/pom.xml
index 6a71e350decc5ae61439993bc86568df0b33343f..ddfcc1edf397e9fa1513dd418a647b5b1ff1470e 100644 (file)
--- a/bundles-test-lib/pom.xml
+++ b/bundles-test-lib/pom.xml
@@ -53,11 +53,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.odlparent</groupId>
-      <artifactId>karaf-util</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <!-- BEWARE of adding additional dependencies here...
          It will cause weird issues e.g. in integration/distribution/features/repos/distribution -->
     <dependency>

diff --git a/features-test/pom.xml b/features-test/pom.xml
index d9430593bbcd31ded468357d40ab37addbb541fc..7056b96ebb6b39354f5ff993854009786e555c4c 100644 (file)
--- a/features-test/pom.xml
+++ b/features-test/pom.xml
@@ -95,6 +95,11 @@
         </dependency>
         <!-- BEWARE of adding additional dependencies here...
              It will cause weird issues e.g. in integration/distribution/features/repos/distribution -->
+        <dependency>
+          <groupId>org.opendaylight.odlparent</groupId>
+          <artifactId>karaf-util</artifactId>
+          <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bundles4-test</artifactId>