Declare version property for maven bundle plugin, reuse it in poms and

use version 2.3.7 instead of 2.3.6 and 2.4.0 used in parallel.

Change-Id: I3749f69ea38edbcacbe217386ac8accb19837c50
Signed-off-by: Alissa Bonas <abonas@redhat.com>

diff --git a/opendaylight/appauth/pom.xml b/opendaylight/appauth/pom.xml
index 71aa49f0f2402cb337f9fc3c3ec8cf4abe44b1cc..4f9cf4c17dce24bd158375bee1ea35a09e8246aa 100644 (file)
--- a/opendaylight/appauth/pom.xml
+++ b/opendaylight/appauth/pom.xml
@@ -22,7 +22,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.3.6</version>
+                <version>${bundle.plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>

diff --git a/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
index b60dee7c417c1cdbd766f8b9d1a96febb88c6562..344561bf1937315a5a1e97ee9ac0ed7e179da541 100644 (file)
--- a/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
+++ b/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
@@ -10,7 +10,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
     <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>\r
     <yang.version>0.5.8-SNAPSHOT</yang.version>\r
-    <maven.bundle.version>2.4.0</maven.bundle.version>\r
+    <bundle.plugin.version>2.3.7</bundle.plugin.version>\r
   </properties>\r
 \r
   <build>\r
@@ -18,7 +18,7 @@
       <plugin>\r
         <groupId>org.apache.felix</groupId>\r
         <artifactId>maven-bundle-plugin</artifactId>\r
-        <version>${maven.bundle.version}</version>\r
+        <version>${bundle.plugin.version}</version>\r
         <extensions>true</extensions>\r
         <configuration>\r
           <instructions>\r

diff --git a/opendaylight/arphandler/pom.xml b/opendaylight/arphandler/pom.xml
index c58ddd2f21404f21d584cc15e06a68d5ae860a50..e3beb8061d585c54ecac76fb174e948791fd54b8 100644 (file)
--- a/opendaylight/arphandler/pom.xml
+++ b/opendaylight/arphandler/pom.xml
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/clustering/services/pom.xml b/opendaylight/clustering/services/pom.xml
index d251d454250d84ed302c75ffd16d43d178e51e37..59df46b36e16e1e7f50205094194f571a3682afa 100644 (file)
--- a/opendaylight/clustering/services/pom.xml
+++ b/opendaylight/clustering/services/pom.xml
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/clustering/services_implementation/pom.xml b/opendaylight/clustering/services_implementation/pom.xml
index fddaa6c9dc7e657f51576f5f1ed209a0409fe47a..9606bdc019b561de5aed00c0eb4fb342da693f48 100644 (file)
--- a/opendaylight/clustering/services_implementation/pom.xml
+++ b/opendaylight/clustering/services_implementation/pom.xml
@@ -38,7 +38,7 @@
     <plugin>
       <groupId>org.apache.felix</groupId>
       <artifactId>maven-bundle-plugin</artifactId>
-      <version>2.3.6</version>
+      <version>${bundle.plugin.version}</version>
       <extensions>true</extensions>
       <configuration>
         <instructions>

diff --git a/opendaylight/clustering/stub/pom.xml b/opendaylight/clustering/stub/pom.xml
index b3c49851f62b2a3bb11bacc5683fce0aa8a81174..3cc7d7baac72a8893ebf2ace01d3f2d4b25bc4f8 100644 (file)
--- a/opendaylight/clustering/stub/pom.xml
+++ b/opendaylight/clustering/stub/pom.xml
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/clustering/test/pom.xml b/opendaylight/clustering/test/pom.xml
index 0b09f41de54fb987300f797086796d18f65852ef..340a6c771ff3a590351960ed80bd9368e370123d 100644 (file)
--- a/opendaylight/clustering/test/pom.xml
+++ b/opendaylight/clustering/test/pom.xml
@@ -22,7 +22,7 @@
     <plugin>
       <groupId>org.apache.felix</groupId>
       <artifactId>maven-bundle-plugin</artifactId>
-      <version>2.3.6</version>
+      <version>${bundle.plugin.version}</version>
       <extensions>true</extensions>
       <configuration>
         <instructions>

diff --git a/opendaylight/commons/concepts/pom.xml b/opendaylight/commons/concepts/pom.xml
index ab351dbdc5936598e9dc5f17d5b93ff885fefb5c..22555271e1dcb24be484574afbbb87039f487d17 100644 (file)
--- a/opendaylight/commons/concepts/pom.xml
+++ b/opendaylight/commons/concepts/pom.xml
@@ -22,7 +22,7 @@
       <plugin>\r
         <groupId>org.apache.felix</groupId>\r
         <artifactId>maven-bundle-plugin</artifactId>\r
-        <version>2.3.6</version>\r
+        <version>${bundle.plugin.version}</version>\r
         <extensions>true</extensions>\r
         <configuration>\r
           <instructions>\r

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 042bc54928a8def322a80c866d61682faed5656b..abda95aee53a19a70fcb30870d30d056574daa8b 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -58,6 +58,7 @@
     <commons.lang.version>3.1</commons.lang.version>
     <jacoco.version>0.5.3.201107060350</jacoco.version>
     <enforcer.version>1.3.1</enforcer.version>
+    <bundle.plugin.version>2.3.7</bundle.plugin.version>
   </properties>
 
   <pluginRepositories>

diff --git a/opendaylight/configuration/api/pom.xml b/opendaylight/configuration/api/pom.xml
index bef02e4e2935ea5de845c1f501099fbc140ce2a9..68fae6417ca2e50917bd96f5805c45fa160521f6 100644 (file)
--- a/opendaylight/configuration/api/pom.xml
+++ b/opendaylight/configuration/api/pom.xml
@@ -23,7 +23,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/configuration/implementation/pom.xml b/opendaylight/configuration/implementation/pom.xml
index c656ce1d6c65831eecd193ac2771fb1bd0a173ef..66473e262fb3f185551827ed1f1ef19936309143 100644 (file)
--- a/opendaylight/configuration/implementation/pom.xml
+++ b/opendaylight/configuration/implementation/pom.xml
@@ -23,7 +23,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/connectionmanager/api/pom.xml b/opendaylight/connectionmanager/api/pom.xml
index 4cc14b3d38cefbe69c4c1386e73a06c74208e72b..7029f49c0c6ce09891dad1883e8f7cf3b9dd57b5 100644 (file)
--- a/opendaylight/connectionmanager/api/pom.xml
+++ b/opendaylight/connectionmanager/api/pom.xml
@@ -23,7 +23,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/connectionmanager/implementation/pom.xml b/opendaylight/connectionmanager/implementation/pom.xml
index 5df2b0b26d2542b36e8f950ec43d5b04cf7f02f5..5571d944cab9de853c772b7023a733870b599c12 100644 (file)
--- a/opendaylight/connectionmanager/implementation/pom.xml
+++ b/opendaylight/connectionmanager/implementation/pom.xml
@@ -23,7 +23,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/containermanager/api/pom.xml b/opendaylight/containermanager/api/pom.xml
index 2b207aa797aa76be72d20e3cc5e108aa20c03e98..891c44dfd016c70b5acbc295e6c7cbb20a408734 100644 (file)
--- a/opendaylight/containermanager/api/pom.xml
+++ b/opendaylight/containermanager/api/pom.xml
@@ -23,7 +23,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/containermanager/implementation/pom.xml b/opendaylight/containermanager/implementation/pom.xml
index 5af8e2265c94dccc540bf430b961ddcad906bca1..7900ce8901bc668a99d55c34d1546fc622a50522 100644 (file)
--- a/opendaylight/containermanager/implementation/pom.xml
+++ b/opendaylight/containermanager/implementation/pom.xml
@@ -23,7 +23,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/containermanager/it.implementation/pom.xml b/opendaylight/containermanager/it.implementation/pom.xml
index ba71dbfdfeea151debce1497dd3f2740556845b3..805f2a75310169a029135787f67392f1bf0edb0b 100644 (file)
--- a/opendaylight/containermanager/it.implementation/pom.xml
+++ b/opendaylight/containermanager/it.implementation/pom.xml
@@ -23,7 +23,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/forwarding/staticrouting/pom.xml b/opendaylight/forwarding/staticrouting/pom.xml
index 458914807cb478480b76e0c595592c69431dcf7d..2304e6be5d80be849ad7c175088910bee9223c00 100644 (file)
--- a/opendaylight/forwarding/staticrouting/pom.xml
+++ b/opendaylight/forwarding/staticrouting/pom.xml
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/forwardingrulesmanager/api/pom.xml b/opendaylight/forwardingrulesmanager/api/pom.xml
index 73ba8b95b09660928032644e961136c94642f8f1..253906e9c1f5ecfd25b34b3bed0f2d2db6a32283 100644 (file)
--- a/opendaylight/forwardingrulesmanager/api/pom.xml
+++ b/opendaylight/forwardingrulesmanager/api/pom.xml
@@ -24,7 +24,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/forwardingrulesmanager/implementation/pom.xml b/opendaylight/forwardingrulesmanager/implementation/pom.xml
index d146eead6f0168e7e25cdd290459fb5ff20be7d2..651d077fd84097c3e966f36cfb46547f6a056f6e 100644 (file)
--- a/opendaylight/forwardingrulesmanager/implementation/pom.xml
+++ b/opendaylight/forwardingrulesmanager/implementation/pom.xml
@@ -41,7 +41,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/hosttracker/api/pom.xml b/opendaylight/hosttracker/api/pom.xml
index 49a3ff5d9284fe1ef9149b5a6a98a09f41677581..322792d089b997d67f36fc138468afe0d77fad9c 100644 (file)
--- a/opendaylight/hosttracker/api/pom.xml
+++ b/opendaylight/hosttracker/api/pom.xml
@@ -22,7 +22,7 @@
       <plugin>\r
         <groupId>org.apache.felix</groupId>\r
         <artifactId>maven-bundle-plugin</artifactId>\r
-        <version>2.3.6</version>\r
+        <version>${bundle.plugin.version}</version>\r
         <extensions>true</extensions>\r
         <configuration>\r
           <instructions>\r

diff --git a/opendaylight/hosttracker/implementation/pom.xml b/opendaylight/hosttracker/implementation/pom.xml
index e93559b42ccae19ac461607d5680b4a3db1e0ec6..3e7a1df325348e9c1ca6a762d338c93a054a6bbe 100644 (file)
--- a/opendaylight/hosttracker/implementation/pom.xml
+++ b/opendaylight/hosttracker/implementation/pom.xml
@@ -41,7 +41,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/hosttracker_new/api/pom.xml b/opendaylight/hosttracker_new/api/pom.xml
index 72b671c0d284f25438fddcc42787275153652856..f93b8041665c672524395d7c63f52c4558e4a215 100644 (file)
--- a/opendaylight/hosttracker_new/api/pom.xml
+++ b/opendaylight/hosttracker_new/api/pom.xml
@@ -22,7 +22,7 @@
       <plugin>\r
         <groupId>org.apache.felix</groupId>\r
         <artifactId>maven-bundle-plugin</artifactId>\r
-        <version>2.3.6</version>\r
+        <version>${bundle.plugin.version}</version>\r
         <extensions>true</extensions>\r
         <configuration>\r
           <instructions>\r

diff --git a/opendaylight/hosttracker_new/implementation/pom.xml b/opendaylight/hosttracker_new/implementation/pom.xml
index dfc2955cfd9679f8c7f3eca2ca4fb60fcf5ef2c5..85f3ca857b31d5b89d2078d3abe3780944b8663b 100644 (file)
--- a/opendaylight/hosttracker_new/implementation/pom.xml
+++ b/opendaylight/hosttracker_new/implementation/pom.xml
@@ -41,7 +41,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/logging/bridge/pom.xml b/opendaylight/logging/bridge/pom.xml
index a6c4a7cd3ed1b0e598176c76d4d80a94f8140f88..664415e9b798364cfaab73cc3ac6d4ffa0707bac 100644 (file)
--- a/opendaylight/logging/bridge/pom.xml
+++ b/opendaylight/logging/bridge/pom.xml
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/md-sal/model/pom.xml b/opendaylight/md-sal/model/pom.xml
index 2874122ac1613d7734b7b71291dad7b6f24af924..f7d9241c93a0ae694946758d868bc5cedddab739 100644 (file)
--- a/opendaylight/md-sal/model/pom.xml
+++ b/opendaylight/md-sal/model/pom.xml
@@ -21,7 +21,7 @@
     <properties>
         <yang.version>0.5.7-SNAPSHOT</yang.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.bundle.version>2.4.0</maven.bundle.version>
+        <bundle.plugin.version>2.3.7</bundle.plugin.version>
     </properties>
 
     <modules>
@@ -37,7 +37,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>${maven.bundle.version}</version>
+                <version>${bundle.plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index bf1b95decf22abaf3620c6bff3be25b14037bfbb..33ec9999d680d8177a35cdce0a250358368a9f04 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -34,7 +34,7 @@
                <slf4j.version>1.7.2</slf4j.version>
                <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
                <yang.version>0.5.8-SNAPSHOT</yang.version>
-               <maven.bundle.version>2.4.0</maven.bundle.version>
+               <bundle.plugin.version>2.3.7</bundle.plugin.version>
         <releaseplugin.version>2.3.2</releaseplugin.version>
         <guava.version>14.0.1</guava.version>
         <osgi.core.version>5.0.0</osgi.core.version>
@@ -227,7 +227,7 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${maven.bundle.version}</version>
+                               <version>${bundle.plugin.version}</version>
                                <extensions>true</extensions>
                                <configuration>
                                        <instructions>

diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml
index 8e06c9d71e426589ddf78b6df93322b024275153..29ba03be625399c45d7af52ed631e31dfc9abc20 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/pom.xml
+++ b/opendaylight/md-sal/sal-binding-broker/pom.xml
@@ -19,6 +19,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>${bundle.plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>

diff --git a/opendaylight/northbound/bundlescanner/api/pom.xml b/opendaylight/northbound/bundlescanner/api/pom.xml
index 2c96ec215d6735d449deefe526cd1072015df9f0..685de7d46c5bce4ff20cfa9b7142b2296bb0f9fa 100644 (file)
--- a/opendaylight/northbound/bundlescanner/api/pom.xml
+++ b/opendaylight/northbound/bundlescanner/api/pom.xml
@@ -22,7 +22,7 @@
        <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/northbound/bundlescanner/implementation/pom.xml b/opendaylight/northbound/bundlescanner/implementation/pom.xml
index ceea28e9544a283b8cc7bd101ff8ed1c22b16682..78812d41d4a0a758d69e3c64098bb2d6e4e64f1c 100644 (file)
--- a/opendaylight/northbound/bundlescanner/implementation/pom.xml
+++ b/opendaylight/northbound/bundlescanner/implementation/pom.xml
@@ -22,7 +22,7 @@
        <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/northbound/commons/pom.xml b/opendaylight/northbound/commons/pom.xml
index ff40ba07ee14c4dc5daf6c8ecb8c4d952fa839f3..dda6a0f975714be2bb9d4a5aefc2582ecc63787a 100644 (file)
--- a/opendaylight/northbound/commons/pom.xml
+++ b/opendaylight/northbound/commons/pom.xml
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/northbound/containermanager/pom.xml b/opendaylight/northbound/containermanager/pom.xml
index 75341a6fdf6317390f80f757402a09c8b952f35d..685f3c173f947a010a159b51f3d51a5141b02355 100644 (file)
--- a/opendaylight/northbound/containermanager/pom.xml
+++ b/opendaylight/northbound/containermanager/pom.xml
@@ -23,7 +23,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/northbound/flowprogrammer/pom.xml b/opendaylight/northbound/flowprogrammer/pom.xml
index addf857aa10d5af113b3a41be643eebb92fa5784..bfd2eb62907988e6456c6ff1ccc81115b671e83f 100644 (file)
--- a/opendaylight/northbound/flowprogrammer/pom.xml
+++ b/opendaylight/northbound/flowprogrammer/pom.xml
@@ -33,7 +33,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/northbound/hosttracker/pom.xml b/opendaylight/northbound/hosttracker/pom.xml
index e0315fb1ee2bb743c7788a98795bca7102a8139b..53af293510b55c570f7bff28d75b04204c8dbbfc 100644 (file)
--- a/opendaylight/northbound/hosttracker/pom.xml
+++ b/opendaylight/northbound/hosttracker/pom.xml
@@ -33,7 +33,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml b/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml
index c1eb56aa29d1f14bdf003083b974229510f41633..e845daa9d3ed03c8a3008e41f9d04baef8c9a54c 100644 (file)
--- a/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml
+++ b/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml
@@ -33,7 +33,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/northbound/staticrouting/pom.xml b/opendaylight/northbound/staticrouting/pom.xml
index 1028ca59abbd045b61aeb768bcb6cb1b33496416..73d85b250b18ef6f3c2974c783dfb9de555e4c3e 100644 (file)
--- a/opendaylight/northbound/staticrouting/pom.xml
+++ b/opendaylight/northbound/staticrouting/pom.xml
@@ -33,7 +33,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/northbound/statistics/pom.xml b/opendaylight/northbound/statistics/pom.xml
index 74f64c2457189905db3cd215070f0cb032b39c9e..b2fd4222a8e32181516f718b6a763dbad2c25a08 100644 (file)
--- a/opendaylight/northbound/statistics/pom.xml
+++ b/opendaylight/northbound/statistics/pom.xml
@@ -33,7 +33,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/northbound/subnets/pom.xml b/opendaylight/northbound/subnets/pom.xml
index ba58e06ecbdc6f5841769e398b44fe1f103179c1..693f7eba7b22cc632db010113a26b0c8bd5efe5b 100644 (file)
--- a/opendaylight/northbound/subnets/pom.xml
+++ b/opendaylight/northbound/subnets/pom.xml
@@ -48,7 +48,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/northbound/switchmanager/pom.xml b/opendaylight/northbound/switchmanager/pom.xml
index 401cc948b888f5ab38ae99157cb141e551094b4c..8ca712fffc875dee7576128eecab295027b32685 100644 (file)
--- a/opendaylight/northbound/switchmanager/pom.xml
+++ b/opendaylight/northbound/switchmanager/pom.xml
@@ -34,7 +34,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/northbound/topology/pom.xml b/opendaylight/northbound/topology/pom.xml
index d379164a14f483ddf123224bad12cad9996fb345..d15e4e034be6633e70644ddb197944137cbb9b62 100644 (file)
--- a/opendaylight/northbound/topology/pom.xml
+++ b/opendaylight/northbound/topology/pom.xml
@@ -34,7 +34,7 @@
       <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
-          <version>2.3.6</version>
+          <version>${bundle.plugin.version}</version>
           <extensions>true</extensions>
           <configuration>
           <instructions>

diff --git a/opendaylight/northboundtest/unit_test_suite/pom.xml b/opendaylight/northboundtest/unit_test_suite/pom.xml
index ce22ddf517d23f1aa27122e2269d181a2f806e2f..a9990abd9738448b519ae3d2f372b87b5de9bbad 100644 (file)
--- a/opendaylight/northboundtest/unit_test_suite/pom.xml
+++ b/opendaylight/northboundtest/unit_test_suite/pom.xml
@@ -24,7 +24,7 @@
                         <plugin>
                                 <groupId>org.apache.felix</groupId>
                                 <artifactId>maven-bundle-plugin</artifactId>
-                                <version>2.3.6</version>
+                                <version>${bundle.plugin.version}</version>
                                 <extensions>true</extensions>
                                 <configuration>
                                         <instructions>

diff --git a/opendaylight/protocol_plugins/openflow/pom.xml b/opendaylight/protocol_plugins/openflow/pom.xml
index c93d4b61e760ff3871855306f7f43af35a026a72..a7f4db8460ab02124b4adaa990570f873e7d7e3b 100644 (file)
--- a/opendaylight/protocol_plugins/openflow/pom.xml
+++ b/opendaylight/protocol_plugins/openflow/pom.xml
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/protocol_plugins/stub/pom.xml b/opendaylight/protocol_plugins/stub/pom.xml
index 7f556598f1c7f25a292b74d3d05e01c8b9a04256..b17d63df3899fe8c8b0a4484b1ac27581e0b3edb 100644 (file)
--- a/opendaylight/protocol_plugins/stub/pom.xml
+++ b/opendaylight/protocol_plugins/stub/pom.xml
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/routing/dijkstra_implementation/pom.xml b/opendaylight/routing/dijkstra_implementation/pom.xml
index 37d3e2fb199a63bb20096661cd6384cf93ec2e95..77330fd7c80d1d3dd32a67e84f17cb104633e8f7 100644 (file)
--- a/opendaylight/routing/dijkstra_implementation/pom.xml
+++ b/opendaylight/routing/dijkstra_implementation/pom.xml
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/sal/api/pom.xml b/opendaylight/sal/api/pom.xml
index 32da9f3201cc6875f8b1a30bdf863c2edc8b168a..9b7e3dd71271d63ed5a5a5fbefe4d2a254c490fe 100644 (file)
--- a/opendaylight/sal/api/pom.xml
+++ b/opendaylight/sal/api/pom.xml
@@ -22,7 +22,7 @@
       <plugin>\r
         <groupId>org.apache.felix</groupId>\r
         <artifactId>maven-bundle-plugin</artifactId>\r
-        <version>2.3.6</version>\r
+        <version>${bundle.plugin.version}</version>\r
         <extensions>true</extensions>\r
         <configuration>\r
           <instructions>\r

diff --git a/opendaylight/sal/connection/api/pom.xml b/opendaylight/sal/connection/api/pom.xml
index c3f40aa42edbf3353615a121e9970d95633e4736..00fda77e69938fe82cc04820fecb74a4acef6426 100644 (file)
--- a/opendaylight/sal/connection/api/pom.xml
+++ b/opendaylight/sal/connection/api/pom.xml
@@ -22,7 +22,7 @@
       <plugin>\r
         <groupId>org.apache.felix</groupId>\r
         <artifactId>maven-bundle-plugin</artifactId>\r
-        <version>2.3.6</version>\r
+        <version>${bundle.plugin.version}</version>\r
         <extensions>true</extensions>\r
         <configuration>\r
           <instructions>\r

diff --git a/opendaylight/sal/connection/implementation/pom.xml b/opendaylight/sal/connection/implementation/pom.xml
index 44f793a09174cdf363fb84cf54268d7b806a6e0e..f2817ebd0bc70bdfa4aa4a41e66564973f01a541 100644 (file)
--- a/opendaylight/sal/connection/implementation/pom.xml
+++ b/opendaylight/sal/connection/implementation/pom.xml
@@ -22,7 +22,7 @@
       <plugin>\r
         <groupId>org.apache.felix</groupId>\r
         <artifactId>maven-bundle-plugin</artifactId>\r
-        <version>2.3.6</version>\r
+        <version>${bundle.plugin.version}</version>\r
         <extensions>true</extensions>\r
         <configuration>\r
           <instructions>\r

diff --git a/opendaylight/sal/implementation/pom.xml b/opendaylight/sal/implementation/pom.xml
index dddc3c3e58879bfd78ab79e31df354eb32ecf9fd..b44e85553d146339344b2b8d179e9ee03f7a9187 100644 (file)
--- a/opendaylight/sal/implementation/pom.xml
+++ b/opendaylight/sal/implementation/pom.xml
@@ -22,7 +22,7 @@
       <plugin>\r
         <groupId>org.apache.felix</groupId>\r
         <artifactId>maven-bundle-plugin</artifactId>\r
-        <version>2.3.6</version>\r
+        <version>${bundle.plugin.version}</version>\r
         <extensions>true</extensions>\r
         <configuration>\r
           <instructions>\r

diff --git a/opendaylight/sal/networkconfiguration/api/pom.xml b/opendaylight/sal/networkconfiguration/api/pom.xml
index 1f6f9cdf66b54fca94de07046e6da935ca18da8b..d11433894131d88fab96dd230675b208431e402c 100644 (file)
--- a/opendaylight/sal/networkconfiguration/api/pom.xml
+++ b/opendaylight/sal/networkconfiguration/api/pom.xml
@@ -22,7 +22,7 @@
       <plugin>\r
         <groupId>org.apache.felix</groupId>\r
         <artifactId>maven-bundle-plugin</artifactId>\r
-        <version>2.3.6</version>\r
+        <version>${bundle.plugin.version}</version>\r
         <extensions>true</extensions>\r
         <configuration>\r
           <instructions>\r

diff --git a/opendaylight/sal/networkconfiguration/implementation/pom.xml b/opendaylight/sal/networkconfiguration/implementation/pom.xml
index 48e0ff615c598ff109c2bc37833e48f1388f4f2b..190c74cb7846c3f95f9a99bbf5dc088c9cb0e1b8 100644 (file)
--- a/opendaylight/sal/networkconfiguration/implementation/pom.xml
+++ b/opendaylight/sal/networkconfiguration/implementation/pom.xml
@@ -22,7 +22,7 @@
       <plugin>\r
         <groupId>org.apache.felix</groupId>\r
         <artifactId>maven-bundle-plugin</artifactId>\r
-        <version>2.3.6</version>\r
+        <version>${bundle.plugin.version}</version>\r
         <extensions>true</extensions>\r
         <configuration>\r
           <instructions>\r

diff --git a/opendaylight/samples/loadbalancer/pom.xml b/opendaylight/samples/loadbalancer/pom.xml
index 81a078a35bc6b5d8cacc1deeb82b1fdc06ab1b72..c4d8686c65ef958e309fdeeb9c2e4082da633d91 100644 (file)
--- a/opendaylight/samples/loadbalancer/pom.xml
+++ b/opendaylight/samples/loadbalancer/pom.xml
@@ -24,7 +24,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/samples/northbound/loadbalancer/pom.xml b/opendaylight/samples/northbound/loadbalancer/pom.xml
index e001dc8e58765a619e1508c1dc30f5f4cf0362be..c24ba8a169726ae4e5d9238c41bb5b4d09464d5b 100644 (file)
--- a/opendaylight/samples/northbound/loadbalancer/pom.xml
+++ b/opendaylight/samples/northbound/loadbalancer/pom.xml
@@ -34,7 +34,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/samples/simpleforwarding/pom.xml b/opendaylight/samples/simpleforwarding/pom.xml
index 552ff883428f65a346bf04cab4d5e3a3674d83f5..87036cdbf37610922e529a6c109aa7ac8c203133 100644 (file)
--- a/opendaylight/samples/simpleforwarding/pom.xml
+++ b/opendaylight/samples/simpleforwarding/pom.xml
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/security/pom.xml b/opendaylight/security/pom.xml
index 3c2cb8ef6df0322c045d6213b9978be2c2033a5b..9c5b89b95ad421e51c8727086310c2386fecc7a9 100644 (file)
--- a/opendaylight/security/pom.xml
+++ b/opendaylight/security/pom.xml
@@ -23,7 +23,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/statisticsmanager/api/pom.xml b/opendaylight/statisticsmanager/api/pom.xml
index bddcc2ae0eff9a14d8a4999d30484c83b17dcfaf..b972f5d9a4d026eef6d2c7027e151bb59b2ffc27 100644 (file)
--- a/opendaylight/statisticsmanager/api/pom.xml
+++ b/opendaylight/statisticsmanager/api/pom.xml
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/statisticsmanager/implementation/pom.xml b/opendaylight/statisticsmanager/implementation/pom.xml
index d7dea84686eca42ecf15a91e19dd1d58542a6845..4d47312e023ec2e1ec39faea1e8aad611dd444c4 100644 (file)
--- a/opendaylight/statisticsmanager/implementation/pom.xml
+++ b/opendaylight/statisticsmanager/implementation/pom.xml
@@ -39,7 +39,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/switchmanager/api/pom.xml b/opendaylight/switchmanager/api/pom.xml
index 14a056d5fee3b50ba27f2fe240d378495dc7ad85..3c2be9002d2e6e1b0a96df14bf5aa70862788025 100644 (file)
--- a/opendaylight/switchmanager/api/pom.xml
+++ b/opendaylight/switchmanager/api/pom.xml
@@ -40,7 +40,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/switchmanager/implementation/pom.xml b/opendaylight/switchmanager/implementation/pom.xml
index ee126f3408ce51d6b1036f351f4ffb7a1be218b8..68dae260b042294e2289a55a498cae61419c0d06 100644 (file)
--- a/opendaylight/switchmanager/implementation/pom.xml
+++ b/opendaylight/switchmanager/implementation/pom.xml
@@ -40,7 +40,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/topologymanager/implementation/pom.xml b/opendaylight/topologymanager/implementation/pom.xml
index 399f878223aa639e5acd421ecb55b7134ab83d12..ebf9dbc10c6fa1bb8885f09d33ad592e351cb7cd 100755 (executable)
--- a/opendaylight/topologymanager/implementation/pom.xml
+++ b/opendaylight/topologymanager/implementation/pom.xml
@@ -23,7 +23,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/usermanager/api/pom.xml b/opendaylight/usermanager/api/pom.xml
index eb4bea584c5efa8d4737ca4b6b7b8de173aad25e..fbf374fa3da7781c3f28587a76e9748425d15667 100644 (file)
--- a/opendaylight/usermanager/api/pom.xml
+++ b/opendaylight/usermanager/api/pom.xml
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/usermanager/implementation/pom.xml b/opendaylight/usermanager/implementation/pom.xml
index 25e558eed962764acb357664ccaefd5cada33410..49a4e77d2da38c533cef11a0cea1e135ca45fdff 100644 (file)
--- a/opendaylight/usermanager/implementation/pom.xml
+++ b/opendaylight/usermanager/implementation/pom.xml
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/web/brandfragment/pom.xml b/opendaylight/web/brandfragment/pom.xml
index 5a1968d416b40a05f2a0be2ee4a7377e6b49ff53..541dbcadfd8644023b03055f3109220cf604ecd3 100644 (file)
--- a/opendaylight/web/brandfragment/pom.xml
+++ b/opendaylight/web/brandfragment/pom.xml
@@ -25,7 +25,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.3.6</version>
+                <version>${bundle.plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>

diff --git a/opendaylight/web/devices/pom.xml b/opendaylight/web/devices/pom.xml
index ac52095aea62f6f309c751ce4a642df272fa1f71..c0555d9d1d3280b1e1f0b512fd76d1948c7334cd 100644 (file)
--- a/opendaylight/web/devices/pom.xml
+++ b/opendaylight/web/devices/pom.xml
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/web/flows/pom.xml b/opendaylight/web/flows/pom.xml
index 0f1f0cf13503d0e3cf307dd9d2af223a6df6a81c..8dd5777350ee6e2be62eddfe417bf8b8f3d36ca4 100644 (file)
--- a/opendaylight/web/flows/pom.xml
+++ b/opendaylight/web/flows/pom.xml
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/web/root/pom.xml b/opendaylight/web/root/pom.xml
index 641f32f876375011b2a2f2b110e7d2d226c0f694..05a8f5b1d7651cd4b6c442cabead605853583bba 100644 (file)
--- a/opendaylight/web/root/pom.xml
+++ b/opendaylight/web/root/pom.xml
@@ -23,7 +23,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/web/topology/pom.xml b/opendaylight/web/topology/pom.xml
index c4c66e46d5af0bd9d0483807fa50e38339b5c4dd..7ad2df353a439205d502d9546c46d29f14cac837 100644 (file)
--- a/opendaylight/web/topology/pom.xml
+++ b/opendaylight/web/topology/pom.xml
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

diff --git a/opendaylight/web/troubleshoot/pom.xml b/opendaylight/web/troubleshoot/pom.xml
index 2be78c49a52a835cf6bd9b22e2bf447617a191f0..6b87e74c697c32761c026fa51c309e1f39136409 100644 (file)
--- a/opendaylight/web/troubleshoot/pom.xml
+++ b/opendaylight/web/troubleshoot/pom.xml
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>