Bump yangtools to 2.0.0

This bumps odlparent to 3.0.1 and yangtools to 2.0.0. Also fixes
references to features, so that the build reactor is consistent.

Compilation fixes are addressed in a follow-up patch.

Change-Id: I24f9997c2ec22861e674b74fb01d43f783e3dbc1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/benchmark/artifacts/pom.xml b/benchmark/artifacts/pom.xml
index e8be844a42305681ad69a7dbb719f60a4157c359..07640b071bbd426a4bc44f6b8d91ce5f1dd8080a 100644 (file)
--- a/benchmark/artifacts/pom.xml
+++ b/benchmark/artifacts/pom.xml
@@ -14,7 +14,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index a10649ae16c264df3c45b057cc0115f6aadd3b08..8846d33b35fc6e7d7ebe58b07eeab8597e51b544 100644 (file)
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -9,7 +9,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.controller</groupId>

diff --git a/features/benchmark/features-mdsal-benchmark/pom.xml b/features/benchmark/features-mdsal-benchmark/pom.xml
index 480c467c3dd3f042a8747e345cd6f3629c68f27c..1cb91c5879063916b71faa7a9ff6e9c4c9501e95 100644 (file)
--- a/features/benchmark/features-mdsal-benchmark/pom.xml
+++ b/features/benchmark/features-mdsal-benchmark/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/benchmark/odl-benchmark-api/pom.xml b/features/benchmark/odl-benchmark-api/pom.xml
index 069f9aa52c03fd19d48784e440fe0f805f610fb2..ba96423eeb220e4a608af367bb248b5c00827ed2 100644 (file)
--- a/features/benchmark/odl-benchmark-api/pom.xml
+++ b/features/benchmark/odl-benchmark-api/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/benchmark/odl-dsbenchmark/pom.xml b/features/benchmark/odl-dsbenchmark/pom.xml
index 15ac9fb6dab1610fc67a5738085bd64e9b1a5e87..56ed08cc43cb9ce22caf9187a7fe8aed66218f0c 100644 (file)
--- a/features/benchmark/odl-dsbenchmark/pom.xml
+++ b/features/benchmark/odl-dsbenchmark/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/benchmark/odl-mdsal-benchmark/pom.xml b/features/benchmark/odl-mdsal-benchmark/pom.xml
index 39961afd308fee07e9f1d1a32c8287335c6b444f..8a791e5ad25dff30b4b5077445edd3b9ea571d8a 100644 (file)
--- a/features/benchmark/odl-mdsal-benchmark/pom.xml
+++ b/features/benchmark/odl-mdsal-benchmark/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/benchmark/odl-ntfbenchmark/pom.xml b/features/benchmark/odl-ntfbenchmark/pom.xml
index 5e525288bca8f167cb89e1225c443f948a3942f4..6570d9ec8143c0e6042bf658416a544e3064ec7f 100644 (file)
--- a/features/benchmark/odl-ntfbenchmark/pom.xml
+++ b/features/benchmark/odl-ntfbenchmark/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/benchmark/pom.xml b/features/benchmark/pom.xml
index 89c6339f545d2f8969fe5c8619166aebae628983..d9c66c4ac7b6a9ed0bac8624c389a4e951c36f43 100644 (file)
--- a/features/benchmark/pom.xml
+++ b/features/benchmark/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.controller</groupId>

diff --git a/features/config-netty/features-config-netty/pom.xml b/features/config-netty/features-config-netty/pom.xml
index 39a239a11124f459b7a8330da00f781dad9d9c78..2b18cb6904a32d1e307b4ba26b605c37a8784eb2 100644 (file)
--- a/features/config-netty/features-config-netty/pom.xml
+++ b/features/config-netty/features-config-netty/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/config-netty/odl-config-netty/pom.xml b/features/config-netty/odl-config-netty/pom.xml
index 159793dfbcfeed89d9f69c898c5fd9614c6fca66..d7b37b77bfa2d44e89bfc883750dd74a2f1e06d8 100644 (file)
--- a/features/config-netty/odl-config-netty/pom.xml
+++ b/features/config-netty/odl-config-netty/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/config-netty/pom.xml b/features/config-netty/pom.xml
index 28c19659828febc89a50ce5c829a2062634277ac..fde2ccd6a8e954b90855be0ef1d01f10ff8f4043 100644 (file)
--- a/features/config-netty/pom.xml
+++ b/features/config-netty/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/config-persister/features-config-persister/pom.xml b/features/config-persister/features-config-persister/pom.xml
index d9fcb530e48cf2c74e953af9e5ab0a39518414c1..db7843f65dff49319764dcf01dd7a42605f54abd 100644 (file)
--- a/features/config-persister/features-config-persister/pom.xml
+++ b/features/config-persister/features-config-persister/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/config-persister/odl-config-manager-facade-xml/pom.xml b/features/config-persister/odl-config-manager-facade-xml/pom.xml
index 53d0a5811c472d1a3d8e197e033bea871df795d6..dd6420ba9b60d928ff155771d7437dcaf1d7dc59 100644 (file)
--- a/features/config-persister/odl-config-manager-facade-xml/pom.xml
+++ b/features/config-persister/odl-config-manager-facade-xml/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/config-persister/odl-config-persister-all/pom.xml b/features/config-persister/odl-config-persister-all/pom.xml
index f29c60367f60ce44802ba88c9601b0d3b26d2822..285b9ff210e387f1e4ea441eb8898c2493054aac 100644 (file)
--- a/features/config-persister/odl-config-persister-all/pom.xml
+++ b/features/config-persister/odl-config-persister-all/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/config-persister/odl-config-persister/pom.xml b/features/config-persister/odl-config-persister/pom.xml
index a51716af6f68d1b3c3c2a9ac7f9d616a9186974e..457fb0c868ee6cbad554e7b5e2ec5572ce4e36ef 100644 (file)
--- a/features/config-persister/odl-config-persister/pom.xml
+++ b/features/config-persister/odl-config-persister/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/config-persister/odl-config-startup/pom.xml b/features/config-persister/odl-config-startup/pom.xml
index 3a4e9cc6ed6fbfc057595468555256595369e8fe..f2f903463aba27c151cd6c7f104e8e1c5c89b6d5 100644 (file)
--- a/features/config-persister/odl-config-startup/pom.xml
+++ b/features/config-persister/odl-config-startup/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/config-persister/pom.xml b/features/config-persister/pom.xml
index 7527faf057459ed4e7d01459f6735c149c6a2b84..82e3cc48d5f19799a1840fecaab459dd56866b26 100644 (file)
--- a/features/config-persister/pom.xml
+++ b/features/config-persister/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/config/features-config/pom.xml b/features/config/features-config/pom.xml
index 54bbb9e2038eb8690073b687813afc537e199aa0..faa4a5d87a186f10153a5f11083504c5ecf1d86b 100644 (file)
--- a/features/config/features-config/pom.xml
+++ b/features/config/features-config/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/config/odl-config-all/pom.xml b/features/config/odl-config-all/pom.xml
index 2012641d9541e714edaeffda41015fae2db486f6..1a9c1a78fb15eb05bbb866adb48ec2dbcc7887fa 100644 (file)
--- a/features/config/odl-config-all/pom.xml
+++ b/features/config/odl-config-all/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/config/odl-config-api/pom.xml b/features/config/odl-config-api/pom.xml
index 48a83472153de464ec4589cf9a618db00d64a447..8f2854ffd2f5d4ba37d842a80168623499c685f5 100644 (file)
--- a/features/config/odl-config-api/pom.xml
+++ b/features/config/odl-config-api/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/config/odl-config-core/pom.xml b/features/config/odl-config-core/pom.xml
index c904078679ef63bedcb6ba0af537a9e057b1c443..b1e9a104f16a7d40f8e1f8434b52290e917026b6 100644 (file)
--- a/features/config/odl-config-core/pom.xml
+++ b/features/config/odl-config-core/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>1.2.0</version>
+                <version>2.0.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/features/config/odl-config-manager/pom.xml b/features/config/odl-config-manager/pom.xml
index 1caa137bbcb0fe5c0f5eb3583e47e6c17e77f9bb..2835d533c6600b08950e49236b4d81bde56c5604 100644 (file)
--- a/features/config/odl-config-manager/pom.xml
+++ b/features/config/odl-config-manager/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/config/odl-config-netty-config-api/pom.xml b/features/config/odl-config-netty-config-api/pom.xml
index 7cb5ed88cae318fb5f1b9d3ac35b6542e715df9d..d45d6e5098899cef99ca7f1b85c23f397c91be0a 100644 (file)
--- a/features/config/odl-config-netty-config-api/pom.xml
+++ b/features/config/odl-config-netty-config-api/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>odl-netty-4</artifactId>
-            <version>2.0.5</version>
+            <version>3.0.1</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/config/pom.xml b/features/config/pom.xml
index 692fc39158ad2e38cad9a9315a52570126dd2e1a..f025b00e8776c14546ad6a2467473a72f0c21b2a 100644 (file)
--- a/features/config/pom.xml
+++ b/features/config/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/extras/features-extras/pom.xml b/features/extras/features-extras/pom.xml
index 23128e4034d3c342dfe9f7bfd90f17cc03b7c778..e8641b16de68781a5cd541c298940ad3c7f0501a 100644 (file)
--- a/features/extras/features-extras/pom.xml
+++ b/features/extras/features-extras/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/extras/odl-extras-all/pom.xml b/features/extras/odl-extras-all/pom.xml
index d6e5b123c585e46855b13a68783b01b974ca2770..b344efd871d695ac02b4e5d954aa6cbe07a69e0c 100644 (file)
--- a/features/extras/odl-extras-all/pom.xml
+++ b/features/extras/odl-extras-all/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/extras/odl-jolokia/pom.xml b/features/extras/odl-jolokia/pom.xml
index 3728af30d2aebfa73ce31839d24fe4a433de67e9..cbaffc5cbf0d245249dea15239e65f8db83a43d0 100644 (file)
--- a/features/extras/odl-jolokia/pom.xml
+++ b/features/extras/odl-jolokia/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/extras/pom.xml b/features/extras/pom.xml
index 493bc2bad504233117a976399b3ad509546108dc..b2fe386e2c58625d2368ec183c707a78669ec8ea 100644 (file)
--- a/features/extras/pom.xml
+++ b/features/extras/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/features-mdsal/pom.xml b/features/mdsal/features-mdsal/pom.xml
index dd5664ebe54e6a001044e82b610a4c62c51953f2..b673ba8d378359047627a0224883b8471d48a1c4 100644 (file)
--- a/features/mdsal/features-mdsal/pom.xml
+++ b/features/mdsal/features-mdsal/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-clustering-test-app/pom.xml b/features/mdsal/odl-clustering-test-app/pom.xml
index e7a829df08c372786b4ce388e8d135d6ee6a6785..972e763ec4efb6e3ddd825ccc285d2d2b14de2ce 100644 (file)
--- a/features/mdsal/odl-clustering-test-app/pom.xml
+++ b/features/mdsal/odl-clustering-test-app/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-mdsal-all/pom.xml b/features/mdsal/odl-mdsal-all/pom.xml
index ddc1a85df7c81cac36c90e8bfe6a639a331bed0d..6a5a99e66a6320ff06620fc8c56069a73ed851fe 100644 (file)
--- a/features/mdsal/odl-mdsal-all/pom.xml
+++ b/features/mdsal/odl-mdsal-all/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/mdsal/odl-mdsal-broker-local/pom.xml
index 9b86c4fa67ed637e7a8f3a11c51baed96b7f211a..5d9a882b2021aa3f5c540ecebbc72b4e855ebf8d 100644 (file)
--- a/features/mdsal/odl-mdsal-broker-local/pom.xml
+++ b/features/mdsal/odl-mdsal-broker-local/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 
@@ -36,14 +36,14 @@
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
                 <artifactId>odlparent-artifacts</artifactId>
-                <version>2.0.5</version>
+                <version>3.0.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>1.2.0</version>
+                <version>2.0.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -92,6 +92,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>odl-yangtools-codec</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-dom-adapter</artifactId>

diff --git a/features/mdsal/odl-mdsal-broker/pom.xml b/features/mdsal/odl-mdsal-broker/pom.xml
index cb884a3362e025c4ed99ebfe6f3431ca9e2051f1..9b62aaa3b039e406b08d1cd9792fc1426a8080e3 100644 (file)
--- a/features/mdsal/odl-mdsal-broker/pom.xml
+++ b/features/mdsal/odl-mdsal-broker/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-mdsal-clustering-commons/pom.xml b/features/mdsal/odl-mdsal-clustering-commons/pom.xml
index 8d090db98ec69405a8a4fb5f9e9a0b38828fd121..5489a8189bdef2c3144ec328f02678f1e7245326 100644 (file)
--- a/features/mdsal/odl-mdsal-clustering-commons/pom.xml
+++ b/features/mdsal/odl-mdsal-clustering-commons/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
                 <artifactId>odlparent-artifacts</artifactId>
-                <version>2.0.5</version>
+                <version>3.0.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -45,19 +45,19 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl-akka-system-2.4</artifactId>
+            <artifactId>odl-akka-system-2.5</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl-akka-persistence-2.4</artifactId>
+            <artifactId>odl-akka-persistence-2.5</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl-akka-clustering-2.4</artifactId>
+            <artifactId>odl-akka-clustering-2.5</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
@@ -74,6 +74,7 @@
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
+            <version>3.1.2</version>
         </dependency>
     </dependencies>
 

diff --git a/features/mdsal/odl-mdsal-clustering/pom.xml b/features/mdsal/odl-mdsal-clustering/pom.xml
index 5468350016f804545e349a9be3d837027578946f..2545640e0991d1a0c489e306c3fcc03023a73826 100644 (file)
--- a/features/mdsal/odl-mdsal-clustering/pom.xml
+++ b/features/mdsal/odl-mdsal-clustering/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-mdsal-common/pom.xml b/features/mdsal/odl-mdsal-common/pom.xml
index de8d3f202f81d02e0d9de98939bb7f1e544ec656..f8dc5b2a6f8e34b8951905d6fefd00324ebe4fec 100644 (file)
--- a/features/mdsal/odl-mdsal-common/pom.xml
+++ b/features/mdsal/odl-mdsal-common/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 
@@ -28,8 +28,8 @@
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>odl-yangtools-yang-data</artifactId>
-            <version>1.2.0</version>
+            <artifactId>odl-yangtools-data</artifactId>
+            <version>2.0.0</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/mdsal/odl-mdsal-distributed-datastore/pom.xml b/features/mdsal/odl-mdsal-distributed-datastore/pom.xml
index 3cef85713449960ed1b03f6d0247bff4542e0cfd..80243a19f199e85835a0976032baa1ef4ccf8cfa 100644 (file)
--- a/features/mdsal/odl-mdsal-distributed-datastore/pom.xml
+++ b/features/mdsal/odl-mdsal-distributed-datastore/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-mdsal-model-inventory/pom.xml b/features/mdsal/odl-mdsal-model-inventory/pom.xml
index 579ded9e134d86fa71e1a0be93cd41885da1e5e3..fa952b4d6ab5c40b91776b4ddfcc4f8c4755ce97 100644 (file)
--- a/features/mdsal/odl-mdsal-model-inventory/pom.xml
+++ b/features/mdsal/odl-mdsal-model-inventory/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml b/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml
index ad372a6ee850904c64c6aa6bbc385f1fb026fd3c..e26f1f886f07b90cf919f77e8a032c22cd300cf6 100644 (file)
--- a/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml
+++ b/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>odl-akka-leveldb-0.7</artifactId>
-            <version>2.0.5</version>
+            <version>3.0.1</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/mdsal/odl-message-bus-collector/pom.xml b/features/mdsal/odl-message-bus-collector/pom.xml
index f2ec75e3afa69f56f2d6e823c9a86c231c182cc0..6dfdae3c73269b022bd630232715a6638e5f2334 100644 (file)
--- a/features/mdsal/odl-message-bus-collector/pom.xml
+++ b/features/mdsal/odl-message-bus-collector/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/mdsal/odl-toaster/pom.xml b/features/mdsal/odl-toaster/pom.xml
index 7fb2ea0354106a04e1f26f83979f50c4ba80e093..1757597063e9b835b16f835ff358955858f85b11 100644 (file)
--- a/features/mdsal/odl-toaster/pom.xml
+++ b/features/mdsal/odl-toaster/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>odl-yangtools-common</artifactId>
-            <version>1.2.0</version>
+            <version>2.0.0</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml
index 2a4770325b8d310191eab9681e0fa8d6c7e1d3df..26159a38db2ca46cb39dab9d8b8ded8a609a9ef1 100644 (file)
--- a/features/mdsal/pom.xml
+++ b/features/mdsal/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index 837ce123087cee84b830fc56a4120fee4f8e8c81..b3e85bcf80aa49cf751f57cf40f54a76537962f6 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 9fcf2607e062266d17a41c59a009f683f2474d28..1303669197cdb05b6a666197b966ab0a7dec1c93 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/artifacts/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/artifacts/pom.xml
index a6a80c98d450f6ffc35c2950c5f698d4519ebdbe..2a5d3e0fa88586b936881c6dfcc23a24d16c041f 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/artifacts/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/artifacts/pom.xml
@@ -16,7 +16,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/features-X/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/features-X/pom.xml
index 3951aadbe7bfc9056e5b5a1e9720fbefa3ed3205..cc53144bf7b4588719adee61b6d10114c400c669 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/features-X/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/features-X/pom.xml
@@ -16,7 +16,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 
@@ -32,7 +32,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <mdsal.model.version>0.12.0-SNAPSHOT</mdsal.model.version>
     <mdsal.version>1.7.0-SNAPSHOT</mdsal.version>
     <restconf.version>1.7.0-SNAPSHOT</restconf.version>
-    <yangtools.version>1.2.0</yangtools.version>
+    <yangtools.version>2.0.0</yangtools.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
 

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X-api/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X-api/pom.xml
index 2b02b4ab779332e0e43ef0d7e82454169fe69f99..d9ca96af674ee75703c75d9129893b4c07d2b538 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X-api/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X-cli/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X-cli/pom.xml
index 69d4c17c34ba3afd6eaf31351fa96ac4cc3372e8..cf78aebd91b1dc5f08f3d875ddbba58d976aac5b 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X-cli/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X-cli/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X-rest/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X-rest/pom.xml
index 07eea3f4300554258dca1efaaa80bce9f7abcecb..44430501b7bbb8c2f3b49b5f846015eb45b3dbde 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X-rest/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X-rest/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X/pom.xml
index d79d04711c80c62537b2e2228fea0718c05e5fb2..c8d3dc92743c467fbcfaf3131756db062ae11ec8 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-X/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

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
index 3760c1771fdaebda1ce78a244adf32fab2466b56..ea1c23bd42ec7a2b7a366c0aa44f2610243f958e 100644 (file)
--- 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
@@ -16,7 +16,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml
index 73ef893e41765b0cc42677c67254d9d826416b8d..c22b64cf1167f6f1a500f669bbe186eb9ad04834 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml
@@ -15,7 +15,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
index f52815f35da401d58b89523d0b12cfb6c5cbc7e9..d247fcb7d3f67600c7d83fd043ff5c813cc61809 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/archetypes/pom.xml b/opendaylight/archetypes/pom.xml
index 81a544944b147bbc43592322efc952e6944b94e4..c01d2e08ca60cfed409c955164e6e392066699e7 100644 (file)
--- a/opendaylight/archetypes/pom.xml
+++ b/opendaylight/archetypes/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 
@@ -18,7 +18,7 @@
     <!-- TODO Bump maven-archetype-plugin version in odlparent instead of here: -->
     <maven.archetype.version>3.0.1</maven.archetype.version>
     <!-- TODO Figure out why SFT fails on archetype self test with:
-         ArtifactResolutionException: Error resolving artifact org.opendaylight.odlparent:opendaylight-karaf-empty:zip:2.0.5 -->
+         ArtifactResolutionException: Error resolving artifact org.opendaylight.odlparent:opendaylight-karaf-empty:zip:3.0.1 -->
     <archetype.test.skip>true</archetype.test.skip>
   </properties>
 

diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml
index b175ed4b3c06d3747da8cda7ce97d94bf9049d89..0ccff3c2456070832f16744e82a89c0cc2bb3139 100644 (file)
--- a/opendaylight/blueprint/pom.xml
+++ b/opendaylight/blueprint/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 
@@ -41,7 +41,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>1.2.0</version>
+        <version>2.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/opendaylight/commons/jolokia/pom.xml b/opendaylight/commons/jolokia/pom.xml
index 21699ff1f3f22f76a121ee38003ce9525700c30c..aa2353df5e8e19c483223fe0b2f71be0ebcab5ea 100644 (file)
--- a/opendaylight/commons/jolokia/pom.xml
+++ b/opendaylight/commons/jolokia/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/commons/liblldp/pom.xml b/opendaylight/commons/liblldp/pom.xml
index 4dc1e0a4ed5639584f855b47600cfda7e3477e32..5f33289baf070980bdb5355bac79d322217f822f 100644 (file)
--- a/opendaylight/commons/liblldp/pom.xml
+++ b/opendaylight/commons/liblldp/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/config/config-it-base/pom.xml b/opendaylight/config/config-it-base/pom.xml
index 8bacbac1e6642c2f763507c4cb824a54d844f5b4..54237b7dc0bb158739a802659ced6e729e5e1473 100644 (file)
--- a/opendaylight/config/config-it-base/pom.xml
+++ b/opendaylight/config/config-it-base/pom.xml
@@ -20,7 +20,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <packaging>bundle</packaging>
 
   <properties>
-    <opendaylight.karaf.version>2.0.5</opendaylight.karaf.version>
+    <opendaylight.karaf.version>3.0.1</opendaylight.karaf.version>
   </properties>
 
   <dependencyManagement>

diff --git a/opendaylight/config/config-netty-config/pom.xml b/opendaylight/config/config-netty-config/pom.xml
index b7e8269116dc579361d51718d753f92968515061..cb83418b6ab213f61cc85c26c8625febfcb116a9 100644 (file)
--- a/opendaylight/config/config-netty-config/pom.xml
+++ b/opendaylight/config/config-netty-config/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/opendaylight/config/config-parent/pom.xml b/opendaylight/config/config-parent/pom.xml
index 72a416cb4c4e4a567aa6bd4a3e132ad4eda3c6cf..2f041cf3ba0b489756a62bc0ed9b0f3f16f2cdad 100644 (file)
--- a/opendaylight/config/config-parent/pom.xml
+++ b/opendaylight/config/config-parent/pom.xml
@@ -24,7 +24,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <properties>
     <config.version>0.8.0-SNAPSHOT</config.version>
     <mdsal.version>1.7.0-SNAPSHOT</mdsal.version>
-    <yangtools.version>1.2.0</yangtools.version>
+    <yangtools.version>2.0.0</yangtools.version>
     <jmxGeneratorPath>${project.build.directory}/generated-sources/config-binding</jmxGeneratorPath>
     <config.file>src/main/config/default-config.xml</config.file>
   </properties>

diff --git a/opendaylight/md-sal/benchmark-data-store/pom.xml b/opendaylight/md-sal/benchmark-data-store/pom.xml
index fc024f131f43d2dd4da99bb10bfc575b5ae83f41..92b4808f39ae3d4c562bac7f809651708800e0cd 100644 (file)
--- a/opendaylight/md-sal/benchmark-data-store/pom.xml
+++ b/opendaylight/md-sal/benchmark-data-store/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath />
   </parent>
 
@@ -27,7 +27,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>1.2.0</version>
+        <version>2.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/opendaylight/md-sal/cds-access-api/pom.xml b/opendaylight/md-sal/cds-access-api/pom.xml
index 2a0184b93da7ee97f79faa6cca499d52ae7cafda..e7e26cbbf95d28e6416795c9e9b04dfd223efc45 100644 (file)
--- a/opendaylight/md-sal/cds-access-api/pom.xml
+++ b/opendaylight/md-sal/cds-access-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 
@@ -19,7 +19,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>1.2.0</version>
+                <version>2.0.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-actor_${scala.version}</artifactId>
+            <artifactId>akka-actor_2.12</artifactId>
         </dependency>
 
         <dependency>
@@ -65,7 +65,7 @@
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-testkit_${scala.version}</artifactId>
+            <artifactId>akka-testkit_2.12</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/opendaylight/md-sal/cds-access-client/pom.xml b/opendaylight/md-sal/cds-access-client/pom.xml
index 72aa9408b0690f81e085f35e5945cbb034e97ff4..6aa9c11cb1772a4115a9f735d45224049ebdfa59 100644 (file)
--- a/opendaylight/md-sal/cds-access-client/pom.xml
+++ b/opendaylight/md-sal/cds-access-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 
@@ -19,7 +19,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>1.2.0</version>
+                <version>2.0.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-actor_${scala.version}</artifactId>
+            <artifactId>akka-actor_2.12</artifactId>
         </dependency>
 
         <dependency>
@@ -62,7 +62,7 @@
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-testkit_${scala.version}</artifactId>
+            <artifactId>akka-testkit_2.12</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/opendaylight/md-sal/cds-dom-api/pom.xml b/opendaylight/md-sal/cds-dom-api/pom.xml
index 5179a9c153632ec02842399f026d4c3444e19833..aafeb0a8de890701d7bcc8807a32ba3656cce84d 100644 (file)
--- a/opendaylight/md-sal/cds-dom-api/pom.xml
+++ b/opendaylight/md-sal/cds-dom-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 
@@ -19,7 +19,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>1.2.0</version>
+                <version>2.0.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-actor_${scala.version}</artifactId>
+            <artifactId>akka-actor_2.12</artifactId>
         </dependency>
 
         <dependency>

diff --git a/opendaylight/md-sal/md-sal-config/pom.xml b/opendaylight/md-sal/md-sal-config/pom.xml
index 947019907fc44a8ac5819b25473df843123278a3..1148c9df450325b84d57341bf9ad6ad2d6d9cf66 100644 (file)
--- a/opendaylight/md-sal/md-sal-config/pom.xml
+++ b/opendaylight/md-sal/md-sal-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/mdsal-artifacts/pom.xml b/opendaylight/md-sal/mdsal-artifacts/pom.xml
index 7a48c9aa198ff2a11b63009a767b00f8ca40e855..13aeaafd044936a2e2422ee028c8d050f784edd2 100644 (file)
--- a/opendaylight/md-sal/mdsal-artifacts/pom.xml
+++ b/opendaylight/md-sal/mdsal-artifacts/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/opendaylight/md-sal/mdsal-it-base/pom.xml b/opendaylight/md-sal/mdsal-it-base/pom.xml
index 98b84fc5000484ef54629569527f469c153fa0c8..1826304610530403257dfc0d376fb1aa3cf8cf0b 100644 (file)
--- a/opendaylight/md-sal/mdsal-it-base/pom.xml
+++ b/opendaylight/md-sal/mdsal-it-base/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/opendaylight/md-sal/mdsal-it-parent/pom.xml b/opendaylight/md-sal/mdsal-it-parent/pom.xml
index 6963cd23c52ee8eeb0fdca7392be3e6014a065d4..bc292f136ca26af41e02197c0587031c7286d9bc 100644 (file)
--- a/opendaylight/md-sal/mdsal-it-parent/pom.xml
+++ b/opendaylight/md-sal/mdsal-it-parent/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -23,7 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <mdsal.version>1.7.0-SNAPSHOT</mdsal.version>
     <karaf.distro.groupId>org.opendaylight.odlparent</karaf.distro.groupId>
     <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-    <karaf.distro.version>2.0.5</karaf.distro.version>
+    <karaf.distro.version>3.0.1</karaf.distro.version>
     <karaf.distro.type>zip</karaf.distro.type>
     <karaf.keep.unpack>false</karaf.keep.unpack>
   </properties>

diff --git a/opendaylight/md-sal/mdsal-trace/binding-impl/pom.xml b/opendaylight/md-sal/mdsal-trace/binding-impl/pom.xml
index a1566fc276c08795a293d37250b2b7246f2b1446..7d87c626a1f78f3bcfb42eee0a9037f5772a9210 100644 (file)
--- a/opendaylight/md-sal/mdsal-trace/binding-impl/pom.xml
+++ b/opendaylight/md-sal/mdsal-trace/binding-impl/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/mdsal-trace/cli/pom.xml b/opendaylight/md-sal/mdsal-trace/cli/pom.xml
index 1f93c0dbf05f94b1e3a68fa5d2c5e9068a6a3dca..94e8aedd751436602782dfc2eb5e83ef56b7d9df 100644 (file)
--- a/opendaylight/md-sal/mdsal-trace/cli/pom.xml
+++ b/opendaylight/md-sal/mdsal-trace/cli/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath />
   </parent>
 

diff --git a/opendaylight/md-sal/mdsal-trace/features/features-mdsal-trace/pom.xml b/opendaylight/md-sal/mdsal-trace/features/features-mdsal-trace/pom.xml
index 2fb951132430b26d1a6fde8c5da99e007ab90357..b205e8f082493ab376cc587c2e54a9b29425612e 100644 (file)
--- a/opendaylight/md-sal/mdsal-trace/features/features-mdsal-trace/pom.xml
+++ b/opendaylight/md-sal/mdsal-trace/features/features-mdsal-trace/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/opendaylight/md-sal/mdsal-trace/features/odl-mdsal-trace/pom.xml b/opendaylight/md-sal/mdsal-trace/features/odl-mdsal-trace/pom.xml
index 3841aa8a4d93c8e4b896320c0e27bdf50ef12ad5..a5242f0939df5d161836515f178111ff7ba2b1d8 100644 (file)
--- a/opendaylight/md-sal/mdsal-trace/features/odl-mdsal-trace/pom.xml
+++ b/opendaylight/md-sal/mdsal-trace/features/odl-mdsal-trace/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/opendaylight/md-sal/mdsal-trace/features/pom.xml b/opendaylight/md-sal/mdsal-trace/features/pom.xml
index 64a444ba148faa50345363ce748d7cb9e0487688..1590d08f9a74554cccc09d94d2d70da3a0fc4d2f 100644 (file)
--- a/opendaylight/md-sal/mdsal-trace/features/pom.xml
+++ b/opendaylight/md-sal/mdsal-trace/features/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/mdsal-trace/pom.xml b/opendaylight/md-sal/mdsal-trace/pom.xml
index 8b1c185fc5078cea13a99d757bb8a5337bbf98a4..38fb991d1939f8cc590562942fa96997ee137b82 100644 (file)
--- a/opendaylight/md-sal/mdsal-trace/pom.xml
+++ b/opendaylight/md-sal/mdsal-trace/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/messagebus-config/pom.xml b/opendaylight/md-sal/messagebus-config/pom.xml
index d11cec72b82174cc1c15de8c3cea3a5269c64717..547a9d4c1beb816db5a759aa11b9ee3a5d2e3d8e 100644 (file)
--- a/opendaylight/md-sal/messagebus-config/pom.xml
+++ b/opendaylight/md-sal/messagebus-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/messagebus-util/pom.xml b/opendaylight/md-sal/messagebus-util/pom.xml
index be8a64227397fb53f8c854a569248a1096abd46b..b77450d2290e8ed9b1502352c88efbb3c6ccaad4 100644 (file)
--- a/opendaylight/md-sal/messagebus-util/pom.xml
+++ b/opendaylight/md-sal/messagebus-util/pom.xml
@@ -14,7 +14,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index 05dc15dc314c6ecade20e09b80e62bc2242955f6..19cc0046172609b67fc998089c36c5bf3eca293e 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/sal-akka-raft-example/pom.xml b/opendaylight/md-sal/sal-akka-raft-example/pom.xml
index d8d39441fbe9dfbd2db922395d26c9359442276e..308d946dada8245b7941227fc16c941a096d4668 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft-example/pom.xml
+++ b/opendaylight/md-sal/sal-akka-raft-example/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/sal-akka-raft/pom.xml b/opendaylight/md-sal/sal-akka-raft/pom.xml
index 77c352284ee37dd44455ef1792ca18584fa98fb8..315484d2de105d8ef5a72bf5c16338761a5dff04 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/pom.xml
+++ b/opendaylight/md-sal/sal-akka-raft/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 
@@ -37,27 +37,27 @@
 
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-actor_${scala.version}</artifactId>
+      <artifactId>akka-actor_2.12</artifactId>
     </dependency>
 
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-cluster_${scala.version}</artifactId>
+      <artifactId>akka-cluster_2.12</artifactId>
     </dependency>
 
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-persistence_${scala.version}</artifactId>
+      <artifactId>akka-persistence_2.12</artifactId>
     </dependency>
 
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-remote_${scala.version}</artifactId>
+      <artifactId>akka-remote_2.12</artifactId>
     </dependency>
 
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-testkit_${scala.version}</artifactId>
+      <artifactId>akka-testkit_2.12</artifactId>
       <scope>test</scope>
     </dependency>
 
@@ -83,7 +83,7 @@
 
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-slf4j_${scala.version}</artifactId>
+      <artifactId>akka-slf4j_2.12</artifactId>
     </dependency>
 
       <!-- Test Dependencies -->

diff --git a/opendaylight/md-sal/sal-binding-api/pom.xml b/opendaylight/md-sal/sal-binding-api/pom.xml
index b95103c95da328d6c8c829e9a00cbb11be9ec6cd..b5a91eab557488feb1c0128a5ea3696ed9afa3cf 100644 (file)
--- a/opendaylight/md-sal/sal-binding-api/pom.xml
+++ b/opendaylight/md-sal/sal-binding-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 
@@ -18,7 +18,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>1.2.0</version>
+        <version>2.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml
index fdcd03f341e2727604e561538a3a8aae1cb230db..baa612aa029922cce1880652acb6c0e9cb6b18d9 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/pom.xml
+++ b/opendaylight/md-sal/sal-binding-broker/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 
@@ -18,7 +18,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>1.2.0</version>
+        <version>2.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/opendaylight/md-sal/sal-binding-dom-it/pom.xml b/opendaylight/md-sal/sal-binding-dom-it/pom.xml
index faac86e538c01e42bddc1ef9c69d070e227e490c..69a52a2b4a5423c87d0e3898d95da3ed8a84eaeb 100644 (file)
--- a/opendaylight/md-sal/sal-binding-dom-it/pom.xml
+++ b/opendaylight/md-sal/sal-binding-dom-it/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 
@@ -18,7 +18,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>1.2.0</version>
+        <version>2.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/opendaylight/md-sal/sal-binding-util/pom.xml b/opendaylight/md-sal/sal-binding-util/pom.xml
index 9dc73ff87d5a3cb9e03550b01dcb9c125e5c82dd..bea70b098c767c2b9549384e4a53b414f7911a32 100644 (file)
--- a/opendaylight/md-sal/sal-binding-util/pom.xml
+++ b/opendaylight/md-sal/sal-binding-util/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml b/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml
index bcb3eb13e234ee47b4d97c86fe9a8017a89733f1..a335480d001b58838b40b43977cc22c1be13104f 100644 (file)
--- a/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml
+++ b/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml
@@ -73,11 +73,11 @@
     <!-- Akka -->
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-actor_${scala.version}</artifactId>
+      <artifactId>akka-actor_2.12</artifactId>
     </dependency>
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-testkit_${scala.version}</artifactId>
+      <artifactId>akka-testkit_2.12</artifactId>
       <scope>test</scope>
     </dependency>
 

diff --git a/opendaylight/md-sal/sal-clustering-commons/pom.xml b/opendaylight/md-sal/sal-clustering-commons/pom.xml
index 90d4001a643a8743baf8ecada2610518f4953cf0..e8dcede8d21613d395e6e4c403295a77e33d4bbe 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-commons/pom.xml
+++ b/opendaylight/md-sal/sal-clustering-commons/pom.xml
@@ -54,35 +54,35 @@
     <!-- Akka -->
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-actor_${scala.version}</artifactId>
+      <artifactId>akka-actor_2.12</artifactId>
     </dependency>
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-cluster_${scala.version}</artifactId>
+      <artifactId>akka-cluster_2.12</artifactId>
     </dependency>
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-osgi_${scala.version}</artifactId>
+      <artifactId>akka-osgi_2.12</artifactId>
     </dependency>
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-persistence_${scala.version}</artifactId>
+      <artifactId>akka-persistence_2.12</artifactId>
     </dependency>
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-remote_${scala.version}</artifactId>
+      <artifactId>akka-remote_2.12</artifactId>
     </dependency>
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-slf4j_${scala.version}</artifactId>
+      <artifactId>akka-slf4j_2.12</artifactId>
     </dependency>
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-testkit_${scala.version}</artifactId>
+      <artifactId>akka-testkit_2.12</artifactId>
     </dependency>
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-persistence-tck_${scala.version}</artifactId>
+      <artifactId>akka-persistence-tck_2.12</artifactId>
     </dependency>
 
     <!-- Codahale -->

diff --git a/opendaylight/md-sal/sal-clustering-config/pom.xml b/opendaylight/md-sal/sal-clustering-config/pom.xml
index a81ecdfab3bd11868830941ad3e644d58293b546..925ddbf8a5227a00e33ed23ea0f32b2cdf1f02cc 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-config/pom.xml
+++ b/opendaylight/md-sal/sal-clustering-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/sal-common-impl/pom.xml b/opendaylight/md-sal/sal-common-impl/pom.xml
index 2f9a3de95b5e0791df6495a693dc3c386b30dda7..0390e3ab606f1fb9146ac5d11f3ecbf8e3a5cb5b 100644 (file)
--- a/opendaylight/md-sal/sal-common-impl/pom.xml
+++ b/opendaylight/md-sal/sal-common-impl/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 
@@ -18,7 +18,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>1.2.0</version>
+        <version>2.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/opendaylight/md-sal/sal-common-testutil/pom.xml b/opendaylight/md-sal/sal-common-testutil/pom.xml
index 97d329c220c47b11fdee27865caa7e87705a7eb1..0e8722657b59f56ebace6af71ed03108d391e45c 100644 (file)
--- a/opendaylight/md-sal/sal-common-testutil/pom.xml
+++ b/opendaylight/md-sal/sal-common-testutil/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath />
   </parent>
 
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>testutils</artifactId>
-      <version>1.2.0</version>
+      <version>2.0.0</version>
     </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/md-sal/sal-common-util/pom.xml b/opendaylight/md-sal/sal-common-util/pom.xml
index b4ea8d5e5a1c195266da39992ba7274c96c7060e..c24b47bcd0356a6dd74f5261ba80470340f276f4 100644 (file)
--- a/opendaylight/md-sal/sal-common-util/pom.xml
+++ b/opendaylight/md-sal/sal-common-util/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 
@@ -18,7 +18,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>1.2.0</version>
+        <version>2.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/opendaylight/md-sal/sal-connector-api/pom.xml b/opendaylight/md-sal/sal-connector-api/pom.xml
index bbae72a9399041278d58dd6242520d429726f2dd..7e8c2fb7b217b8ba9b587dde23d83ce745b0e23f 100644 (file)
--- a/opendaylight/md-sal/sal-connector-api/pom.xml
+++ b/opendaylight/md-sal/sal-connector-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 
@@ -18,7 +18,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>1.2.0</version>
+        <version>2.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/opendaylight/md-sal/sal-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-distributed-datastore/pom.xml
index 585aa0bf9bd72fae64ffc9bd76b8cf821325c44f..549e6778d5a99c8c88d988343248b08e7a2db7d5 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/pom.xml
+++ b/opendaylight/md-sal/sal-distributed-datastore/pom.xml
@@ -38,35 +38,35 @@
     <!-- Akka -->
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-actor_${scala.version}</artifactId>
+      <artifactId>akka-actor_2.12</artifactId>
     </dependency>
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-cluster_${scala.version}</artifactId>
+      <artifactId>akka-cluster_2.12</artifactId>
     </dependency>
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-osgi_${scala.version}</artifactId>
+      <artifactId>akka-osgi_2.12</artifactId>
     </dependency>
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-persistence_${scala.version}</artifactId>
+      <artifactId>akka-persistence_2.12</artifactId>
     </dependency>
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-remote_${scala.version}</artifactId>
+      <artifactId>akka-remote_2.12</artifactId>
     </dependency>
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-slf4j_${scala.version}</artifactId>
+      <artifactId>akka-slf4j_2.12</artifactId>
     </dependency>
     <dependency>
       <groupId>org.scala-lang.modules</groupId>
-      <artifactId>scala-java8-compat_${scala.version}</artifactId>
+      <artifactId>scala-java8-compat_2.12</artifactId>
     </dependency>
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-testkit_${scala.version}</artifactId>
+      <artifactId>akka-testkit_2.12</artifactId>
       <scope>test</scope>
     </dependency>
 

diff --git a/opendaylight/md-sal/sal-dom-api/pom.xml b/opendaylight/md-sal/sal-dom-api/pom.xml
index 748a7a3f52776820028d1baaffb4f2f5cecf0448..7963456795fe6c618e0bca559be294c2897aa242 100644 (file)
--- a/opendaylight/md-sal/sal-dom-api/pom.xml
+++ b/opendaylight/md-sal/sal-dom-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 
@@ -18,7 +18,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>1.2.0</version>
+        <version>2.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/opendaylight/md-sal/sal-dom-broker/pom.xml b/opendaylight/md-sal/sal-dom-broker/pom.xml
index 23b80c83a1cfb8dafd5e79f450adce5d2ca341e7..4c1b3fc366173a24603da63d9c9a8fb25798e014 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/pom.xml
+++ b/opendaylight/md-sal/sal-dom-broker/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 
@@ -18,7 +18,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>1.2.0</version>
+        <version>2.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/opendaylight/md-sal/sal-dom-spi/pom.xml b/opendaylight/md-sal/sal-dom-spi/pom.xml
index c2346b5c1529240874f9ba3640889fddcc9fad97..dc67b1b2b2b050bdfe922ee497482ba7cbd344be 100644 (file)
--- a/opendaylight/md-sal/sal-dom-spi/pom.xml
+++ b/opendaylight/md-sal/sal-dom-spi/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml
index 0a6e7c630103798088f13dea080719b7aa04d197..c689276d58fc7e30a388c29e9c803976c4bc186f 100644 (file)
--- a/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml
+++ b/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 
@@ -33,38 +33,38 @@
 
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-actor_${scala.version}</artifactId>
+      <artifactId>akka-actor_2.12</artifactId>
     </dependency>
 
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-cluster_${scala.version}</artifactId>
+      <artifactId>akka-cluster_2.12</artifactId>
     </dependency>
 
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-persistence_${scala.version}</artifactId>
+      <artifactId>akka-persistence_2.12</artifactId>
     </dependency>
 
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-remote_${scala.version}</artifactId>
+      <artifactId>akka-remote_2.12</artifactId>
     </dependency>
 
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-testkit_${scala.version}</artifactId>
+      <artifactId>akka-testkit_2.12</artifactId>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-slf4j_${scala.version}</artifactId>
+      <artifactId>akka-slf4j_2.12</artifactId>
     </dependency>
 
     <dependency>
       <groupId>com.typesafe.akka</groupId>
-      <artifactId>akka-osgi_${scala.version}</artifactId>
+      <artifactId>akka-osgi_2.12</artifactId>
     </dependency>
 
     <dependency>

diff --git a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml
index d6556bea0794ed78bd70508cad95e495964a9b6d..49208d5fd211217ac42253274b4b24e825b55df6 100644 (file)
--- a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml
+++ b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml
@@ -17,7 +17,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>1.2.0</version>
+        <version>2.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
index 538841ecd5d64b54ad536232a4df6801c17a131e..efc46e542f221edfa7fbd64c8b6c9cdd0d19a1ca 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.1</version>
         <relativePath/>
     </parent>
 
@@ -26,7 +26,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>1.2.0</version>
+                <version>2.0.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -40,32 +40,32 @@
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-actor_${scala.version}</artifactId>
+            <artifactId>akka-actor_2.12</artifactId>
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-cluster_${scala.version}</artifactId>
+            <artifactId>akka-cluster_2.12</artifactId>
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-remote_${scala.version}</artifactId>
+            <artifactId>akka-remote_2.12</artifactId>
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-testkit_${scala.version}</artifactId>
+            <artifactId>akka-testkit_2.12</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-osgi_${scala.version}</artifactId>
+            <artifactId>akka-osgi_2.12</artifactId>
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-slf4j_${scala.version}</artifactId>
+            <artifactId>akka-slf4j_2.12</artifactId>
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-persistence_${scala.version}</artifactId>
+            <artifactId>akka-persistence_2.12</artifactId>
         </dependency>
         <!-- SAL Dependencies -->
         <dependency>
@@ -124,10 +124,12 @@
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
+            <version>3.1.2</version>
         </dependency>
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-graphite</artifactId>
+            <version>3.1.2</version>
         </dependency>
         <!-- Test Dependencies -->
         <dependency>

diff --git a/opendaylight/md-sal/sal-schema-service/pom.xml b/opendaylight/md-sal/sal-schema-service/pom.xml
index 551b95ca1cd9f2352465d40ed68a09f8f8db4cbb..d68a00dc696fff9e796655a6f4f2d63dd533773c 100644 (file)
--- a/opendaylight/md-sal/sal-schema-service/pom.xml
+++ b/opendaylight/md-sal/sal-schema-service/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 
@@ -18,7 +18,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>1.2.0</version>
+        <version>2.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/opendaylight/md-sal/samples/toaster-consumer/pom.xml b/opendaylight/md-sal/samples/toaster-consumer/pom.xml
index ba069d096706bae2bd4cf5a824d8528ccb76d475..6654e437de66b836009e76962069f7098273d324 100644 (file)
--- a/opendaylight/md-sal/samples/toaster-consumer/pom.xml
+++ b/opendaylight/md-sal/samples/toaster-consumer/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/pom.xml b/pom.xml
index 6fe6bfa59e3c32726546ba5aeece1a26948aeb80..197022abbea52d0fdee5425df586e4156b4b9ae8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.1</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.controller</groupId>