Code Review / netvirt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 80ea985)
Fix build/install errors in routermanager branch
authorSridhar Gaddam <sgaddam@redhat.com>
Thu, 17 Mar 2016 19:42:49 +0000 (01:12 +0530)
committerSridhar Gaddam <sgaddam@redhat.com>
Thu, 17 Mar 2016 19:42:54 +0000 (01:12 +0530)
This patch addresses the following errors in routermanager branch.

Build error: Failed to execute goal org.apache.karaf.tooling:karaf-maven-plugin
             :3.0.3:features-create-kar (features-create-kar) on project
             routemgr-features: Cannot find version for: com.google.code.gson/gson/

Install error: Addressed this issue by merging few patches from master branch.
              $opendaylight-user@root>feature:install odl-ovsdb-openstack
              Error executing command: Can't install feature odl-ovsdb-openstack/0.0.0:
              Could not start bundle mvn:org.opendaylight.ovsdb/openstack.net-virt/1.3.0-SNAPSHOT
              in feature(s) odl-ovsdb-openstack-clusteraware-1.3.0-SNAPSHOT,
              odl-ovsdb-openstack-1.3.0-SNAPSHOT: The bundle "org.opendaylight.ovsdb.openstack.
              net-virt_1.3.0.SNAPSHOT [281]" could not be resolved. Reason: Missing Constraint:
              Import-Package: org.apache.commons.net.util; version="[3.4.0,4.0.0)"

Change-Id: I351398950d6fe3c2043d9bfe71a429cf7b5182aa
Signed-off-by: Sridhar Gaddam <sgaddam@redhat.com>
features/pom.xml patch | blob | history
features/src/main/features/features.xml patch | blob | history
openstack/net-virt-it/pom.xml patch | blob | history
openstack/net-virt-sfc/features/production/pom.xml patch | blob | history
openstack/net-virt-sfc/features/production/src/main/features/features.xml patch | blob | history
openstack/net-virt-sfc/features/src/main/features/features.xml patch | blob | history
routemgr/routemgr-features/pom.xml patch | blob | history
routemgr/routemgr-features/src/main/features/features.xml patch | blob | history

diff --git a/features/pom.xml b/features/pom.xml
index eba4fc084d4d2723f7705f29c071ede7a5872ede..dba16332a488a27937d06970a6a5a838657f3586 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -46,7 +46,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <properties>
     <odl.karaf.base.version>1.7.0-SNAPSHOT</odl.karaf.base.version>
-    <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>
+    <controller.mdsal.version>1.4.0-SNAPSHOT</controller.mdsal.version>
     <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
     <restconf.version>1.4.0-SNAPSHOT</restconf.version>
     <neutron.version>0.7.0-SNAPSHOT</neutron.version>
@@ -67,7 +67,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
+        <version>${controller.mdsal.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -129,6 +129,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 1e5fc8c5fb8a0b2793c442629a427d573884d7ba..3a9d94a68c1d3cade872b4180035319ca6d83156 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -29,7 +29,7 @@
 
   <feature name="odl-ovsdb-openstack" description="OpenDaylight :: OVSDB :: OpenStack Network Virtualization"
            version='${project.version}'>
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
+    <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
     <feature version="${openflowplugin.version}">odl-openflowplugin-nsf-model</feature>
     <feature version="${neutron.version}">odl-neutron-service</feature>
     <feature version="${project.version}">odl-ovsdb-southbound-impl-ui</feature>
@@ -42,13 +42,14 @@
     <bundle>mvn:org.opendaylight.ovsdb/utils.southbound-utils/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.ovsdb/openstack.net-virt/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.ovsdb/openstack.net-virt-providers/{{VERSION}}</bundle>
+    <bundle>mvn:commons-net/commons-net/{{VERSION}}</bundle>
     <configfile finalname="etc/opendaylight/karaf/netvirt-impl-default-config.xml">mvn:org.opendaylight.ovsdb/openstack.net-virt/{{VERSION}}/xml/config</configfile>
     <configfile finalname="etc/opendaylight/karaf/netvirt-providers-impl-default-config.xml">mvn:org.opendaylight.ovsdb/openstack.net-virt-providers/{{VERSION}}/xml/config</configfile>
   </feature>
 
   <feature name="odl-ovsdb-openstack-clusteraware" description="OpenDaylight :: OVSDB :: OpenStack Network Virtualization - Cluster Aware"
            version='${project.version}'>
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
+    <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
     <feature version="${openflowplugin.version}">odl-openflowplugin-nsf-model-li</feature>
     <feature version="${neutron.version}">odl-neutron-service</feature>
     <feature version="${project.version}">odl-ovsdb-southbound-impl-ui</feature>
@@ -60,6 +61,7 @@
     <bundle>mvn:org.opendaylight.ovsdb/utils.southbound-utils/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.ovsdb/openstack.net-virt/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.ovsdb/openstack.net-virt-providers/{{VERSION}}</bundle>
+    <bundle>mvn:commons-net/commons-net/{{VERSION}}</bundle>
     <configfile finalname="etc/opendaylight/karaf/netvirt-impl-default-config.xml">mvn:org.opendaylight.ovsdb/openstack.net-virt/{{VERSION}}/xml/config</configfile>
     <configfile finalname="etc/opendaylight/karaf/netvirt-providers-impl-default-config.xml">mvn:org.opendaylight.ovsdb/openstack.net-virt-providers/{{VERSION}}/xml/config</configfile>
   </feature>
@@ -79,7 +81,7 @@
   <feature name='odl-netvirt-ui' version='${project.version}' description='OpenDaylight :: netvirt :: UI'>
     <feature version="${project.version}">odl-netvirt-rest</feature>
     <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
-    <feature version="${mdsal.version}">odl-mdsal-xsql</feature>
+    <feature version="${controller.mdsal.version}">odl-mdsal-xsql</feature>
   </feature>
   <feature name='odl-netvirt-hwgw' version='${project.version}' description='OpenDaylight :: netvirt :: Hardware Gateway'>
     <feature version="${project.version}">odl-netvirt-api</feature>
diff --git a/openstack/net-virt-it/pom.xml b/openstack/net-virt-it/pom.xml
index 40bc3539f9f2e977164008687422ae814bc9c409..ee99fdf04ec6f83650c49f8f0f191b82c4d4e103 100644 (file)
--- a/openstack/net-virt-it/pom.xml
+++ b/openstack/net-virt-it/pom.xml
@@ -42,6 +42,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   </scm>
 
   <properties>
+    <controller.mdsal.version>1.4.0-SNAPSHOT</controller.mdsal.version>
     <karaf.distro.groupId>org.opendaylight.ovsdb</karaf.distro.groupId>
     <karaf.distro.artifactId>karaf</karaf.distro.artifactId>
     <karaf.distro.version>${project.version}</karaf.distro.version>
@@ -67,7 +68,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
+        <version>${controller.mdsal.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/openstack/net-virt-sfc/features/production/pom.xml b/openstack/net-virt-sfc/features/production/pom.xml
index 5267b73eb479e002143847d26d21c8248adec777..5067bdb98d71d5d3ce2cc49a5eaeb0fdaf4310eb 100644 (file)
--- a/openstack/net-virt-sfc/features/production/pom.xml
+++ b/openstack/net-virt-sfc/features/production/pom.xml
@@ -27,7 +27,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
     <dlux.version>0.4.0-SNAPSHOT</dlux.version>
     <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
-    <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>
+    <controller.mdsal.version>1.4.0-SNAPSHOT</controller.mdsal.version>
     <openflowplugin.version>0.3.0-SNAPSHOT</openflowplugin.version>
     <restconf.version>1.4.0-SNAPSHOT</restconf.version>
     <sfc.version>0.3.0-SNAPSHOT</sfc.version>
@@ -39,7 +39,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
+        <version>${controller.mdsal.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -80,7 +80,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-mdsal</artifactId>
       <classifier>features</classifier>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
diff --git a/openstack/net-virt-sfc/features/production/src/main/features/features.xml b/openstack/net-virt-sfc/features/production/src/main/features/features.xml
index 7bdac126425321c2318a365648bb0cd0f6462205..60880931c8852a024afa5e8f55f1b6ac6d304b45 100644 (file)
--- a/openstack/net-virt-sfc/features/production/src/main/features/features.xml
+++ b/openstack/net-virt-sfc/features/production/src/main/features/features.xml
@@ -25,7 +25,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <bundle>mvn:org.opendaylight.ovsdb/openstack.net-virt-sfc-api/{{VERSION}}</bundle>
   </feature>
   <feature name='odl-ovsdb-sfc' version='${project.version}' description='OpenDaylight :: ovsdb-sfc'>
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
+    <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
     <feature version="${openflowplugin.version}">odl-openflowplugin-nsf-model</feature>
     <feature version="${openflowplugin.version}">odl-openflowplugin-flow-services</feature>
     <feature version='${openflowplugin.version}'>odl-openflowplugin-nxm-extensions</feature>
@@ -47,7 +47,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <feature name='odl-ovsdb-sfc-ui' version='${project.version}' description='OpenDaylight :: ovsdb-sfc :: UI'>
     <feature version="${project.version}">odl-ovsdb-sfc-rest</feature>
     <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
-    <feature version="${mdsal.version}">odl-mdsal-xsql</feature>
+    <feature version="${controller.mdsal.version}">odl-mdsal-xsql</feature>
     <feature version="${dlux.version}">odl-dlux-yangui</feature>
   </feature>
 
diff --git a/openstack/net-virt-sfc/features/src/main/features/features.xml b/openstack/net-virt-sfc/features/src/main/features/features.xml
index d425a2635a64623f16442031ee462a68aa777b56..e64873cc05b76769a9ffb4ce944e38caa56308ac 100644 (file)
--- a/openstack/net-virt-sfc/features/src/main/features/features.xml
+++ b/openstack/net-virt-sfc/features/src/main/features/features.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
   <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
+  <repository>mvn:org.opendaylight.controller/features-mdsal/${controller.mdsal.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features</repository>
@@ -20,7 +20,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <bundle>mvn:org.opendaylight.ovsdb/openstack.net-virt-sfc-api/${project.version}</bundle>
   </feature>
   <feature name='odl-ovsdb-sfc' version='${project.version}' description='OpenDaylight :: ovsdb-sfc'>
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
+    <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
     <feature version='${project.version}'>odl-ovsdb-sfc-api</feature>
     <bundle>mvn:org.opendaylight.ovsdb/openstack.net-virt-sfc-impl/${project.version}</bundle>
     <configfile finalname="${configfile.directory}/openstack.net-virt-sfc.xml">mvn:org.opendaylight.ovsdb/openstack.net-virt-sfc-impl/${project.version}/xml/config</configfile>
@@ -32,7 +32,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <feature name='odl-ovsdb-sfc-ui' version='${project.version}' description='OpenDaylight :: ovsdb-sfc :: UI'>
     <feature version="${project.version}">odl-ovsdb-sfc-rest</feature>
     <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
-    <feature version="${mdsal.version}">odl-mdsal-xsql</feature>
+    <feature version="${controller.mdsal.version}">odl-mdsal-xsql</feature>
     <feature version="${dlux.version}">odl-dlux-yangui</feature>
   </feature>
 
diff --git a/routemgr/routemgr-features/pom.xml b/routemgr/routemgr-features/pom.xml
index af0637e6a920684ac9ca4bcaac5dc632b49fd4c5..6aef01b09f534529018493ddcd3ce714baa31790 100644 (file)
--- a/routemgr/routemgr-features/pom.xml
+++ b/routemgr/routemgr-features/pom.xml
@@ -42,7 +42,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <maven>3.1.1</maven>
   </prerequisites>
   <properties>
-    <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>
+    <controller.mdsal.version>1.4.0-SNAPSHOT</controller.mdsal.version>
     <restconf.version>1.4.0-SNAPSHOT</restconf.version>
     <neutron.version>0.7.0-SNAPSHOT</neutron.version>
     <openflowplugin.version>0.3.0-SNAPSHOT</openflowplugin.version>
@@ -62,7 +62,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
+        <version>${controller.mdsal.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -119,7 +119,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-mdsal</artifactId>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
diff --git a/routemgr/routemgr-features/src/main/features/features.xml b/routemgr/routemgr-features/src/main/features/features.xml
index dea024e1516ebfead99105cd737c7dd03235f720..85aee282b44ee37f72917bcd6face140a0c271a6 100644 (file)
--- a/routemgr/routemgr-features/src/main/features/features.xml
+++ b/routemgr/routemgr-features/src/main/features/features.xml
@@ -3,7 +3,7 @@
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
 <!--
-  <repository>mvn:org.opendaylight.controller/features-restconf/${mdsal.version}/xml/features</repository>
+  <repository>mvn:org.opendaylight.controller/features-restconf/${controller.mdsal.version}/xml/features</repository>
 -->
   <repository>mvn:org.opendaylight.yangtools/features-yangtools/{{VERSION}}/xml/features</repository>
   <repository>mvn:org.opendaylight.neutron/features-neutron/{{VERSION}}/xml/features</repository>
@@ -16,11 +16,11 @@
     <feature version="${openflowplugin.version}">odl-openflowplugin-flow-services-li</feature>
     <feature version="${neutron.version}">odl-neutron-transcriber</feature>
     <feature version="1.3.0-SNAPSHOT">odl-ovsdb-southbound-impl</feature>
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
+    <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
 <!--
     <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
 -->
-    <bundle>mvn:com.google.code.gson/gson/${gson.version}</bundle>
+    <bundle>mvn:com.google.code.gson/gson/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.ovsdb/routemgr-impl/${project.version}</bundle>
     <bundle>mvn:org.opendaylight.ovsdb/routemgr-api/${project.version}</bundle>
     <configfile finalname="etc/opendaylight/karaf/97-routemgrmain.xml">mvn:org.opendaylight.ovsdb/routemgr-config/${project.version}/xml/config</configfile>
@@ -28,7 +28,7 @@
 <!--
   <feature name='odl-routemgr-rest' description="Opendaylight :: Routemgr :: Plugin :: Rest" version='${project.version}'>
     <feature version="${project.version}">odl-routemgr-plugin</feature>
-    <feature version="${mdsal.version}">odl-restconf</feature>
+    <feature version="${controller.mdsal.version}">odl-restconf</feature>
   </feature>
 -->
 </features>
NetVirt - Archived