Remove features-test's exclusions

opendaylight-karaf-empty has three additional dependencies, which
need to be present in local repository when we run SFT. This would
normally be achieved through transitive dependencies, but it does
not work due to features-test exclusion of these.

This was due to infrautils using features-test and also requiring
no classpath duplicates, hence single-feature-parent needed to
explicitly name them -- which broke when we added BouncyCastle
framework extensions and did not add them to single-feature-parent.

This has changed since then, though, and infrautils is using
bundles-test-lib, which does not bring the duplicates, and thus
features-test is used exclusively by SFT.

Therefore remove the exclusion and duplication single-feature-parent,
restoring sanity.

Change-Id: I167bae2965706406b5040a699929963c66e59e31
JIRA: ODLPARENT-130
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features-test/pom.xml b/features-test/pom.xml
index 755150770fe7a47018edb26b7e81cf3c54053d76..b7c4af7c3cec46f19bdbf7aea92f58fdda043258 100644 (file)
--- a/features-test/pom.xml
+++ b/features-test/pom.xml
@@ -97,12 +97,6 @@
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>opendaylight-karaf-empty</artifactId>
             <type>zip</type>
-            <exclusions>
-              <exclusion>
-                <groupId>*</groupId>
-                <artifactId>*</artifactId>
-              </exclusion>
-            </exclusions>
         </dependency>
         <!-- BEWARE of adding additional dependencies here...
              It will cause weird issues e.g. in integration/distribution/features/repos/distribution -->

diff --git a/single-feature-parent/pom.xml b/single-feature-parent/pom.xml
index 3eed279f77f5190478d86e4970c7524c8f8e1a35..e698e529822ee2aa1b6a77c02e711b0eb50e0696 100644 (file)
--- a/single-feature-parent/pom.xml
+++ b/single-feature-parent/pom.xml
@@ -48,12 +48,6 @@
     </properties>
 
     <dependencies>
-        <!-- We now end up needing our Karaf branding somehow -->
-        <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>karaf.branding</artifactId>
-            <scope>test</scope>
-        </dependency>
         <!-- Test the generated features.xml -->
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>