API tools faq
paste
dfarrell07

0001-Remove-ODL4.2-downstream-patches-upgrading-to-5.1.patch

dfarrell07
Nov 3rd, 2016
100
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 58.46 KB | None | 0 0
raw download clone embed print report
  1. From e5af1ede7f1bfba9b009066ceda2bceb083ac913 Mon Sep 17 00:00:00 2001
  2. From: Daniel Farrell <dfarrell@redhat.com>
  3. Date: Thu, 3 Nov 2016 23:16:22 -0400
  4. Subject: [PATCH] Remove ODL4.2 downstream patches, upgrading to 5.1
  5.  
  6. Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
  7. ---
  8. ...E-Use-controller.mdsal.version-where-need.patch | 148 ------------
  9. ...2-DON-T-MERGE-Double-property-declaration.patch | 26 --
  10. ...N-T-MERGE-Use-native-leveldb-to-avoid-JNI.patch | 26 --
  11. ...-Overwrite-resource-on-copy-to-get-latest.patch | 28 ---
  12. ...T-MERGE-Don-t-use-variable-as-pom-version.patch | 263 ---------------------
  13. .../0002-DO-NOT-MERGE-Offline-DLUX-build.patch | 122 ----------
  14. ...-DO-NOT-MERGE-Don-t-use-hardcoded-version.patch | 40 ----
  15. ...DO-NOT-MERGE-Dont-use-variable-as-version.patch | 26 --
  16. .../0001-DON-T-MERGE-Karaf-POM-packaging.patch | 25 --
  17. ...E-Use-controller.mdsal.version-where-need.patch | 49 ----
  18. ...-MERGE-Change-license-version-to-property.patch | 43 ----
  19. ...DO-NOT-MERGE-Use-controller.mdsal.version.patch | 35 ---
  20. ...-DO-NOT-MERGE-Double-property-declaration.patch | 25 --
  21. ...E-Use-controller.mdsal.version-where-need.patch | 237 -------------------
  22. 14 files changed, 1093 deletions(-)
  23. delete mode 100644 org.opendaylight.controller-releasepom/0001-DO-NOT-MERGE-Use-controller.mdsal.version-where-need.patch
  24. delete mode 100644 org.opendaylight.controller-releasepom/0002-DON-T-MERGE-Double-property-declaration.patch
  25. delete mode 100644 org.opendaylight.controller-releasepom/0003-DON-T-MERGE-Use-native-leveldb-to-avoid-JNI.patch
  26. delete mode 100644 org.opendaylight.controller-releasepom/0004-DON-T-MERGE-Overwrite-resource-on-copy-to-get-latest.patch
  27. delete mode 100644 org.opendaylight.dlux-dlux-parent/0001-DO-NOT-MERGE-Don-t-use-variable-as-pom-version.patch
  28. delete mode 100644 org.opendaylight.dlux-dlux-parent/0002-DO-NOT-MERGE-Offline-DLUX-build.patch
  29. delete mode 100644 org.opendaylight.mdsal-mdsal-agreggator/0001-DO-NOT-MERGE-Don-t-use-hardcoded-version.patch
  30. delete mode 100644 org.opendaylight.netconf-netconf-parent/0001-DO-NOT-MERGE-Dont-use-variable-as-version.patch
  31. delete mode 100644 org.opendaylight.netvirt-netvirt/0001-DON-T-MERGE-Karaf-POM-packaging.patch
  32. delete mode 100644 org.opendaylight.neutron-project-neutron/0001-DO-NOT-MERGE-Use-controller.mdsal.version-where-need.patch
  33. delete mode 100644 org.opendaylight.odlparent-odlparent-aggregator/0001-DON-T-MERGE-Change-license-version-to-property.patch
  34. delete mode 100644 org.opendaylight.openflowjava-openflowjava-aggregator/0001-DO-NOT-MERGE-Use-controller.mdsal.version.patch
  35. delete mode 100644 org.opendaylight.openflowjava-openflowjava-aggregator/0002-DO-NOT-MERGE-Double-property-declaration.patch
  36. delete mode 100644 org.opendaylight.openflowplugin-openflowplugin-aggregator/0001-DO-NOT-MERGE-Use-controller.mdsal.version-where-need.patch
  37.  
  38. diff --git a/org.opendaylight.controller-releasepom/0001-DO-NOT-MERGE-Use-controller.mdsal.version-where-need.patch b/org.opendaylight.controller-releasepom/0001-DO-NOT-MERGE-Use-controller.mdsal.version-where-need.patch
  39. deleted file mode 100644
  40. index 048a858..0000000
  41. --- a/org.opendaylight.controller-releasepom/0001-DO-NOT-MERGE-Use-controller.mdsal.version-where-need.patch
  42. +++ /dev/null
  43. @@ -1,148 +0,0 @@
  44. -From a407595b36777ba85882f567230f187b5b1344f6 Mon Sep 17 00:00:00 2001
  45. -From: Mike Kolesnik <mkolesni@redhat.com>
  46. -Date: Thu, 18 Feb 2016 10:34:07 +0200
  47. -Subject: [PATCH 1/2] DO NOT MERGE: Use controller.mdsal.version where needed
  48. -
  49. -Change-Id: I63ef8f2981bb866aaf8dbb85ae656b5f57af241f
  50. -Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>
  51. ----
  52. - .../src/main/resources/archetype-resources/features/pom.xml | 4 ++--
  53. - opendaylight/commons/opendaylight/pom.xml | 4 ++--
  54. - opendaylight/config/config-parent/pom.xml | 4 ++--
  55. - opendaylight/md-sal/mdsal-it-parent/pom.xml | 4 ++--
  56. - opendaylight/md-sal/sal-binding-it/pom.xml | 2 +-
  57. - opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml | 6 +++---
  58. - 6 files changed, 12 insertions(+), 12 deletions(-)
  59. -
  60. -diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml
  61. -index 68c914f..9c1e31a 100644
  62. ---- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml
  63. -+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml
  64. -@@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
  65. - </prerequisites>
  66. - <properties>
  67. - <mdsal.model.version>0.8.2-Beryllium-SR2</mdsal.model.version>
  68. -- <mdsal.version>1.3.2-Beryllium-SR2</mdsal.version>
  69. -+ <controller.mdsal.version>1.3.2-Beryllium-SR2</controller.mdsal.version>
  70. - <restconf.version>1.3.2-Beryllium-SR2</restconf.version>
  71. - <yangtools.version>0.8.2-Beryllium-SR2</yangtools.version>
  72. - <dlux.version>0.3.2-Beryllium-SR2</dlux.version>
  73. -@@ -38,7 +38,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
  74. - <dependency>
  75. - <groupId>org.opendaylight.controller</groupId>
  76. - <artifactId>mdsal-artifacts</artifactId>
  77. -- <version>${mdsal.version}</version>
  78. -+ <version>${controller.mdsal.version}</version>
  79. - <type>pom</type>
  80. - <scope>import</scope>
  81. - </dependency>
  82. -diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
  83. -index b221fbc..10e845f 100644
  84. ---- a/opendaylight/commons/opendaylight/pom.xml
  85. -+++ b/opendaylight/commons/opendaylight/pom.xml
  86. -@@ -96,7 +96,7 @@
  87. - <lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
  88. - <logging.bridge.version>0.6.2-Beryllium-SR2</logging.bridge.version>
  89. - <maven.plugin.api.version>3.0.5</maven.plugin.api.version>
  90. -- <mdsal.version>1.3.2-Beryllium-SR2</mdsal.version>
  91. -+ <controller.mdsal.version>1.3.2-Beryllium-SR2</controller.mdsal.version>
  92. - <networkconfig.bridgedomain.northbound.version>0.2.2-Beryllium-SR2</networkconfig.bridgedomain.northbound.version>
  93. - <!-- ODL repository / plugin repository -->
  94. - <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
  95. -@@ -202,7 +202,7 @@
  96. - <dependency>
  97. - <groupId>org.opendaylight.controller</groupId>
  98. - <artifactId>mdsal-artifacts</artifactId>
  99. -- <version>${mdsal.version}</version>
  100. -+ <version>${controller.mdsal.version}</version>
  101. - <type>pom</type>
  102. - <scope>import</scope>
  103. - </dependency>
  104. -diff --git a/opendaylight/config/config-parent/pom.xml b/opendaylight/config/config-parent/pom.xml
  105. -index c25629f..8c06f6d 100644
  106. ---- a/opendaylight/config/config-parent/pom.xml
  107. -+++ b/opendaylight/config/config-parent/pom.xml
  108. -@@ -23,7 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
  109. -
  110. - <properties>
  111. - <config.version>0.4.2-Beryllium-SR2</config.version>
  112. -- <mdsal.version>1.3.2-Beryllium-SR2</mdsal.version>
  113. -+ <controller.mdsal.version>1.3.2-Beryllium-SR2</controller.mdsal.version>
  114. - <yangtools.version>0.8.2-Beryllium-SR2</yangtools.version>
  115. - <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
  116. - <config.file>src/main/config/default-config.xml</config.file>
  117. -@@ -42,7 +42,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
  118. - <dependency>
  119. - <groupId>org.opendaylight.controller</groupId>
  120. - <artifactId>mdsal-artifacts</artifactId>
  121. -- <version>${mdsal.version}</version>
  122. -+ <version>${controller.mdsal.version}</version>
  123. - <type>pom</type>
  124. - <scope>import</scope>
  125. - </dependency>
  126. -diff --git a/opendaylight/md-sal/mdsal-it-parent/pom.xml b/opendaylight/md-sal/mdsal-it-parent/pom.xml
  127. -index d80f71d..1b5cb68 100644
  128. ---- a/opendaylight/md-sal/mdsal-it-parent/pom.xml
  129. -+++ b/opendaylight/md-sal/mdsal-it-parent/pom.xml
  130. -@@ -30,7 +30,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
  131. - <dependency>
  132. - <groupId>org.opendaylight.controller</groupId>
  133. - <artifactId>mdsal-artifacts</artifactId>
  134. -- <version>${mdsal.version}</version>
  135. -+ <version>${controller.mdsal.version}</version>
  136. - <type>pom</type>
  137. - <scope>import</scope>
  138. - </dependency>
  139. -@@ -41,7 +41,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
  140. - <dependency>
  141. - <groupId>org.opendaylight.controller</groupId>
  142. - <artifactId>mdsal-it-base</artifactId>
  143. -- <version>${mdsal.version}</version>
  144. -+ <version>${controller.mdsal.version}</version>
  145. - </dependency>
  146. -
  147. - <!-- Dependencies for pax exam karaf container -->
  148. -diff --git a/opendaylight/md-sal/sal-binding-it/pom.xml b/opendaylight/md-sal/sal-binding-it/pom.xml
  149. -index 572329a..45d45d0 100644
  150. ---- a/opendaylight/md-sal/sal-binding-it/pom.xml
  151. -+++ b/opendaylight/md-sal/sal-binding-it/pom.xml
  152. -@@ -127,7 +127,7 @@
  153. - <dependency>
  154. - <groupId>org.opendaylight.controller</groupId>
  155. - <artifactId>sal-test-model</artifactId>
  156. -- <version>${mdsal.version}</version>
  157. -+ <version>${controller.mdsal.version}</version>
  158. - </dependency>
  159. - <dependency>
  160. - <groupId>org.opendaylight.mdsal.model</groupId>
  161. -diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml
  162. -index 3b0b6a6..41f3191 100644
  163. ---- a/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml
  164. -+++ b/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml
  165. -@@ -82,12 +82,12 @@
  166. - <dependency>
  167. - <groupId>org.opendaylight.controller</groupId>
  168. - <artifactId>sal-binding-config</artifactId>
  169. -- <version>${mdsal.version}</version>
  170. -+ <version>${controller.mdsal.version}</version>
  171. - </dependency>
  172. - <dependency>
  173. - <groupId>org.opendaylight.controller</groupId>
  174. - <artifactId>sal-binding-api</artifactId>
  175. -- <version>${mdsal.version}</version>
  176. -+ <version>${controller.mdsal.version}</version>
  177. - </dependency>
  178. - <dependency>
  179. - <groupId>org.opendaylight.controller</groupId>
  180. -@@ -96,7 +96,7 @@
  181. - <dependency>
  182. - <groupId>org.opendaylight.controller</groupId>
  183. - <artifactId>sal-common-util</artifactId>
  184. -- <version>${mdsal.version}</version>
  185. -+ <version>${controller.mdsal.version}</version>
  186. - </dependency>
  187. - <dependency>
  188. - <groupId>equinoxSDK381</groupId>
  189. ---
  190. -2.4.3
  191. -
  192. diff --git a/org.opendaylight.controller-releasepom/0002-DON-T-MERGE-Double-property-declaration.patch b/org.opendaylight.controller-releasepom/0002-DON-T-MERGE-Double-property-declaration.patch
  193. deleted file mode 100644
  194. index 757069f..0000000
  195. --- a/org.opendaylight.controller-releasepom/0002-DON-T-MERGE-Double-property-declaration.patch
  196. +++ /dev/null
  197. @@ -1,26 +0,0 @@
  198. -From e04b55114c0ab147972e2c06df36655138dd2a88 Mon Sep 17 00:00:00 2001
  199. -From: Mike Kolesnik <mkolesni@redhat.com>
  200. -Date: Sun, 24 Jul 2016 09:31:49 +0300
  201. -Subject: [PATCH 2/2] DON'T MERGE: Double property declaration
  202. -
  203. -Change-Id: I2b051fd86341a41016e330e389921e368a469b26
  204. -Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>
  205. ----
  206. - opendaylight/commons/opendaylight/pom.xml | 1 -
  207. - 1 file changed, 1 deletion(-)
  208. -
  209. -diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
  210. -index 10e845f..972e34a 100644
  211. ---- a/opendaylight/commons/opendaylight/pom.xml
  212. -+++ b/opendaylight/commons/opendaylight/pom.xml
  213. -@@ -39,7 +39,6 @@
  214. - <commons.opendaylight.concepts.version>0.7.2-Beryllium-SR2</commons.opendaylight.concepts.version>
  215. - <commons.opendaylight.version>1.6.2-Beryllium-SR2</commons.opendaylight.version>
  216. - <commons.parent.version>1.2.2-Beryllium-SR2</commons.parent.version>
  217. -- <commons.httpclient.version>0.3.2-Beryllium-SR2</commons.httpclient.version>
  218. - <concepts.version>0.7.2-Beryllium-SR2</concepts.version>
  219. - <config.version>0.4.2-Beryllium-SR2</config.version>
  220. - <aaa.version>0.3.2-Beryllium-SR2</aaa.version>
  221. ---
  222. -2.4.3
  223. -
  224. diff --git a/org.opendaylight.controller-releasepom/0003-DON-T-MERGE-Use-native-leveldb-to-avoid-JNI.patch b/org.opendaylight.controller-releasepom/0003-DON-T-MERGE-Use-native-leveldb-to-avoid-JNI.patch
  225. deleted file mode 100644
  226. index bdfe547..0000000
  227. --- a/org.opendaylight.controller-releasepom/0003-DON-T-MERGE-Use-native-leveldb-to-avoid-JNI.patch
  228. +++ /dev/null
  229. @@ -1,26 +0,0 @@
  230. -From 5f8db530455019f88ecff91a705922c8aec61e9a Mon Sep 17 00:00:00 2001
  231. -From: Mike Kolesnik <mkolesni@redhat.com>
  232. -Date: Thu, 6 Oct 2016 20:45:02 +0300
  233. -Subject: [PATCH 3/3] DON'T MERGE: Use native leveldb to avoid JNI
  234. -
  235. -Change-Id: I819780c85ba4035f155bcf506efa65c4b67dae76
  236. -Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>
  237. ----
  238. - .../md-sal/sal-clustering-config/src/main/resources/initial/akka.conf | 1 +
  239. - 1 file changed, 1 insertion(+)
  240. -
  241. -diff --git a/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/akka.conf b/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/akka.conf
  242. -index 8521712..998d6e5 100644
  243. ---- a/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/akka.conf
  244. -+++ b/opendaylight/md-sal/sal-clustering-config/src/main/resources/initial/akka.conf
  245. -@@ -31,6 +31,7 @@ odl-cluster-data {
  246. - # Note that the Java-only version is not currently considered by Akka to be production quality.
  247. -
  248. - # native = off
  249. -+ native = off
  250. - }
  251. - }
  252. - }
  253. ---
  254. -2.4.3
  255. -
  256. diff --git a/org.opendaylight.controller-releasepom/0004-DON-T-MERGE-Overwrite-resource-on-copy-to-get-latest.patch b/org.opendaylight.controller-releasepom/0004-DON-T-MERGE-Overwrite-resource-on-copy-to-get-latest.patch
  257. deleted file mode 100644
  258. index cc623be..0000000
  259. --- a/org.opendaylight.controller-releasepom/0004-DON-T-MERGE-Overwrite-resource-on-copy-to-get-latest.patch
  260. +++ /dev/null
  261. @@ -1,28 +0,0 @@
  262. -From ebb04878bdf603d3c4f51a26635fa87fdd43163c Mon Sep 17 00:00:00 2001
  263. -From: Mike Kolesnik <mkolesni@redhat.com>
  264. -Date: Thu, 6 Oct 2016 23:17:41 +0300
  265. -Subject: [PATCH 4/4] DON'T MERGE: Overwrite resource on copy to get latest
  266. - jline
  267. -
  268. -Change-Id: I40fc52fe770dafc5da2c36ed731e6d6ebc4c1476
  269. -Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>
  270. ----
  271. - karaf/karaf-parent/pom.xml | 2 +-
  272. - 1 file changed, 1 insertion(+), 1 deletion(-)
  273. -
  274. -diff --git a/karaf/karaf-parent/pom.xml b/karaf/karaf-parent/pom.xml
  275. -index 26f1f7d..f804788 100644
  276. ---- a/karaf/karaf-parent/pom.xml
  277. -+++ b/karaf/karaf-parent/pom.xml
  278. -@@ -318,7 +318,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
  279. - <configuration>
  280. - <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
  281. - <excludeArtifactIds>distribution.vtn-coordinator</excludeArtifactIds>
  282. -- <overWriteReleases>false</overWriteReleases>
  283. -+ <overWriteReleases>true</overWriteReleases>
  284. - <overWriteSnapshots>true</overWriteSnapshots>
  285. - <overWriteIfNewer>true</overWriteIfNewer>
  286. - <useRepositoryLayout>true</useRepositoryLayout>
  287. ---
  288. -2.4.3
  289. -
  290. diff --git a/org.opendaylight.dlux-dlux-parent/0001-DO-NOT-MERGE-Don-t-use-variable-as-pom-version.patch b/org.opendaylight.dlux-dlux-parent/0001-DO-NOT-MERGE-Don-t-use-variable-as-pom-version.patch
  291. deleted file mode 100644
  292. index 0608bcd..0000000
  293. --- a/org.opendaylight.dlux-dlux-parent/0001-DO-NOT-MERGE-Don-t-use-variable-as-pom-version.patch
  294. +++ /dev/null
  295. @@ -1,263 +0,0 @@
  296. -From 51f65509a9cd123c02badeb099801cb8d1990edc Mon Sep 17 00:00:00 2001
  297. -From: Mike Kolesnik <mkolesni@redhat.com>
  298. -Date: Sun, 13 Dec 2015 12:06:01 +0200
  299. -Subject: [PATCH 1/2] DO NOT MERGE: Don't use variable as pom version
  300. -
  301. -Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>
  302. ----
  303. - modules/common-authentication-resources/pom.xml | 2 +-
  304. - modules/common-general-resources/pom.xml | 2 +-
  305. - modules/common-layout-resources/pom.xml | 2 +-
  306. - modules/common-login-resources/pom.xml | 2 +-
  307. - modules/common-navigation-resources/pom.xml | 2 +-
  308. - modules/common-sigmatopology-resources/pom.xml | 2 +-
  309. - modules/common-topbar-resources/pom.xml | 2 +-
  310. - modules/common-yangutils-resources/pom.xml | 2 +-
  311. - modules/connection_manager-resources/pom.xml | 2 +-
  312. - modules/container-resources/pom.xml | 2 +-
  313. - modules/core-resources/pom.xml | 2 +-
  314. - modules/flow-resources/pom.xml | 2 +-
  315. - modules/loader-resources/pom.xml | 2 +-
  316. - modules/network-resources/pom.xml | 2 +-
  317. - modules/node-resources/pom.xml | 2 +-
  318. - modules/topology-resources/pom.xml | 2 +-
  319. - modules/yangui-resources/pom.xml | 2 +-
  320. - modules/yangvisualizer-resources/pom.xml | 2 +-
  321. - 18 files changed, 18 insertions(+), 18 deletions(-)
  322. -
  323. -diff --git a/modules/common-authentication-resources/pom.xml b/modules/common-authentication-resources/pom.xml
  324. -index 1067dbb..c5c77c4 100644
  325. ---- a/modules/common-authentication-resources/pom.xml
  326. -+++ b/modules/common-authentication-resources/pom.xml
  327. -@@ -19,7 +19,7 @@
  328. - <artifactId>dlux.common.authentication.resources</artifactId>
  329. - <name>${project.artifactId}</name>
  330. - <description>Common Authentication Module Resources</description>
  331. -- <version>${common.authentication.resources.version}</version>
  332. -+ <version>0.2.2.Beryllium-SR2</version>
  333. - <packaging>jar</packaging>
  334. -
  335. - </project>
  336. -diff --git a/modules/common-general-resources/pom.xml b/modules/common-general-resources/pom.xml
  337. -index 4cd1fec..68b0a66 100644
  338. ---- a/modules/common-general-resources/pom.xml
  339. -+++ b/modules/common-general-resources/pom.xml
  340. -@@ -19,7 +19,7 @@
  341. - <artifactId>dlux.common.general.resources</artifactId>
  342. - <name>${project.artifactId}</name>
  343. - <description>Common General Module Resources</description>
  344. -- <version>${common.general.resources.version}</version>
  345. -+ <version>0.2.2.Beryllium-SR2</version>
  346. - <packaging>jar</packaging>
  347. -
  348. - </project>
  349. -diff --git a/modules/common-layout-resources/pom.xml b/modules/common-layout-resources/pom.xml
  350. -index bd7db68..df3c8f3 100644
  351. ---- a/modules/common-layout-resources/pom.xml
  352. -+++ b/modules/common-layout-resources/pom.xml
  353. -@@ -19,7 +19,7 @@
  354. - <artifactId>dlux.common.layout.resources</artifactId>
  355. - <name>${project.artifactId}</name>
  356. - <description>Common Layout Module Resources</description>
  357. -- <version>${common.layout.resources.version}</version>
  358. -+ <version>0.2.2.Beryllium-SR2</version>
  359. - <packaging>jar</packaging>
  360. -
  361. - </project>
  362. -diff --git a/modules/common-login-resources/pom.xml b/modules/common-login-resources/pom.xml
  363. -index 505e681..2ab4408 100644
  364. ---- a/modules/common-login-resources/pom.xml
  365. -+++ b/modules/common-login-resources/pom.xml
  366. -@@ -19,7 +19,7 @@
  367. - <artifactId>dlux.common.login.resources</artifactId>
  368. - <name>${project.artifactId}</name>
  369. - <description>Common Login Module Resources</description>
  370. -- <version>${common.login.resources.version}</version>
  371. -+ <version>0.2.2.Beryllium-SR2</version>
  372. - <packaging>jar</packaging>
  373. -
  374. - </project>
  375. -diff --git a/modules/common-navigation-resources/pom.xml b/modules/common-navigation-resources/pom.xml
  376. -index 5448c0a..a98def7 100644
  377. ---- a/modules/common-navigation-resources/pom.xml
  378. -+++ b/modules/common-navigation-resources/pom.xml
  379. -@@ -19,7 +19,7 @@
  380. - <artifactId>dlux.common.navigation.resources</artifactId>
  381. - <name>${project.artifactId}</name>
  382. - <description>Common Navigation Module Resources</description>
  383. -- <version>${common.navigation.resources.version}</version>
  384. -+ <version>0.2.2.Beryllium-SR2</version>
  385. - <packaging>jar</packaging>
  386. -
  387. - </project>
  388. -diff --git a/modules/common-sigmatopology-resources/pom.xml b/modules/common-sigmatopology-resources/pom.xml
  389. -index 7270f28..d05e8a8 100644
  390. ---- a/modules/common-sigmatopology-resources/pom.xml
  391. -+++ b/modules/common-sigmatopology-resources/pom.xml
  392. -@@ -19,7 +19,7 @@
  393. - <artifactId>dlux.common.sigmatopology.resources</artifactId>
  394. - <name>${project.artifactId}</name>
  395. - <description>Sigma topology Module Resources</description>
  396. -- <version>${common.sigmatopology.resources.version}</version>
  397. -+ <version>0.2.2.Beryllium-SR2</version>
  398. - <packaging>jar</packaging>
  399. -
  400. - </project>
  401. -diff --git a/modules/common-topbar-resources/pom.xml b/modules/common-topbar-resources/pom.xml
  402. -index 219d626..a69f597 100644
  403. ---- a/modules/common-topbar-resources/pom.xml
  404. -+++ b/modules/common-topbar-resources/pom.xml
  405. -@@ -19,7 +19,7 @@
  406. - <artifactId>dlux.common.topbar.resources</artifactId>
  407. - <name>${project.artifactId}</name>
  408. - <description>Common Topbar Module Resources</description>
  409. -- <version>${common.topbar.resources.version}</version>
  410. -+ <version>0.2.2.Beryllium-SR2</version>
  411. - <packaging>jar</packaging>
  412. -
  413. - </project>
  414. -diff --git a/modules/common-yangutils-resources/pom.xml b/modules/common-yangutils-resources/pom.xml
  415. -index 7b1dc28..0aba8dd 100644
  416. ---- a/modules/common-yangutils-resources/pom.xml
  417. -+++ b/modules/common-yangutils-resources/pom.xml
  418. -@@ -19,7 +19,7 @@
  419. - <artifactId>dlux.common.yangutils.resources</artifactId>
  420. - <name>${project.artifactId}</name>
  421. - <description>Common Yangutils Module Resources</description>
  422. -- <version>${common.yangutils.resources.version}</version>
  423. -+ <version>0.2.2.Beryllium-SR2</version>
  424. - <packaging>jar</packaging>
  425. -
  426. - </project>
  427. -diff --git a/modules/connection_manager-resources/pom.xml b/modules/connection_manager-resources/pom.xml
  428. -index f5cc309..2d9ed40 100644
  429. ---- a/modules/connection_manager-resources/pom.xml
  430. -+++ b/modules/connection_manager-resources/pom.xml
  431. -@@ -19,7 +19,7 @@
  432. - <artifactId>dlux.connection_manager.resources</artifactId>
  433. - <name>${project.artifactId}</name>
  434. - <description>Connection manager Module Resources</description>
  435. -- <version>${connection_manager.resources.version}</version>
  436. -+ <version>0.2.2.Beryllium-SR2</version>
  437. - <packaging>jar</packaging>
  438. -
  439. - </project>
  440. -diff --git a/modules/container-resources/pom.xml b/modules/container-resources/pom.xml
  441. -index 9045a73..6c4336d 100644
  442. ---- a/modules/container-resources/pom.xml
  443. -+++ b/modules/container-resources/pom.xml
  444. -@@ -19,7 +19,7 @@
  445. - <artifactId>dlux.container.resources</artifactId>
  446. - <name>${project.artifactId}</name>
  447. - <description>Container Module Resources</description>
  448. -- <version>${container.resources.version}</version>
  449. -+ <version>0.2.2.Beryllium-SR2</version>
  450. - <packaging>jar</packaging>
  451. -
  452. - </project>
  453. -diff --git a/modules/core-resources/pom.xml b/modules/core-resources/pom.xml
  454. -index 847e18e..56004e2 100644
  455. ---- a/modules/core-resources/pom.xml
  456. -+++ b/modules/core-resources/pom.xml
  457. -@@ -19,7 +19,7 @@
  458. - <artifactId>dlux.core.resources</artifactId>
  459. - <name>${project.artifactId}</name>
  460. - <description>Core Module Resources</description>
  461. -- <version>${core.resources.version}</version>
  462. -+ <version>0.2.2.Beryllium-SR2</version>
  463. - <packaging>jar</packaging>
  464. -
  465. - </project>
  466. -diff --git a/modules/flow-resources/pom.xml b/modules/flow-resources/pom.xml
  467. -index 594b1a4..34fb864 100644
  468. ---- a/modules/flow-resources/pom.xml
  469. -+++ b/modules/flow-resources/pom.xml
  470. -@@ -19,7 +19,7 @@
  471. - <artifactId>dlux.flow.resources</artifactId>
  472. - <name>${project.artifactId}</name>
  473. - <description>Flow Module Resources</description>
  474. -- <version>${flow.resources.version}</version>
  475. -+ <version>0.2.2.Beryllium-SR2</version>
  476. - <packaging>jar</packaging>
  477. -
  478. - </project>
  479. -diff --git a/modules/loader-resources/pom.xml b/modules/loader-resources/pom.xml
  480. -index 5657884..747c6db 100644
  481. ---- a/modules/loader-resources/pom.xml
  482. -+++ b/modules/loader-resources/pom.xml
  483. -@@ -19,7 +19,7 @@
  484. - <artifactId>dlux.loader.resources</artifactId>
  485. - <name>${project.artifactId}</name>
  486. - <description>Loader Module Resources</description>
  487. -- <version>${loader.resources.version}</version>
  488. -+ <version>0.2.2.Beryllium-SR2</version>
  489. - <packaging>jar</packaging>
  490. -
  491. - </project>
  492. -diff --git a/modules/network-resources/pom.xml b/modules/network-resources/pom.xml
  493. -index 9948c07..13d6964 100644
  494. ---- a/modules/network-resources/pom.xml
  495. -+++ b/modules/network-resources/pom.xml
  496. -@@ -19,7 +19,7 @@
  497. - <artifactId>dlux.network.resources</artifactId>
  498. - <name>${project.artifactId}</name>
  499. - <description>Network Module Resources</description>
  500. -- <version>${network.resources.version}</version>
  501. -+ <version>0.2.2.Beryllium-SR2</version>
  502. - <packaging>jar</packaging>
  503. -
  504. - </project>
  505. -diff --git a/modules/node-resources/pom.xml b/modules/node-resources/pom.xml
  506. -index 255079f..0e1ceed 100644
  507. ---- a/modules/node-resources/pom.xml
  508. -+++ b/modules/node-resources/pom.xml
  509. -@@ -19,7 +19,7 @@
  510. - <artifactId>dlux.node.resources</artifactId>
  511. - <name>${project.artifactId}</name>
  512. - <description>Node Module Resources</description>
  513. -- <version>${node.resources.version}</version>
  514. -+ <version>0.2.2.Beryllium-SR2</version>
  515. - <packaging>jar</packaging>
  516. -
  517. - </project>
  518. -diff --git a/modules/topology-resources/pom.xml b/modules/topology-resources/pom.xml
  519. -index f61f4b1..39b8249 100644
  520. ---- a/modules/topology-resources/pom.xml
  521. -+++ b/modules/topology-resources/pom.xml
  522. -@@ -19,6 +19,6 @@
  523. - <artifactId>dlux.topology.resources</artifactId>
  524. - <name>${project.artifactId}</name>
  525. - <description>Topology Module Resources</description>
  526. -- <version>${topology.resources.version}</version>
  527. -+ <version>0.2.2.Beryllium-SR2</version>
  528. - <packaging>jar</packaging>
  529. - </project>
  530. -diff --git a/modules/yangui-resources/pom.xml b/modules/yangui-resources/pom.xml
  531. -index d9b3392..61390a2 100644
  532. ---- a/modules/yangui-resources/pom.xml
  533. -+++ b/modules/yangui-resources/pom.xml
  534. -@@ -19,7 +19,7 @@
  535. - <artifactId>dlux.yangui.resources</artifactId>
  536. - <name>${project.artifactId}</name>
  537. - <description>Yangui Module Resources</description>
  538. -- <version>${yangui.resources.version}</version>
  539. -+ <version>0.2.2.Beryllium-SR2</version>
  540. - <packaging>jar</packaging>
  541. -
  542. - </project>
  543. -diff --git a/modules/yangvisualizer-resources/pom.xml b/modules/yangvisualizer-resources/pom.xml
  544. -index 6491cb9..f0c6563 100644
  545. ---- a/modules/yangvisualizer-resources/pom.xml
  546. -+++ b/modules/yangvisualizer-resources/pom.xml
  547. -@@ -19,7 +19,7 @@
  548. - <artifactId>dlux.yangvisualizer.resources</artifactId>
  549. - <name>${project.artifactId}</name>
  550. - <description>Yang Visualizer Module Resources</description>
  551. -- <version>${yangvisualizer.resources.version}</version>
  552. -+ <version>0.2.2.Beryllium-SR2</version>
  553. - <packaging>jar</packaging>
  554. -
  555. - </project>
  556. ---
  557. -2.1.0
  558. -
  559. diff --git a/org.opendaylight.dlux-dlux-parent/0002-DO-NOT-MERGE-Offline-DLUX-build.patch b/org.opendaylight.dlux-dlux-parent/0002-DO-NOT-MERGE-Offline-DLUX-build.patch
  560. deleted file mode 100644
  561. index 620ffc7..0000000
  562. --- a/org.opendaylight.dlux-dlux-parent/0002-DO-NOT-MERGE-Offline-DLUX-build.patch
  563. +++ /dev/null
  564. @@ -1,122 +0,0 @@
  565. -From 48f0c9d8f1c6337a91136e1b0346a5645d41c1f9 Mon Sep 17 00:00:00 2001
  566. -From: Mike Kolesnik <mkolesni@redhat.com>
  567. -Date: Thu, 25 Feb 2016 02:36:45 -0500
  568. -Subject: [PATCH 2/2] DO NOT MERGE: Offline DLUX build
  569. -
  570. -Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>
  571. ----
  572. - dlux-web/bower.json | 1 -
  573. - dlux-web/pom.xml | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++
  574. - 2 files changed, 64 insertions(+), 1 deletion(-)
  575. -
  576. -diff --git a/dlux-web/bower.json b/dlux-web/bower.json
  577. -index d770882..37ca975 100644
  578. ---- a/dlux-web/bower.json
  579. -+++ b/dlux-web/bower.json
  580. -@@ -21,7 +21,6 @@
  581. - "angular-ui-select2": "https://raw.github.com/angular-ui/ui-select2/master/src/select2.js",
  582. - "underscore": "latest",
  583. - "underscore.string": "latest",
  584. -- "select2": "master",
  585. - "select2-bootstrap-css": "https://github.com/fk/select2-bootstrap-css/archive/master.zip",
  586. - "footable": "2.0.1",
  587. - "angular-translate": "2.2.0",
  588. -diff --git a/dlux-web/pom.xml b/dlux-web/pom.xml
  589. -index 1d486ca..c4f89b6 100644
  590. ---- a/dlux-web/pom.xml
  591. -+++ b/dlux-web/pom.xml
  592. -@@ -104,6 +104,63 @@
  593. - </resource>
  594. - </resources>
  595. - <plugins>
  596. -+
  597. -+ <!-- Download resources for offline build-->
  598. -+ <plugin>
  599. -+ <groupId>com.googlecode.maven-download-plugin</groupId>
  600. -+ <artifactId>download-maven-plugin</artifactId>
  601. -+ <version>1.2.1</version>
  602. -+ <executions>
  603. -+ <execution>
  604. -+ <id>npm-tar-download</id>
  605. -+ <phase>generate-resources</phase>
  606. -+ <goals>
  607. -+ <goal>wget</goal>
  608. -+ </goals>
  609. -+ <configuration>
  610. -+ <url>http://git.engineering.redhat.com/git/users/mkolesni/opendaylight.git/plain/npm-3.1.3.tgz</url>
  611. -+ <outputDirectory>${project.build.directory}/frontend.binaries/</outputDirectory>
  612. -+ </configuration>
  613. -+ </execution>
  614. -+ <execution>
  615. -+ <id>node-tar-download</id>
  616. -+ <phase>generate-resources</phase>
  617. -+ <goals>
  618. -+ <goal>wget</goal>
  619. -+ </goals>
  620. -+ <configuration>
  621. -+ <url>http://git.engineering.redhat.com/git/users/mkolesni/opendaylight.git/plain/node-v0.12.7-linux-x64.tar.gz</url>
  622. -+ <outputDirectory>${project.build.directory}/frontend.binaries/v0.12.7/</outputDirectory>
  623. -+ </configuration>
  624. -+ </execution>
  625. -+ <execution>
  626. -+ <id>npm-cache-download</id>
  627. -+ <phase>generate-resources</phase>
  628. -+ <goals>
  629. -+ <goal>wget</goal>
  630. -+ </goals>
  631. -+ <configuration>
  632. -+ <url>http://git.engineering.redhat.com/git/users/mkolesni/opendaylight.git/plain/npm.cache.be.zip</url>
  633. -+ <unpack>true</unpack>
  634. -+ <outputDirectory>${project.build.directory}/npm.cache</outputDirectory>
  635. -+ </configuration>
  636. -+ </execution>
  637. -+ <execution>
  638. -+ <id>bower-cache-download</id>
  639. -+ <phase>generate-resources</phase>
  640. -+ <goals>
  641. -+ <goal>wget</goal>
  642. -+ </goals>
  643. -+ <configuration>
  644. -+ <url>http://git.engineering.redhat.com/git/users/mkolesni/opendaylight.git/plain/bower.cache.be.zip</url>
  645. -+ <unpack>true</unpack>
  646. -+ <outputDirectory>${project.build.directory}/bower.cache</outputDirectory>
  647. -+ </configuration>
  648. -+ </execution>
  649. -+ </executions>
  650. -+ </plugin>
  651. -+
  652. -+
  653. - <!--Clean extracted resources-->
  654. - <plugin>
  655. - <artifactId>maven-clean-plugin</artifactId>
  656. -@@ -222,6 +279,9 @@
  657. - <goal>install-node-and-npm</goal>
  658. - <goal>npm</goal>
  659. - </goals>
  660. -+ <configuration>
  661. -+ <arguments>install --cache ${project.build.directory}/npm.cache --cache-min Infinity</arguments>
  662. -+ </configuration>
  663. - <phase>generate-resources</phase>
  664. - </execution>
  665. - <execution>
  666. -@@ -229,6 +289,9 @@
  667. - <goals>
  668. - <goal>bower</goal>
  669. - </goals>
  670. -+ <configuration>
  671. -+ <arguments>install --allow-root --offline --config.storage.packages=${project.build.directory}/bower.cache/packages --config.storage.registry=${project.build.directory}/bower.cache/registry</arguments>
  672. -+ </configuration>
  673. - </execution>
  674. - <execution>
  675. - <id>grunt</id>
  676. -@@ -240,6 +303,7 @@
  677. - <configuration>
  678. - <nodeVersion>v0.12.7</nodeVersion>
  679. - <npmVersion>3.1.3</npmVersion>
  680. -+ <downloadRoot>file://${project.build.directory}/frontend.binaries/</downloadRoot>
  681. - </configuration>
  682. - </plugin>
  683. - </plugins>
  684. ---
  685. -2.1.0
  686. -
  687. diff --git a/org.opendaylight.mdsal-mdsal-agreggator/0001-DO-NOT-MERGE-Don-t-use-hardcoded-version.patch b/org.opendaylight.mdsal-mdsal-agreggator/0001-DO-NOT-MERGE-Don-t-use-hardcoded-version.patch
  688. deleted file mode 100644
  689. index cec24da..0000000
  690. --- a/org.opendaylight.mdsal-mdsal-agreggator/0001-DO-NOT-MERGE-Don-t-use-hardcoded-version.patch
  691. +++ /dev/null
  692. @@ -1,40 +0,0 @@
  693. -From 7a162c66c7d83f3e07285fac46cda14c2f56dab7 Mon Sep 17 00:00:00 2001
  694. -From: Mike Kolesnik <mkolesni@redhat.com>
  695. -Date: Tue, 16 Feb 2016 13:47:00 +0200
  696. -Subject: [PATCH] DO NOT MERGE: Don't use hardcoded version
  697. -
  698. -Change-Id: Ic6e1151cba81ba1e2126437541261a63c3f08d32
  699. ----
  700. - binding/binding-parent/pom.xml | 2 +-
  701. - pom.xml | 2 +-
  702. - 2 files changed, 2 insertions(+), 2 deletions(-)
  703. -
  704. -diff --git a/binding/binding-parent/pom.xml b/binding/binding-parent/pom.xml
  705. -index 3f0b739..1929673 100644
  706. ---- a/binding/binding-parent/pom.xml
  707. -+++ b/binding/binding-parent/pom.xml
  708. -@@ -79,7 +79,7 @@
  709. - <dependency>
  710. - <groupId>org.opendaylight.mdsal</groupId>
  711. - <artifactId>maven-sal-api-gen-plugin</artifactId>
  712. -- <version>0.8.2-Beryllium-SR2</version>
  713. -+ <version>${yangtools.version}</version>
  714. - <type>jar</type>
  715. - </dependency>
  716. - </dependencies>
  717. -diff --git a/pom.xml b/pom.xml
  718. -index bcfbb45..984793f 100644
  719. ---- a/pom.xml
  720. -+++ b/pom.xml
  721. -@@ -55,7 +55,7 @@
  722. - <dependency>
  723. - <groupId>org.opendaylight.yangtools</groupId>
  724. - <artifactId>checkstyle-logging</artifactId>
  725. -- <version>0.8.2-Beryllium-SR2</version>
  726. -+ <version>${yangtools.version}</version>
  727. - </dependency>
  728. - </dependencies>
  729. - <executions>
  730. ---
  731. -2.4.3
  732. -
  733. diff --git a/org.opendaylight.netconf-netconf-parent/0001-DO-NOT-MERGE-Dont-use-variable-as-version.patch b/org.opendaylight.netconf-netconf-parent/0001-DO-NOT-MERGE-Dont-use-variable-as-version.patch
  734. deleted file mode 100644
  735. index a92c8e5..0000000
  736. --- a/org.opendaylight.netconf-netconf-parent/0001-DO-NOT-MERGE-Dont-use-variable-as-version.patch
  737. +++ /dev/null
  738. @@ -1,26 +0,0 @@
  739. -From b49a40421a1f14ec074e96982da7084c6d4a705c Mon Sep 17 00:00:00 2001
  740. -From: Mike Kolesnik <mkolesni@redhat.com>
  741. -Date: Tue, 23 Feb 2016 12:11:43 +0200
  742. -Subject: [PATCH] DO NOT MERGE: Dont use variable as version
  743. -
  744. -Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>
  745. ----
  746. - opendaylight/netconf/sal-netconf-connector/pom.xml | 2 +-
  747. - 1 file changed, 1 insertion(+), 1 deletion(-)
  748. -
  749. -diff --git a/opendaylight/netconf/sal-netconf-connector/pom.xml b/opendaylight/netconf/sal-netconf-connector/pom.xml
  750. -index 744af8d..d5b84c5 100644
  751. ---- a/opendaylight/netconf/sal-netconf-connector/pom.xml
  752. -+++ b/opendaylight/netconf/sal-netconf-connector/pom.xml
  753. -@@ -12,7 +12,7 @@
  754. - <packaging>bundle</packaging>
  755. -
  756. - <!-- Preserve version from mdsal -->
  757. -- <version>${controller.mdsal.version}</version>
  758. -+ <version>1.3.2-Beryllium-SR2</version>
  759. -
  760. - <dependencies>
  761. - <dependency>
  762. ---
  763. -2.4.3
  764. -
  765. diff --git a/org.opendaylight.netvirt-netvirt/0001-DON-T-MERGE-Karaf-POM-packaging.patch b/org.opendaylight.netvirt-netvirt/0001-DON-T-MERGE-Karaf-POM-packaging.patch
  766. deleted file mode 100644
  767. index 6bef8f5..0000000
  768. --- a/org.opendaylight.netvirt-netvirt/0001-DON-T-MERGE-Karaf-POM-packaging.patch
  769. +++ /dev/null
  770. @@ -1,25 +0,0 @@
  771. -From 3080da1036d5585b2d33f26b7c38074236d2ce6e Mon Sep 17 00:00:00 2001
  772. -From: Mike Kolesnik <mkolesni@redhat.com>
  773. -Date: Sun, 31 Jul 2016 15:45:22 +0300
  774. -Subject: [PATCH] DON'T MERGE: Karaf POM packaging
  775. -
  776. -Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>
  777. ----
  778. - karaf/pom.xml | 1 +
  779. - 1 file changed, 1 insertion(+)
  780. -
  781. -diff --git a/karaf/pom.xml b/karaf/pom.xml
  782. -index 33fb4fe..94c5113 100644
  783. ---- a/karaf/pom.xml
  784. -+++ b/karaf/pom.xml
  785. -@@ -21,6 +21,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
  786. - <artifactId>karaf</artifactId>
  787. - <version>1.2.3-Beryllium-SR2</version>
  788. - <name>${project.artifactId}</name>
  789. -+ <packaging>pom</packaging>
  790. - <prerequisites>
  791. - <maven>3.1.1</maven>
  792. - </prerequisites>
  793. ---
  794. -2.4.3
  795. -
  796. diff --git a/org.opendaylight.neutron-project-neutron/0001-DO-NOT-MERGE-Use-controller.mdsal.version-where-need.patch b/org.opendaylight.neutron-project-neutron/0001-DO-NOT-MERGE-Use-controller.mdsal.version-where-need.patch
  797. deleted file mode 100644
  798. index 0977917..0000000
  799. --- a/org.opendaylight.neutron-project-neutron/0001-DO-NOT-MERGE-Use-controller.mdsal.version-where-need.patch
  800. +++ /dev/null
  801. @@ -1,49 +0,0 @@
  802. -From 8a5906d6772440eb12716eae1faf1bdfb2697b3f Mon Sep 17 00:00:00 2001
  803. -From: Mike Kolesnik <mkolesni@redhat.com>
  804. -Date: Mon, 29 Feb 2016 10:01:42 +0200
  805. -Subject: [PATCH] DO NOT MERGE: Use controller.mdsal.version where needed
  806. -
  807. -Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>
  808. ----
  809. - features/production/pom.xml | 4 ++--
  810. - features/production/src/main/features/features.xml | 2 +-
  811. - 2 files changed, 3 insertions(+), 3 deletions(-)
  812. -
  813. -diff --git a/features/production/pom.xml b/features/production/pom.xml
  814. -index e58c7ae..8ce96d2 100644
  815. ---- a/features/production/pom.xml
  816. -+++ b/features/production/pom.xml
  817. -@@ -14,7 +14,7 @@
  818. - <properties>
  819. - <aaa.version>0.3.2-Beryllium-SR2</aaa.version>
  820. - <yangtools.version>0.8.2-Beryllium-SR2</yangtools.version>
  821. -- <mdsal.version>1.3.2-Beryllium-SR2</mdsal.version>
  822. -+ <controller.mdsal.version>1.3.2-Beryllium-SR2</controller.mdsal.version>
  823. - <restconf.version>1.3.2-Beryllium-SR2</restconf.version>
  824. - </properties>
  825. - <dependencyManagement>
  826. -@@ -30,7 +30,7 @@
  827. - <dependency>
  828. - <groupId>org.opendaylight.controller</groupId>
  829. - <artifactId>mdsal-artifacts</artifactId>
  830. -- <version>${mdsal.version}</version>
  831. -+ <version>${controller.mdsal.version}</version>
  832. - <type>pom</type>
  833. - <scope>import</scope>
  834. - </dependency>
  835. -diff --git a/features/production/src/main/features/features.xml b/features/production/src/main/features/features.xml
  836. -index ff91b74..8d2355d 100644
  837. ---- a/features/production/src/main/features/features.xml
  838. -+++ b/features/production/src/main/features/features.xml
  839. -@@ -37,7 +37,7 @@
  840. - <feature name='odl-neutron-transcriber' version='${project.version}' description="OpenDaylight :: Neutron :: Implementation">
  841. - <feature version='${project.version}'>odl-neutron-spi</feature>
  842. - <feature>war</feature>
  843. -- <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
  844. -+ <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
  845. - <bundle>mvn:org.opendaylight.neutron/transcriber/{{VERSION}}</bundle>
  846. - <bundle>mvn:org.opendaylight.neutron/model/{{VERSION}}</bundle>
  847. - <bundle>mvn:org.osgi/org.osgi.core/{{VERSION}}</bundle>
  848. ---
  849. -2.4.3
  850. -
  851. diff --git a/org.opendaylight.odlparent-odlparent-aggregator/0001-DON-T-MERGE-Change-license-version-to-property.patch b/org.opendaylight.odlparent-odlparent-aggregator/0001-DON-T-MERGE-Change-license-version-to-property.patch
  852. deleted file mode 100644
  853. index d52b91a..0000000
  854. --- a/org.opendaylight.odlparent-odlparent-aggregator/0001-DON-T-MERGE-Change-license-version-to-property.patch
  855. +++ /dev/null
  856. @@ -1,43 +0,0 @@
  857. -From 53aa87fbc75bdeab051bff1c61a265504bfced2b Mon Sep 17 00:00:00 2001
  858. -From: Mike Kolesnik <mkolesni@redhat.com>
  859. -Date: Thu, 23 Jun 2016 09:39:58 +0300
  860. -Subject: [PATCH] [DON'T MERGE] Change license version to property
  861. -
  862. -Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>
  863. ----
  864. - odlparent/pom.xml | 5 +++--
  865. - 1 file changed, 3 insertions(+), 2 deletions(-)
  866. -
  867. -diff --git a/odlparent/pom.xml b/odlparent/pom.xml
  868. -index 6b89f67..7e80842 100644
  869. ---- a/odlparent/pom.xml
  870. -+++ b/odlparent/pom.xml
  871. -@@ -52,6 +52,7 @@
  872. - <maven.compiler.target>1.7</maven.compiler.target>
  873. - <java.version.source>${maven.compiler.source}</java.version.source>
  874. - <java.version.target>${maven.compiler.target}</java.version.target>
  875. -+ <odl-license.version>0.0.3-Beryllium-SR2</odl-license.version>
  876. -
  877. - <!-- Maven plugin versions, in the 'canonical' format -->
  878. - <maven.antrun.plugin.version>1.8</maven.antrun.plugin.version>
  879. -@@ -971,7 +972,7 @@
  880. - <dependency>
  881. - <groupId>org.opendaylight.odlparent</groupId>
  882. - <artifactId>odl-license</artifactId>
  883. -- <version>0.0.3-Beryllium-SR2</version>
  884. -+ <version>${odl-license.version}</version>
  885. - </dependency>
  886. - </dependencies>
  887. - <configuration>
  888. -@@ -1085,7 +1086,7 @@
  889. - <artifactItem>
  890. - <groupId>org.opendaylight.odlparent</groupId>
  891. - <artifactId>odl-license</artifactId>
  892. -- <version>0.0.3-Beryllium-SR2</version>
  893. -+ <version>${odl-license.version}</version>
  894. - </artifactItem>
  895. - </artifactItems>
  896. - <outputDirectory>${project.build.outputDirectory}</outputDirectory>
  897. ---
  898. -2.4.3
  899. -
  900. diff --git a/org.opendaylight.openflowjava-openflowjava-aggregator/0001-DO-NOT-MERGE-Use-controller.mdsal.version.patch b/org.opendaylight.openflowjava-openflowjava-aggregator/0001-DO-NOT-MERGE-Use-controller.mdsal.version.patch
  901. deleted file mode 100644
  902. index ebfb320..0000000
  903. --- a/org.opendaylight.openflowjava-openflowjava-aggregator/0001-DO-NOT-MERGE-Use-controller.mdsal.version.patch
  904. +++ /dev/null
  905. @@ -1,35 +0,0 @@
  906. -From ab94e31b32056cf39094a799e3524fa63b9f5313 Mon Sep 17 00:00:00 2001
  907. -From: Mike Kolesnik <mkolesni@redhat.com>
  908. -Date: Sun, 21 Feb 2016 15:46:43 +0200
  909. -Subject: [PATCH 1/2] DO NOT MERGE: Use controller.mdsal.version
  910. -
  911. -Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>
  912. ----
  913. - parent/pom.xml | 4 ++--
  914. - 1 file changed, 2 insertions(+), 2 deletions(-)
  915. -
  916. -diff --git a/parent/pom.xml b/parent/pom.xml
  917. -index 301dc0f..c49d61c 100644
  918. ---- a/parent/pom.xml
  919. -+++ b/parent/pom.xml
  920. -@@ -56,7 +56,7 @@
  921. - <salGeneratorPath>${project.build.directory}/yang-gen-sal</salGeneratorPath>
  922. -
  923. - <config.version>0.4.2-Beryllium-SR2</config.version>
  924. -- <mdsal.version>1.3.2-Beryllium-SR2</mdsal.version>
  925. -+ <controller.mdsal.version>1.3.2-Beryllium-SR2</controller.mdsal.version>
  926. - <yangtools.version>0.8.2-Beryllium-SR2</yangtools.version>
  927. - </properties>
  928. -
  929. -@@ -86,7 +86,7 @@
  930. - <dependency>
  931. - <groupId>org.opendaylight.controller</groupId>
  932. - <artifactId>mdsal-artifacts</artifactId>
  933. -- <version>${mdsal.version}</version>
  934. -+ <version>${controller.mdsal.version}</version>
  935. - <scope>import</scope>
  936. - <type>pom</type>
  937. - </dependency>
  938. ---
  939. -2.4.3
  940. -
  941. diff --git a/org.opendaylight.openflowjava-openflowjava-aggregator/0002-DO-NOT-MERGE-Double-property-declaration.patch b/org.opendaylight.openflowjava-openflowjava-aggregator/0002-DO-NOT-MERGE-Double-property-declaration.patch
  942. deleted file mode 100644
  943. index 0b41dc8..0000000
  944. --- a/org.opendaylight.openflowjava-openflowjava-aggregator/0002-DO-NOT-MERGE-Double-property-declaration.patch
  945. +++ /dev/null
  946. @@ -1,25 +0,0 @@
  947. -From 67bece7fbbf8fd9547cee3d1dd438e7da0809a3b Mon Sep 17 00:00:00 2001
  948. -From: Mike Kolesnik <mkolesni@redhat.com>
  949. -Date: Mon, 22 Feb 2016 11:14:56 +0200
  950. -Subject: [PATCH 2/2] DO NOT MERGE: Double property declaration
  951. -
  952. -Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>
  953. ----
  954. - features/pom.xml | 1 -
  955. - 1 file changed, 1 deletion(-)
  956. -
  957. -diff --git a/features/pom.xml b/features/pom.xml
  958. -index 73b2b90..e706a38 100644
  959. ---- a/features/pom.xml
  960. -+++ b/features/pom.xml
  961. -@@ -17,7 +17,6 @@
  962. - <config.version>0.4.2-Beryllium-SR2</config.version>
  963. - <controller.mdsal.version>1.3.2-Beryllium-SR2</controller.mdsal.version>
  964. - <mdsal.version>2.0.2-Beryllium-SR2</mdsal.version>
  965. -- <controller.mdsal.version>1.3.2-Beryllium-SR2</controller.mdsal.version>
  966. - <mdsal.model.version>0.8.2-Beryllium-SR2</mdsal.model.version>
  967. - </properties>
  968. -
  969. ---
  970. -2.4.3
  971. -
  972. diff --git a/org.opendaylight.openflowplugin-openflowplugin-aggregator/0001-DO-NOT-MERGE-Use-controller.mdsal.version-where-need.patch b/org.opendaylight.openflowplugin-openflowplugin-aggregator/0001-DO-NOT-MERGE-Use-controller.mdsal.version-where-need.patch
  973. deleted file mode 100644
  974. index 9b21f51..0000000
  975. --- a/org.opendaylight.openflowplugin-openflowplugin-aggregator/0001-DO-NOT-MERGE-Use-controller.mdsal.version-where-need.patch
  976. +++ /dev/null
  977. @@ -1,237 +0,0 @@
  978. -From 6aa99e419a97f74fab801d7b3d0adbb9ceb21add Mon Sep 17 00:00:00 2001
  979. -From: Mike Kolesnik <mkolesni@redhat.com>
  980. -Date: Mon, 29 Feb 2016 12:21:41 +0200
  981. -Subject: [PATCH] DO NOT MERGE: Use controller.mdsal.version where needed
  982. -
  983. -Signed-off-by: Mike Kolesnik <mkolesni@redhat.com>
  984. ----
  985. - applications/features/pom.xml | 4 ++--
  986. - applications/features/src/main/features/features.xml | 6 +++---
  987. - applications/statistics-manager/pom.xml | 2 +-
  988. - distribution/karaf/pom.xml | 2 +-
  989. - features-li/pom.xml | 4 ++--
  990. - features-li/src/main/features/features.xml | 8 ++++----
  991. - features/pom.xml | 4 ++--
  992. - features/src/main/features/features.xml | 8 ++++----
  993. - parent/pom.xml | 4 ++--
  994. - 9 files changed, 21 insertions(+), 21 deletions(-)
  995. -
  996. -diff --git a/applications/features/pom.xml b/applications/features/pom.xml
  997. -index 376acb5..21fc31c 100644
  998. ---- a/applications/features/pom.xml
  999. -+++ b/applications/features/pom.xml
  1000. -@@ -16,7 +16,7 @@
  1001. - <properties>
  1002. - <yangtools.version>0.8.2-Beryllium-SR2</yangtools.version>
  1003. - <config.version>0.4.2-Beryllium-SR2</config.version>
  1004. -- <mdsal.version>1.3.2-Beryllium-SR2</mdsal.version>
  1005. -+ <controller.mdsal.version>1.3.2-Beryllium-SR2</controller.mdsal.version>
  1006. - <openflowjava.version>0.7.2-Beryllium-SR2</openflowjava.version>
  1007. - <lldp.version>0.10.2-Beryllium-SR2</lldp.version>
  1008. -
  1009. -@@ -55,7 +55,7 @@
  1010. - <dependency>
  1011. - <groupId>org.opendaylight.controller</groupId>
  1012. - <artifactId>mdsal-artifacts</artifactId>
  1013. -- <version>${mdsal.version}</version>
  1014. -+ <version>${controller.mdsal.version}</version>
  1015. - <scope>import</scope>
  1016. - <type>pom</type>
  1017. - </dependency>
  1018. -diff --git a/applications/features/src/main/features/features.xml b/applications/features/src/main/features/features.xml
  1019. -index e784c77..005de14 100644
  1020. ---- a/applications/features/src/main/features/features.xml
  1021. -+++ b/applications/features/src/main/features/features.xml
  1022. -@@ -3,14 +3,14 @@
  1023. - <features name="odl-flow-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
  1024. - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  1025. - xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
  1026. -- <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
  1027. -+ <repository>mvn:org.opendaylight.controller/features-mdsal/${controller.mdsal.version}/xml/features</repository>
  1028. - <feature name='odl-flow-model' version='${project.version}' description="OpenDaylight :: Flow :: Model">
  1029. - <feature version='${yangtools.version}'>odl-mdsal-models</feature>
  1030. - <bundle>mvn:org.opendaylight.openflowplugin.model/model-flow-base/{{VERSION}}</bundle>
  1031. - <bundle>mvn:org.opendaylight.openflowplugin.model/model-flow-service/{{VERSION}}</bundle>
  1032. - <bundle>mvn:org.opendaylight.openflowplugin.model/model-flow-statistics/{{VERSION}}</bundle>
  1033. -- <bundle>mvn:org.opendaylight.controller.model/model-inventory/${mdsal.version}</bundle>
  1034. -- <bundle>mvn:org.opendaylight.controller.model/model-topology/${mdsal.version}</bundle>
  1035. -+ <bundle>mvn:org.opendaylight.controller.model/model-inventory/${controller.mdsal.version}</bundle>
  1036. -+ <bundle>mvn:org.opendaylight.controller.model/model-topology/${controller.mdsal.version}</bundle>
  1037. - </feature>
  1038. - <feature name='odl-flow-services' version='${project.version}' description="OpenDaylight :: Flow :: Services">
  1039. - <feature version='${project.version}'>odl-mdsal-broker</feature>
  1040. -diff --git a/applications/statistics-manager/pom.xml b/applications/statistics-manager/pom.xml
  1041. -index 60b379b..c7437a5 100644
  1042. ---- a/applications/statistics-manager/pom.xml
  1043. -+++ b/applications/statistics-manager/pom.xml
  1044. -@@ -28,7 +28,7 @@
  1045. - <dependency>
  1046. - <groupId>org.opendaylight.controller</groupId>
  1047. - <artifactId>sal-binding-broker-impl</artifactId>
  1048. -- <version>${mdsal.version}</version>
  1049. -+ <version>${controller.mdsal.version}</version>
  1050. - <scope>test</scope>
  1051. - <type>test-jar</type>
  1052. - </dependency>
  1053. -diff --git a/distribution/karaf/pom.xml b/distribution/karaf/pom.xml
  1054. -index 7cd1319..d832686 100644
  1055. ---- a/distribution/karaf/pom.xml
  1056. -+++ b/distribution/karaf/pom.xml
  1057. -@@ -72,7 +72,7 @@
  1058. - <dependency>
  1059. - <groupId>org.opendaylight.controller</groupId>
  1060. - <artifactId>features-mdsal</artifactId>
  1061. -- <version>${mdsal.version}</version>
  1062. -+ <version>${controller.mdsal.version}</version>
  1063. - <classifier>features</classifier>
  1064. - <type>xml</type>
  1065. - <scope>runtime</scope>
  1066. -diff --git a/features-li/pom.xml b/features-li/pom.xml
  1067. -index 4fea59f..b18ad37 100644
  1068. ---- a/features-li/pom.xml
  1069. -+++ b/features-li/pom.xml
  1070. -@@ -17,7 +17,7 @@
  1071. - <properties>
  1072. - <yangtools.version>0.8.2-Beryllium-SR2</yangtools.version>
  1073. - <config.version>0.4.2-Beryllium-SR2</config.version>
  1074. -- <mdsal.version>1.3.2-Beryllium-SR2</mdsal.version>
  1075. -+ <controller.mdsal.version>1.3.2-Beryllium-SR2</controller.mdsal.version>
  1076. - <openflowjava.version>0.7.2-Beryllium-SR2</openflowjava.version>
  1077. - <openflowplugin.version>0.2.2-Beryllium-SR2</openflowplugin.version>
  1078. - <dlux.version>0.3.2-Beryllium-SR2</dlux.version>
  1079. -@@ -60,7 +60,7 @@
  1080. - <dependency>
  1081. - <groupId>org.opendaylight.controller</groupId>
  1082. - <artifactId>mdsal-artifacts</artifactId>
  1083. -- <version>${mdsal.version}</version>
  1084. -+ <version>${controller.mdsal.version}</version>
  1085. - <scope>import</scope>
  1086. - <type>pom</type>
  1087. - </dependency>
  1088. -diff --git a/features-li/src/main/features/features.xml b/features-li/src/main/features/features.xml
  1089. -index 613c91b..00c6f25 100644
  1090. ---- a/features-li/src/main/features/features.xml
  1091. -+++ b/features-li/src/main/features/features.xml
  1092. -@@ -11,7 +11,7 @@
  1093. - <features name="openflowplugin-li-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
  1094. - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  1095. - xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
  1096. -- <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
  1097. -+ <repository>mvn:org.opendaylight.controller/features-mdsal/${controller.mdsal.version}/xml/features</repository>
  1098. - <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
  1099. - <repository>mvn:org.opendaylight.openflowjava/features-openflowjava/${openflowjava.version}/xml/features</repository>
  1100. - <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features</repository>
  1101. -@@ -27,7 +27,7 @@
  1102. - </feature>
  1103. -
  1104. - <feature name='odl-openflowplugin-southbound-li' description="OpenDaylight :: Openflow Plugin :: Li southBound API implementation " version='${project.version}'>
  1105. -- <feature version="${mdsal.version}">odl-mdsal-broker</feature>
  1106. -+ <feature version="${controller.mdsal.version}">odl-mdsal-broker</feature>
  1107. - <feature version="${project.version}">odl-openflowplugin-nsf-services-li</feature>
  1108. - <feature version="${openflowjava.version}">odl-openflowjava-protocol</feature>
  1109. - <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-common/{{VERSION}}</bundle>
  1110. -@@ -50,7 +50,7 @@
  1111. -
  1112. - <feature name='odl-openflowplugin-nsf-services-li' version='${project.version}'
  1113. - description="OpenDaylight :: OpenflowPlugin :: NSF :: Services">
  1114. -- <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
  1115. -+ <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
  1116. - <feature version='${project.version}'>odl-openflowplugin-nsf-model-li</feature>
  1117. - <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-common/{{VERSION}}</bundle>
  1118. - <bundle>mvn:org.opendaylight.openflowplugin.applications/topology-manager/{{VERSION}}</bundle>
  1119. -@@ -82,7 +82,7 @@
  1120. - <feature version="${project.version}">odl-openflowplugin-flow-services-rest-li</feature>
  1121. - <feature version="${dlux.version}">odl-dlux-core</feature>
  1122. - <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
  1123. -- <feature version="${mdsal.version}">odl-mdsal-xsql</feature>
  1124. -+ <feature version="${controller.mdsal.version}">odl-mdsal-xsql</feature>
  1125. - </feature>
  1126. -
  1127. - <!-- CBENCH TESTING -->
  1128. -diff --git a/features/pom.xml b/features/pom.xml
  1129. -index 588707d..3746a97 100644
  1130. ---- a/features/pom.xml
  1131. -+++ b/features/pom.xml
  1132. -@@ -17,7 +17,7 @@
  1133. - <properties>
  1134. - <yangtools.version>0.8.2-Beryllium-SR2</yangtools.version>
  1135. - <config.version>0.4.2-Beryllium-SR2</config.version>
  1136. -- <mdsal.version>1.3.2-Beryllium-SR2</mdsal.version>
  1137. -+ <controller.mdsal.version>1.3.2-Beryllium-SR2</controller.mdsal.version>
  1138. - <openflowjava.version>0.7.2-Beryllium-SR2</openflowjava.version>
  1139. - <openflowplugin.version>0.2.2-Beryllium-SR2</openflowplugin.version>
  1140. - <dlux.version>0.3.2-Beryllium-SR2</dlux.version>
  1141. -@@ -61,7 +61,7 @@
  1142. - <dependency>
  1143. - <groupId>org.opendaylight.controller</groupId>
  1144. - <artifactId>mdsal-artifacts</artifactId>
  1145. -- <version>${mdsal.version}</version>
  1146. -+ <version>${controller.mdsal.version}</version>
  1147. - <scope>import</scope>
  1148. - <type>pom</type>
  1149. - </dependency>
  1150. -diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
  1151. -index d15955b..b9dc02a 100644
  1152. ---- a/features/src/main/features/features.xml
  1153. -+++ b/features/src/main/features/features.xml
  1154. -@@ -11,7 +11,7 @@
  1155. - <features name="openflowplugin-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
  1156. - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  1157. - xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
  1158. -- <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
  1159. -+ <repository>mvn:org.opendaylight.controller/features-mdsal/${controller.mdsal.version}/xml/features</repository>
  1160. - <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
  1161. - <repository>mvn:org.opendaylight.openflowjava/features-openflowjava/${openflowjava.version}/xml/features</repository>
  1162. - <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features</repository>
  1163. -@@ -26,7 +26,7 @@
  1164. - </feature>
  1165. -
  1166. - <feature name='odl-openflowplugin-southbound' description="OpenDaylight :: Openflow Plugin :: SouthBound" version='${project.version}'>
  1167. -- <feature version="${mdsal.version}">odl-mdsal-broker</feature>
  1168. -+ <feature version="${controller.mdsal.version}">odl-mdsal-broker</feature>
  1169. - <feature version="${project.version}">odl-openflowplugin-nsf-model</feature>
  1170. - <feature version="${openflowjava.version}">odl-openflowjava-protocol</feature>
  1171. - <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-common/{{VERSION}}</bundle>
  1172. -@@ -51,7 +51,7 @@
  1173. -
  1174. - <feature name='odl-openflowplugin-nsf-services' version='${project.version}'
  1175. - description="OpenDaylight :: OpenflowPlugin :: NSF :: Services">
  1176. -- <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
  1177. -+ <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
  1178. - <feature version='${project.version}'>odl-openflowplugin-nsf-model</feature>
  1179. - <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-common/{{VERSION}}</bundle>
  1180. - <bundle>mvn:org.opendaylight.openflowplugin.applications/topology-manager/{{VERSION}}</bundle>
  1181. -@@ -83,7 +83,7 @@
  1182. - <feature version="${project.version}">odl-openflowplugin-flow-services-rest</feature>
  1183. - <feature version="${dlux.version}">odl-dlux-core</feature>
  1184. - <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
  1185. -- <feature version="${mdsal.version}">odl-mdsal-xsql</feature>
  1186. -+ <feature version="${controller.mdsal.version}">odl-mdsal-xsql</feature>
  1187. - </feature>
  1188. -
  1189. - <!-- CBENCH TESTING -->
  1190. -diff --git a/parent/pom.xml b/parent/pom.xml
  1191. -index 57365cd..ad342db 100644
  1192. ---- a/parent/pom.xml
  1193. -+++ b/parent/pom.xml
  1194. -@@ -41,7 +41,7 @@
  1195. - <controller.distribution.version>0.3.2-Beryllium-SR2</controller.distribution.version>
  1196. -
  1197. - <config.version>0.4.2-Beryllium-SR2</config.version>
  1198. -- <mdsal.version>1.3.2-Beryllium-SR2</mdsal.version>
  1199. -+ <controller.mdsal.version>1.3.2-Beryllium-SR2</controller.mdsal.version>
  1200. - <yangtools.version>0.8.2-Beryllium-SR2</yangtools.version>
  1201. - </properties>
  1202. -
  1203. -@@ -86,7 +86,7 @@
  1204. - <dependency>
  1205. - <groupId>org.opendaylight.controller</groupId>
  1206. - <artifactId>mdsal-artifacts</artifactId>
  1207. -- <version>${mdsal.version}</version>
  1208. -+ <version>${controller.mdsal.version}</version>
  1209. - <scope>import</scope>
  1210. - <type>pom</type>
  1211. - </dependency>
  1212. ---
  1213. -2.4.3
  1214. -
  1215. --
  1216. 2.7.4
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!