From e8234fcf5c1bc64d12fe756e422e0e614019d2d4 Mon Sep 17 00:00:00 2001
From: Vratko Polak <vrpolak@cisco.com>
Date: Wed, 15 Feb 2017 19:13:44 +0100
Subject: [PATCH] Compile-time dependencies matter

Not sure whether this is a proper fix.
This is an analogy of https://git.opendaylight.org/gerrit/#/c/51921/1

Change-Id: I4173cb756e40c1111e8fc29c0f370f8bdef1652b
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---
 features/benchmark/odl-dsbenchmark/pom.xml       | 1 -
 features/benchmark/odl-mdsal-benchmark/pom.xml   | 3 ---
 features/benchmark/odl-ntfbenchmark/pom.xml      | 1 -
 features/config-netty/odl-config-netty/pom.xml   | 1 -
 features/mdsal/odl-mdsal-broker-local/pom.xml    | 1 -
 features/mdsal/odl-mdsal-broker/pom.xml          | 7 -------
 features/mdsal/odl-mdsal-xsql/pom.xml            | 1 -
 features/mdsal/odl-message-bus-collector/pom.xml | 1 -
 8 files changed, 16 deletions(-)

diff --git a/features/benchmark/odl-dsbenchmark/pom.xml b/features/benchmark/odl-dsbenchmark/pom.xml
index 200ea78320..5842632584 100644
--- a/features/benchmark/odl-dsbenchmark/pom.xml
+++ b/features/benchmark/odl-dsbenchmark/pom.xml
@@ -52,7 +52,6 @@
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>config</classifier>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/features/benchmark/odl-mdsal-benchmark/pom.xml b/features/benchmark/odl-mdsal-benchmark/pom.xml
index c3f22df7eb..b7ea19c4c4 100644
--- a/features/benchmark/odl-mdsal-benchmark/pom.xml
+++ b/features/benchmark/odl-mdsal-benchmark/pom.xml
@@ -67,7 +67,6 @@
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>config</classifier>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <!-- finalname="ntfbenchmark-impl-default-config.xml" -->
@@ -76,7 +75,6 @@
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>config</classifier>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <!-- finalname="rpcbenchmark-impl-default-config.xml" -->
@@ -85,7 +83,6 @@
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>config</classifier>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/features/benchmark/odl-ntfbenchmark/pom.xml b/features/benchmark/odl-ntfbenchmark/pom.xml
index fce655622d..eac00ce934 100644
--- a/features/benchmark/odl-ntfbenchmark/pom.xml
+++ b/features/benchmark/odl-ntfbenchmark/pom.xml
@@ -52,7 +52,6 @@
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>config</classifier>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/features/config-netty/odl-config-netty/pom.xml b/features/config-netty/odl-config-netty/pom.xml
index 1378f3e766..a02e850caf 100644
--- a/features/config-netty/odl-config-netty/pom.xml
+++ b/features/config-netty/odl-config-netty/pom.xml
@@ -82,7 +82,6 @@
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>config</classifier>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/mdsal/odl-mdsal-broker-local/pom.xml
index 5f04cb16b5..3ba139a950 100644
--- a/features/mdsal/odl-mdsal-broker-local/pom.xml
+++ b/features/mdsal/odl-mdsal-broker-local/pom.xml
@@ -209,7 +209,6 @@
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>config</classifier>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/features/mdsal/odl-mdsal-broker/pom.xml b/features/mdsal/odl-mdsal-broker/pom.xml
index d820b1b098..63c4af5026 100644
--- a/features/mdsal/odl-mdsal-broker/pom.xml
+++ b/features/mdsal/odl-mdsal-broker/pom.xml
@@ -51,7 +51,6 @@
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>config</classifier>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <!-- finalname="${config.configfile.directory}/${config.clustered-entity-ownership.configfile}" -->
@@ -60,7 +59,6 @@
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>entityownershipconfig</classifier>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <!-- finalname="configuration/initial/akka.conf" -->
@@ -69,7 +67,6 @@
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>akkaconf</classifier>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <!-- finalname="configuration/factory/akka.conf" override="true" -->
@@ -78,7 +75,6 @@
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>factoryakkaconf</classifier>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <!-- finalname="configuration/initial/module-shards.conf" -->
@@ -87,7 +83,6 @@
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>moduleshardconf</classifier>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <!-- finalname="configuration/initial/modules.conf" -->
@@ -96,7 +91,6 @@
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>moduleconf</classifier>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <!-- finalname="etc/org.opendaylight.controller.cluster.datastore.cfg" -->
@@ -105,7 +99,6 @@
             <version>${project.version}</version>
             <type>cfg</type>
             <classifier>datastore</classifier>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/features/mdsal/odl-mdsal-xsql/pom.xml b/features/mdsal/odl-mdsal-xsql/pom.xml
index 11525a683d..fa6b65430b 100644
--- a/features/mdsal/odl-mdsal-xsql/pom.xml
+++ b/features/mdsal/odl-mdsal-xsql/pom.xml
@@ -53,7 +53,6 @@
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>config</classifier>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/features/mdsal/odl-message-bus-collector/pom.xml b/features/mdsal/odl-message-bus-collector/pom.xml
index 2d0413ec79..58dde5f07e 100644
--- a/features/mdsal/odl-message-bus-collector/pom.xml
+++ b/features/mdsal/odl-message-bus-collector/pom.xml
@@ -76,7 +76,6 @@
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>config</classifier>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
-- 
2.36.6