This group is locked. No changes can be made to the group while it is locked.
Re: ovsdb neutron compile failed, and propose a possible patch for this issue.
|
denghui huang
Hi Madhu Last few days, i follow very closely to ovsdb maven related work, i saw Hugo had two commits related this area,Fixup the pom files to add neutron to the main build profile and add both neutron and northbound to the distribution pom Today, i pull those two commits, then compile again, still has some compiled issues. So, i made some changes, then build successfully. The following are my changes: diff --git a/neutron/pom.xml b/neutron/pom.xml index fe00bb5..a8b4624 100644 --- a/neutron/pom.xml +++ b/neutron/pom.xml @@ -78,5 +78,10 @@ <artifactId>containermanager</artifactId> <version>0.5.1-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.sonatype.sisu</groupId> + <artifactId>sisu-guava</artifactId> + <version>0.9.9</version> + </dependency> </dependencies> </project> diff --git a/northbound/ovsdb/pom.xml b/northbound/ovsdb/pom.xml index 0754194..ac0242b 100644 --- a/northbound/ovsdb/pom.xml +++ b/northbound/ovsdb/pom.xml @@ -27,7 +27,8 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>${bundle.plugin.version}</version> + <!--version>${bundle.plugin.version}</version--> + <version>2.3.6</version> <extensions>true</extensions> <configuration> <instructions> diff --git a/ovsdb/pom.xml b/ovsdb/pom.xml index f373799..49e1519 100755 --- a/ovsdb/pom.xml +++ b/ovsdb/pom.xml @@ -181,6 +181,16 @@ <artifactId>commons-collections</artifactId> <version>1.0</version> </dependency> + <dependency> + <groupId>org.sonatype.sisu</groupId> + <artifactId>sisu-guava</artifactId> + <version>0.9.9</version> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>15.0</version> + </dependency> </dependencies> <profiles> diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/IPAddressProperty.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plu index 3d3e2bc..9059e67 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/IPAddressProperty.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/IPAddressProperty.java @@ -30,7 +30,7 @@ public class IPAddressProperty extends Property implements Cloneable { this.address = address; } - @Override + //@Override public String getStringValue() { if (address == null) return null; return this.address.getHostAddress(); diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/L4PortProperty.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin index 7e6cb31..f7fd1ea 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/L4PortProperty.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/L4PortProperty.java @@ -29,7 +29,7 @@ public class L4PortProperty extends Property implements Cloneable { this.port = port; } - @Override + //@Override public String getStringValue() { return port+""; } I am not sure whether it is full required for ovsdb maven related work? Thanks --Denghui
|
|
|