Merge "Bump project to 2.0.0 and fix feature deployment"

diff --git a/api/pom.xml b/api/pom.xml
index 5f372020a6ba6e2f5a598df268dc0e386977d7ce..3154a1bacb066d10d9c60accc51c776614b818db 100644 (file)
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <groupId>org.opendaylight.transportpce</groupId>
   <artifactId>transportpce-api</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/common/pom.xml b/common/pom.xml
index f738844eb28ba8044c0d924f35c018eb1396b07f..3742e07e0a24c6996f60bc6992d76595a95bda6b 100644 (file)
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -16,7 +16,7 @@
 
     <groupId>org.opendaylight.transportpce</groupId>
     <artifactId>transportpce-common</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencyManagement>

diff --git a/features/odl-transportpce-inventory/pom.xml b/features/odl-transportpce-inventory/pom.xml
index f8ea8a2f6e1181b9dad5877aecc1f8de5e56f24f..6b3328de451fbe7972d96b3d0c9ac9b10db11ba9 100644 (file)
--- a/features/odl-transportpce-inventory/pom.xml
+++ b/features/odl-transportpce-inventory/pom.xml
@@ -15,7 +15,7 @@
 
     <groupId>org.opendaylight.transportpce</groupId>
     <artifactId>odl-transportpce-inventory</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>OpenDaylight :: transportpce :: Inventory</name>

diff --git a/features/odl-transportpce-tapi/pom.xml b/features/odl-transportpce-tapi/pom.xml
index aee22e97720e3185f60c49531479d0b595e95f5e..30cb530f483bfeb54d6db076e2972a7903c9e840 100644 (file)
--- a/features/odl-transportpce-tapi/pom.xml
+++ b/features/odl-transportpce-tapi/pom.xml
@@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
   <groupId>org.opendaylight.transportpce</groupId>
   <artifactId>odl-transportpce-tapi</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>feature</packaging>
 
   <name>OpenDaylight :: transportpce :: tapi</name>

diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml
index 58ff28c175ea76254afba2231a8b5719a2a92e74..e18ce0599c0e86b3992febad4aa3072b92db5427 100644 (file)
--- a/features/odl-transportpce/pom.xml
+++ b/features/odl-transportpce/pom.xml
@@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
   <groupId>org.opendaylight.transportpce</groupId>
   <artifactId>odl-transportpce</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>feature</packaging>
 
   <name>OpenDaylight :: transportpce</name>
@@ -28,8 +28,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <netconf.version>1.8.0-SNAPSHOT</netconf.version>
     <restconf.version>1.11.0-SNAPSHOT</restconf.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
-    <maven.deploy.skip>true</maven.deploy.skip>
-    <maven.install.skip>true</maven.install.skip>
   </properties>
 
   <dependencies>

diff --git a/features/pom.xml b/features/pom.xml
index e28ea55d30d7c9c8c04e54e76bb833c370d10a07..4c3fd7cb31b6a5fb7433aef6d2fa3263d3690c83 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
   <groupId>org.opendaylight.transportpce</groupId>
   <artifactId>features-aggregator</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <packaging>pom</packaging>
 

diff --git a/inventory/pom.xml b/inventory/pom.xml
index 7ea17d53174f628e2d1d6b01acb2993fd630f99b..0f5aa6bb1a19539e4af4917572d92081e5f051c2 100644 (file)
--- a/inventory/pom.xml
+++ b/inventory/pom.xml
@@ -16,7 +16,7 @@
 
     <groupId>org.opendaylight.transportpce</groupId>
     <artifactId>transportpce-inventory</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 10ebeb5c37c480513bc9f9bb52d50014e8eaedc0..c4117d5b11edacb26e05c9723bfafea51e4f2b21 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
   <groupId>org.opendaylight.transportpce</groupId>
   <artifactId>transportpce-karaf</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>${project.artifactId}</name>
 

diff --git a/lighty/pom.xml b/lighty/pom.xml
index fba32f4140706e6cb8c0dfcbe058d1a50ea327d7..f06c97d00de440882656d27f66357258a4b87061 100644 (file)
--- a/lighty/pom.xml
+++ b/lighty/pom.xml
@@ -25,7 +25,7 @@
         <application.main.class>io.lighty.controllers.tpce.Main</application.main.class>
         <application.attach.zip>true</application.attach.zip>
         <maven.deploy.skip>true</maven.deploy.skip>
-        <transportpce.version>1.0.0-SNAPSHOT</transportpce.version>
+        <transportpce.version>2.0.0-SNAPSHOT</transportpce.version>
     </properties>
 
     <dependencies>

diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml
index d425254e1e5b91299db6b570498e11e1d70685c5..c4e5dfabb55af61a60e9df69a3dabca5988167d7 100644 (file)
--- a/networkmodel/pom.xml
+++ b/networkmodel/pom.xml
@@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <groupId>org.opendaylight.transportpce</groupId>
   <artifactId>transportpce-networkmodel</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/olm/pom.xml b/olm/pom.xml
index ce56b41ffa4cd98fb35fbdb74bc28dbddd723433..234638fdb8efed7fabe2ea21c6231db503a22dbd 100644 (file)
--- a/olm/pom.xml
+++ b/olm/pom.xml
@@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <groupId>org.opendaylight.transportpce</groupId>
   <artifactId>transportpce-olm</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/ordmodels/common/pom.xml b/ordmodels/common/pom.xml
index c22a788a365cf65c15eae5a71a149b32c6d888b9..3e2943b26b8d06d98aec3d31a770b467792b614d 100644 (file)
--- a/ordmodels/common/pom.xml
+++ b/ordmodels/common/pom.xml
@@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <groupId>org.opendaylight.transportpce.ordmodels</groupId>
   <artifactId>transportpce-ordmodels-common</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/ordmodels/device/pom.xml b/ordmodels/device/pom.xml
index 67b897644e49d580be7d97f3d9935bc675525784..8152aba47c84357f5cd5387dcc49bf264cc7459b 100644 (file)
--- a/ordmodels/device/pom.xml
+++ b/ordmodels/device/pom.xml
@@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <groupId>org.opendaylight.transportpce.ordmodels</groupId>
   <artifactId>transportpce-ordmodels-device</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencyManagement>

diff --git a/ordmodels/network/pom.xml b/ordmodels/network/pom.xml
index 7183d290246979afe76bbe3c49d3db5a728777bb..ba07a085c1c29ca0b0e1d4e809df55835dfbb9c9 100644 (file)
--- a/ordmodels/network/pom.xml
+++ b/ordmodels/network/pom.xml
@@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <groupId>org.opendaylight.transportpce.ordmodels</groupId>
   <artifactId>transportpce-ordmodels-network</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/ordmodels/pom.xml b/ordmodels/pom.xml
index 4da447ee2881a78efd93cdd977fcdd02d7818d09..5dd3be1482b30da549846b652c1836cde832b6ab 100644 (file)
--- a/ordmodels/pom.xml
+++ b/ordmodels/pom.xml
@@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <groupId>org.opendaylight.transportpce</groupId>
   <artifactId>transportpce-ordmodels</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>

diff --git a/ordmodels/service/pom.xml b/ordmodels/service/pom.xml
index 9a0f7964209beb164ed8672eff6dd9fceac170c6..89df219081fe829d3d79e451b4a119a465336bed 100644 (file)
--- a/ordmodels/service/pom.xml
+++ b/ordmodels/service/pom.xml
@@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <groupId>org.opendaylight.transportpce.ordmodels</groupId>
   <artifactId>transportpce-ordmodels-service</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/pce/pom.xml b/pce/pom.xml
index dd5ce8d26d7d7816b719f0a18e9b90b868b2dad1..8f0c8c9bbfbc97206cc972c60525bdcdf56b0f7f 100644 (file)
--- a/pce/pom.xml
+++ b/pce/pom.xml
@@ -23,7 +23,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
 
   <groupId>org.opendaylight.transportpce</groupId>
   <artifactId>transportpce-pce</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/pom.xml b/pom.xml
index 749bf954ab9300e67f98f989528ac1aef509b2fd..211cc5a36af54913baa30c904ec81b47ed364530 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
   <groupId>org.opendaylight.transportpce</groupId>
   <artifactId>transportpce-aggregator</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <name>transportpce</name>
   <packaging>pom</packaging>
 

diff --git a/renderer/pom.xml b/renderer/pom.xml
index 4c7444c7a6333e53a2467204599c18f81e0fa8a7..26a0faba9e6ac99cf4343d21bdf6974360cf6fa7 100644 (file)
--- a/renderer/pom.xml
+++ b/renderer/pom.xml
@@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <groupId>org.opendaylight.transportpce</groupId>
   <artifactId>transportpce-renderer</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml
index b4da906ecd0bfc6269d841e6ec5d09fbc674e782..5ed06465ae9937d76744f6f538206867b4ae9259 100644 (file)
--- a/servicehandler/pom.xml
+++ b/servicehandler/pom.xml
@@ -21,7 +21,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
 
   <groupId>org.opendaylight.transportpce</groupId>
   <artifactId>transportpce-servicehandler</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/tapi/pom.xml b/tapi/pom.xml
index 1195ce3f5de36389c38875dbc50bb07b237a3e89..b8a342a11177c9c8a13d719ca4234c871121a85c 100644 (file)
--- a/tapi/pom.xml
+++ b/tapi/pom.xml
@@ -21,7 +21,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
 
   <groupId>org.opendaylight.transportpce</groupId>
   <artifactId>transportpce-tapi</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencyManagement>

diff --git a/tapimodels/pom.xml b/tapimodels/pom.xml
index ac7981f22df762c064f2bb8810726ac12dad9c6e..372c7c40ea5887dd083c55fb0dff0e07bce320be 100644 (file)
--- a/tapimodels/pom.xml
+++ b/tapimodels/pom.xml
@@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <groupId>org.opendaylight.transportpce</groupId>
   <artifactId>transportpce-tapimodels</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
 </project>

diff --git a/test-common/pom.xml b/test-common/pom.xml
index 9da827a7c07cf2a4e0cdedd8efd8c673ad406aa7..c0f39920690a0ce610e0eed115536867bacd0302 100644 (file)
--- a/test-common/pom.xml
+++ b/test-common/pom.xml
@@ -17,7 +17,7 @@
 
     <groupId>org.opendaylight.transportpce</groupId>
     <artifactId>test-common</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>