From: Robert Varga <rovarga@cisco.com>
Date: Sun, 5 Feb 2017 20:52:08 +0000 (+0100)
Subject: Do not scan transitive dependencies
X-Git-Tag: release/carbon~287
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=d7f30e5e7d77b7310add0d856621aacbfb4ac74f

Do not scan transitive dependencies

Doing so pulls in aries, which is provided by karaf, causing reactivation
of the platform, breaking pax-exam tests. This fixes the issue partially,
as blueprint is not being directly reactivated.

This is true for odl-mdsal-broker-local and odl-mdsal-xsql. Also the sample
test app should not be pulling tycho into an OSGi container, make sure the
dependency is only for test.

Change-Id: I5b08e19e39347fe6e5c03bf6dbe1cb05e36274e3
Signed-off-by: Robert Varga <rovarga@cisco.com>
---

diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/mdsal/odl-mdsal-broker-local/pom.xml
index 5f04cb16b5..f3ada9aaec 100644
--- a/features/mdsal/odl-mdsal-broker-local/pom.xml
+++ b/features/mdsal/odl-mdsal-broker-local/pom.xml
@@ -213,4 +213,17 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>karaf-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <includeTransitiveDependency>false</includeTransitiveDependency>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/features/mdsal/odl-mdsal-xsql/pom.xml b/features/mdsal/odl-mdsal-xsql/pom.xml
index 11525a683d..c5000f0efa 100644
--- a/features/mdsal/odl-mdsal-xsql/pom.xml
+++ b/features/mdsal/odl-mdsal-xsql/pom.xml
@@ -56,4 +56,17 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>karaf-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <includeTransitiveDependency>false</includeTransitiveDependency>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml
index 95fdeac5da..7727fc1e5d 100644
--- a/opendaylight/blueprint/pom.xml
+++ b/opendaylight/blueprint/pom.xml
@@ -50,6 +50,7 @@
       <groupId>org.apache.aries.blueprint</groupId>
       <artifactId>org.apache.aries.blueprint.core</artifactId>
       <version>1.7.1</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml
index caa2b1a41a..77ede454ac 100644
--- a/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml
+++ b/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml
@@ -45,6 +45,7 @@
         <dependency>
             <groupId>org.eclipse.tycho</groupId>
             <artifactId>org.eclipse.osgi</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 </project>