Fix and bump versions by x.(y+1).z and adopt platform versions for Neon and update...

1) x.(y+1).z bumping should be done in the master branch, but didn't, so now do it in the stable/neon branch
2) Use the versions as required in [1]
3) encounter build failure due to such as dependecies version missing, so fix them
4) in (3), we found snmp4sdn had disabled topology change reporting via mdsal, so we remove related dependencies
5) update .gitreview to stable/neon

[1] https://docs.opendaylight.org/projects/integration-distribution/en/latest/platform-versions.html

Change-Id: I41b8cc54ce4483ac395fb3f5276bccae1937e4b7
Signed-off-by: ylhsieh <ylhsieh@itri.org.tw>

diff --git a/.gitreview b/.gitreview
index e09467f70727a0c0128e39cf88f6630919686b6a..b621a520e9b710ce407f3f1b451fc579053ddcf9 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
 host=git.opendaylight.org
 port=29418
 project=snmp4sdn.git
-defaultbranch=master
+defaultbranch=stable/neon

diff --git a/commons/integrationtest/pom.xml b/commons/integrationtest/pom.xml
index 5c8392b22d301638dfa18e2ca27823c09d490017..15b586a6c74364e090258d3b468a32b2987efd68 100644 (file)
--- a/commons/integrationtest/pom.xml
+++ b/commons/integrationtest/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.snmp4sdn</groupId>
     <artifactId>commons.snmp4sdn</artifactId>
-    <version>0.8.0-SNAPSHOT</version>
+    <version>0.9.0-SNAPSHOT</version>
     <relativePath>../snmp4sdn</relativePath>
   </parent>
 
@@ -71,7 +71,7 @@
           <dependency>
             <groupId>org.opendaylight.snmp4sdn</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>0.8.0-SNAPSHOT</version>
+            <version>0.9.0-SNAPSHOT</version>
           </dependency>
          </dependencies>
         <configuration>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index e20bf8ac393a4f5f600964c817fc55a8e09ea3d4..978ea610b9fd99c40d2d685d41fdf255af47b9d3 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -8,13 +8,13 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>3.1.0</version>
+    <version>4.0.9</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.snmp4sdn</groupId>
   <artifactId>commons.parent</artifactId>
-  <version>0.8.0-SNAPSHOT</version>
+  <version>0.9.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Parent POM</name>

diff --git a/commons/snmp4sdn/pom.xml b/commons/snmp4sdn/pom.xml
index b1989724d3b71e189f12836844d4b958765b66b2..865e12a118294ec745dfb841b4a9709de38e0119 100644 (file)
--- a/commons/snmp4sdn/pom.xml
+++ b/commons/snmp4sdn/pom.xml
@@ -7,12 +7,12 @@
   </prerequisites>
   <groupId>org.opendaylight.snmp4sdn</groupId>
   <artifactId>commons.snmp4sdn</artifactId>
-  <version>0.8.0-SNAPSHOT</version>
+  <version>0.9.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <parent>
     <groupId>org.opendaylight.snmp4sdn</groupId>
     <artifactId>commons.parent</artifactId>
-    <version>0.8.0-SNAPSHOT</version>
+    <version>0.9.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 
@@ -54,12 +54,12 @@
     <releaseplugin.version>2.3.2</releaseplugin.version>
 
     <ietf-inet-types.version>2010.09.24.3</ietf-inet-types.version>
-    <ietf-yang-types.version>2013.07.15.13.0-SNAPSHOT</ietf-yang-types.version>
+    <ietf-yang-types.version>2013.07.15.13.2</ietf-yang-types.version>
     <sal.version>0.15.0-SNAPSHOT</sal.version>
-    <mdsal.version>1.8.0-SNAPSHOT</mdsal.version>
+    <mdsal.version>1.9.0-SNAPSHOT</mdsal.version><!--1.8.2-SNAPSHOT-->
     <nsf.version>0.11.0-SNAPSHOT</nsf.version>
-    <mdsal.model.version>0.14.0-SNAPSHOT</mdsal.model.version>
-    <yang.version>2.0.3</yang.version>
+    <mdsal.model.version>1.0.6</mdsal.model.version><!---0.13.2-SNAPSHOT-->
+    <yang.version>2.1.8</yang.version>
   </properties>
 
   <dependencyManagement>
@@ -110,49 +110,9 @@
       <dependencies>
         <!-- yangtools -->
         <!--
-        <dependency>
-          <groupId>org.opendaylight.yangtools</groupId>
-          <artifactId>yang-binding</artifactId>
-          <version>${yang.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.yangtools</groupId>
-          <artifactId>yang-common</artifactId>
-          <version>${yang.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.yangtools</groupId>
-          <artifactId>yang-data-api</artifactId>
-          <version>${yang.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.yangtools</groupId>
-          <artifactId>yang-model-api</artifactId>
-          <version>${yang.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.yangtools</groupId>
-          <artifactId>yang-data-util</artifactId>
-          <version>${yang.version}</version>
-        </dependency>
         -->
         <!-- Models -->
         <!--
-        <dependency>
-          <groupId>org.opendaylight.yangtools.model</groupId>
-          <artifactId>ietf-inet-types-2013-07-15</artifactId>
-          <version>${ietf-inet-types.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.yangtools.model</groupId>
-          <artifactId>ietf-yang-types-20130715</artifactId>
-          <version>${ietf-yang-types.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.yangtools</groupId>
-          <artifactId>yang-ext</artifactId>
-          <version>${yang-ext.version}</version>
-        </dependency>
         -->
         <!-- Other MDSAL dependencies -->
 

diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index fb6d09d84a993ba2dbbbb661bb8538295215acb6..1db4354f07a38a50abba84c43fb0eb755a653fab 100644 (file)
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>3.1.0</version>
+    <version>4.0.9</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.snmp4sdn</groupId>
   <artifactId>distribution-karaf</artifactId>
-  <version>0.8.0-SNAPSHOT</version>
+  <version>0.9.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>snmp4sdn Karaf distribution</name>
@@ -53,7 +53,7 @@
     <dependency><!--s4s add-->
       <groupId>org.opendaylight.snmp4sdn</groupId>
       <artifactId>features-snmp4sdn</artifactId>
-      <version>0.8.0-SNAPSHOT</version>
+      <version>0.9.0-SNAPSHOT</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>

diff --git a/features/features-snmp4sdn/pom.xml b/features/features-snmp4sdn/pom.xml
index cc5404e66e9af20e4211a6887a577a46f8033b18..47c64c96d3b4a81db48b41af38a85123e993449b 100644 (file)
--- a/features/features-snmp4sdn/pom.xml
+++ b/features/features-snmp4sdn/pom.xml
@@ -14,13 +14,13 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>3.1.0</version>
+    <version>4.0.9</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.snmp4sdn</groupId>
   <artifactId>features-snmp4sdn</artifactId>
-  <version>0.8.0-SNAPSHOT</version>
+  <version>0.9.0-SNAPSHOT</version>
   <packaging>feature</packaging>
 
   <dependencies>

diff --git a/features/odl-snmp4sdn-snmp4sdn/pom.xml b/features/odl-snmp4sdn-snmp4sdn/pom.xml
index cbb1b2be7cb78d6e51b9c23c2b80b3b16342a819..aa1c98ded7cb2ab34fd7d7c288ba99eaeea9027d 100644 (file)
--- a/features/odl-snmp4sdn-snmp4sdn/pom.xml
+++ b/features/odl-snmp4sdn-snmp4sdn/pom.xml
@@ -15,51 +15,36 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>3.1.0</version>
+    <version>4.0.9</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.snmp4sdn</groupId>
   <artifactId>odl-snmp4sdn-snmp4sdn</artifactId>
-  <version>0.8.0-SNAPSHOT</version>
+  <version>0.9.0-SNAPSHOT</version>
   <packaging>feature</packaging>
 
   <name>OpenDaylight :: SNMP4SDN :: SNMP4SDN Plugin</name>
 
   <properties>
-    <restconf.version>1.8.0-SNAPSHOT</restconf.version>
-    <openflowplugin.version>0.7.0-SNAPSHOT</openflowplugin.version>
-    <yang.version>2.0.3</yang.version>
-    <mdsal.version>1.8.0-SNAPSHOT</mdsal.version>
-    <mdsal.model.version>0.14.0-SNAPSHOT</mdsal.model.version>
+    <restconf.version>1.9.0-SNAPSHOT</restconf.version><!--1.8.2-SNAPSHOT-->
+    <openflowplugin.version>0.7.2-SNAPSHOT</openflowplugin.version>
+    <mdsal.version>1.9.0-SNAPSHOT</mdsal.version><!--1.8.2-SNAPSHOT-->
+    <mdsal.model.version>1.0.6</mdsal.model.version><!--0.13.2-SNAPSHOT-->
+    <yang.version>2.1.8</yang.version>
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.controller.model</groupId>
-      <artifactId>model-inventory</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-api</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-common-util</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>yang-binding</artifactId>
       <version>${mdsal.model.version}</version>
     </dependency>
-    <dependency>
+    <!--<dependency>
         <groupId>org.opendaylight.mdsal.model</groupId>
         <artifactId>ietf-topology</artifactId>
-        <version>2013.10.21.13.0-SNAPSHOT</version>
-    </dependency>
+        <version>2013.10.21.13.2-SNAPSHOT</version>
+    </dependency>--><!--currently snmp4sdn disable topology change reporting via mdsal, so we disable this dep-->
 
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
@@ -77,13 +62,13 @@
       <classifier>features</classifier>
     </dependency>
 
-    <dependency>
+    <!--<dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>odl-openflowplugin-nsf-model</artifactId>
       <version>${openflowplugin.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
-    </dependency>
+    </dependency>--><!--currently snmp4sdn disable topology change reporting via mdsal, so we disable this dep-->
 
     <dependency>
       <groupId>org.dom4j</groupId>
@@ -114,7 +99,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.4</version>
+      <version>3.8</version><!-- in ancestor pom, odlparent v4.0.9, has been given the value 3.8.1 -->
     </dependency>
 
     <dependency>
@@ -151,11 +136,6 @@
       <version>${mdsal.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>

diff --git a/features/pom.xml b/features/pom.xml
index c2b889854d40dca37f1cab595d10e8164ebefbc8..8ed8fa0ea906b497ce7596827df7ec60a5b5d189 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -14,13 +14,13 @@
     <parent>
        <groupId>org.opendaylight.odlparent</groupId>
        <artifactId>odlparent-lite</artifactId>
-       <version>3.1.0</version>
+       <version>4.0.9</version>
        <relativePath/>
     </parent>
  
     <groupId>org.opendaylight.snmp4sdn</groupId>
     <artifactId>features-aggregator</artifactId>
-    <version>0.8.0-SNAPSHOT</version>
+    <version>0.9.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ODL :: snmp4sdn :: ${project.artifactId}</name>

diff --git a/mdsal/caller/aclmanager/pom.xml b/mdsal/caller/aclmanager/pom.xml
index 422b444cc2ebb8c3f22dee74247ca059f4997352..979d41aa7936d612fac9b511df440bfb5f7597dd 100644 (file)
--- a/mdsal/caller/aclmanager/pom.xml
+++ b/mdsal/caller/aclmanager/pom.xml
@@ -8,12 +8,12 @@
   <parent>
     <groupId>org.opendaylight.snmp4sdn</groupId>
     <artifactId>commons.snmp4sdn</artifactId>
-    <version>0.8.0-SNAPSHOT</version>
+    <version>0.9.0-SNAPSHOT</version>
     <relativePath>../../../commons/snmp4sdn</relativePath>
   </parent>
   <artifactId>aclmanager</artifactId>
   <packaging>bundle</packaging>
-  <version>0.8.0-SNAPSHOT</version>
+  <version>0.9.0-SNAPSHOT</version>
 
   <name>acl manager</name>
   <description>acl manager, as a consumer of snmp4sdn, for demo snmp4sdn acl service</description>

diff --git a/mdsal/caller/fdbmanager/pom.xml b/mdsal/caller/fdbmanager/pom.xml
index cc3872f84c56f80fa5a37f71abd4661de6fcfdd9..6c8c5978a29df6e6f5c8e5bca0d9b94d1379e077 100644 (file)
--- a/mdsal/caller/fdbmanager/pom.xml
+++ b/mdsal/caller/fdbmanager/pom.xml
@@ -8,12 +8,12 @@
   <parent>
     <groupId>org.opendaylight.snmp4sdn</groupId>
     <artifactId>commons.snmp4sdn</artifactId>
-    <version>0.8.0-SNAPSHOT</version>
+    <version>0.9.0-SNAPSHOT</version>
     <relativePath>../../../commons/snmp4sdn</relativePath>
   </parent>
   <artifactId>fdbmanager</artifactId>
   <packaging>bundle</packaging>
-  <version>0.8.0-SNAPSHOT</version>
+  <version>0.9.0-SNAPSHOT</version>
 
   <name>fdb manager</name>
   <description>fdb manager, as a consumer of snmp4sdn, for demo snmp4sdn fdb service</description>

diff --git a/mdsal/caller/miscconfigmanager/pom.xml b/mdsal/caller/miscconfigmanager/pom.xml
index ae8e37bf6da0e531443cacd406b09b43e5862429..0efffbc4d9961715081d4ae4d63e198f3d8c4976 100644 (file)
--- a/mdsal/caller/miscconfigmanager/pom.xml
+++ b/mdsal/caller/miscconfigmanager/pom.xml
@@ -8,12 +8,12 @@
   <parent>
     <groupId>org.opendaylight.snmp4sdn</groupId>
     <artifactId>commons.snmp4sdn</artifactId>
-    <version>0.8.0-SNAPSHOT</version>
+    <version>0.9.0-SNAPSHOT</version>
     <relativePath>../../../commons/snmp4sdn</relativePath>
   </parent>
   <artifactId>miscconfigmanager</artifactId>
   <packaging>bundle</packaging>
-  <version>0.8.0-SNAPSHOT</version>
+  <version>0.9.0-SNAPSHOT</version>
 
   <name>miscconfig manager</name>
   <description>misc config manager, as a consumer of snmp4sdn, for demo snmp4sdn misc config service</description>

diff --git a/mdsal/caller/vlanmanager/pom.xml b/mdsal/caller/vlanmanager/pom.xml
index 2edc1c9470f6d6a0b3eda326c5207a881a46fc6c..1226efa0c0dd12b60301bb4b6cfb5c8b5cd6912f 100644 (file)
--- a/mdsal/caller/vlanmanager/pom.xml
+++ b/mdsal/caller/vlanmanager/pom.xml
@@ -8,13 +8,13 @@
   <parent>
     <groupId>org.opendaylight.snmp4sdn</groupId>
     <artifactId>commons.snmp4sdn</artifactId>
-    <version>0.8.0-SNAPSHOT</version>
+    <version>0.9.0-SNAPSHOT</version>
     <relativePath>../../../commons/snmp4sdn</relativePath>
   </parent>
 
   <artifactId>vlanmanager</artifactId>
   <packaging>bundle</packaging>
-  <version>0.8.0-SNAPSHOT</version>
+  <version>0.9.0-SNAPSHOT</version>
 
   <name>vlan manager</name>
   <description>vlan manager, as a consumer of snmp4sdn, for demo snmp4sdn vlan service</description>

diff --git a/mdsal/model/pom.xml b/mdsal/model/pom.xml
index c1bfbe69ece61339dce32b73b9726b19fa005f84..610bcd6a7286b991b4fbac8c0ed85ffcd1838127 100644 (file)
--- a/mdsal/model/pom.xml
+++ b/mdsal/model/pom.xml
@@ -4,13 +4,13 @@
     <parent>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>binding-parent</artifactId>
-      <version>0.13.0-SNAPSHOT</version>
+      <version>3.0.6</version>
       <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.snmp4sdn</groupId>
     <artifactId>md-model</artifactId>
-    <version>0.8.0-SNAPSHOT</version>
+    <version>0.9.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>MD-SAL models</name>

diff --git a/plugin-shell/pom.xml b/plugin-shell/pom.xml
index 7eb33dbb0dac0a36b42032ab749158ee939aba54..2cc74c435db976c8e81efdcffa509e164cf0d312 100644 (file)
--- a/plugin-shell/pom.xml
+++ b/plugin-shell/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.opendaylight.snmp4sdn</groupId>
     <artifactId>commons.snmp4sdn</artifactId>
-    <version>0.8.0-SNAPSHOT</version>
+    <version>0.9.0-SNAPSHOT</version>
     <relativePath>../commons/snmp4sdn</relativePath>
   </parent>
 
   <artifactId>plugin-shell</artifactId>
-  <version>0.8.0-SNAPSHOT</version>
+  <version>0.9.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>snmp4sdn plugin shell</name>
@@ -57,7 +57,7 @@
     <dependency><!--add by s4s-->
       <groupId>org.opendaylight.snmp4sdn</groupId>
       <artifactId>snmp4sdn</artifactId>
-      <version>0.8.0-SNAPSHOT</version>
+      <version>0.9.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

diff --git a/pom.xml b/pom.xml
index 194799c4f960ddc9ed434f503911be67ee08f42c..70611994de7a2d0e48ce879fa1f4d552eb856ede 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.opendaylight.snmp4sdn</groupId>
     <artifactId>commons.parent</artifactId>
-    <version>0.8.0-SNAPSHOT</version>
+    <version>0.9.0-SNAPSHOT</version>
     <relativePath>commons/parent</relativePath>
   </parent>
 
   <artifactId>snmp4sdn_distribution</artifactId>
-  <version>0.8.0-SNAPSHOT</version>
+  <version>0.9.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>snmp4sdn project</name>

diff --git a/snmp4sdn/pom.xml b/snmp4sdn/pom.xml
index e7969b514c7c9acd8f18b14e95d0031b100086c7..90ec5286468a40608babfa7384b72f2f0a03ac39 100644 (file)
--- a/snmp4sdn/pom.xml
+++ b/snmp4sdn/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.opendaylight.snmp4sdn</groupId>
     <artifactId>commons.snmp4sdn</artifactId>
-    <version>0.8.0-SNAPSHOT</version>
+    <version>0.9.0-SNAPSHOT</version>
     <relativePath>../commons/snmp4sdn</relativePath>
   </parent>
 
   <artifactId>snmp4sdn</artifactId>
-  <version>0.8.0-SNAPSHOT</version>
+  <version>0.9.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>snmp4sdn plugin</name>
@@ -74,10 +74,10 @@
               org.opendaylight.yang.gen.v1.urn.opendaylight.snmp4sdn.md.topology.rev150901.get.edge.list.output,<!--md-sal-->
               org.opendaylight.yang.gen.v1.urn.opendaylight.snmp4sdn.md.topology.rev150901.get.node.list.output,<!--md-sal-->
               org.opendaylight.yang.gen.v1.urn.opendaylight.snmp4sdn.md.topology.rev150901.get.node.connector.list.output,<!--md-sal-->
-              org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819,<!--md-sal-->
-              org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node,<!--md-sal-->
-              org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes,<!--md-sal-->
-              org.opendaylight.yang.gen.v1.urn.opendaylight.flow.topology.discovery.rev130819,<!--md-sal-->
+              <!--org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819,
+              org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node,
+              org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes,
+              org.opendaylight.yang.gen.v1.urn.opendaylight.flow.topology.discovery.rev130819,--><!--currently snmp4sdn disable topology change reporting via mdsal, so we disable these-->
               <!--com.google.common.collect,//md-sal-->
               org.opendaylight.yangtools.yang.common,<!--md-sal copy from ping example-->
               org.opendaylight.yangtools.yang.binding,<!--md-sal copy from ping example-->
@@ -179,16 +179,16 @@
      <artifactId>yang-binding</artifactId>
      <version>${mdsal.model.version}</version><!--yiling-->
    </dependency>
-    <dependency>
+    <!--<dependency>
       <groupId>org.opendaylight.openflowplugin.model</groupId>
       <artifactId>model-flow-service</artifactId>
-      <version>0.7.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
+      <version>0.7.2-SNAPSHOT</version>
+    </dependency>--><!--openflowplugin is not at all used in snmp4sdn-->
+    <!--<dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-topology</artifactId>
-      <version>2013.10.21.13.0-SNAPSHOT</version>
-    </dependency>
+      <version>2013.10.21.13.3-SNAPSHOT</version>
+    </dependency>--><!--currently snmp4sdn disable topology change reporting via mdsal, so we disable this dep-->
     <dependency>
       <groupId>org.opendaylight.snmp4sdn</groupId>
       <artifactId>md-model</artifactId>
@@ -202,6 +202,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
+      <version>3.8</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>

diff --git a/snmp4sdn/src/main/java/org/opendaylight/snmp4sdn/internal/TopologyServices.java b/snmp4sdn/src/main/java/org/opendaylight/snmp4sdn/internal/TopologyServices.java
index cc16e0f7bbe47ce61c5ecb9972a091f7ce18da30..4fc8c15273eebd7c9a0691d1e694c0767f1a04a5 100644 (file)
--- a/snmp4sdn/src/main/java/org/opendaylight/snmp4sdn/internal/TopologyServices.java
+++ b/snmp4sdn/src/main/java/org/opendaylight/snmp4sdn/internal/TopologyServices.java
@@ -30,7 +30,7 @@ import org.opendaylight.snmp4sdn.ITopologyService;
 
 import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
+/*import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
@@ -41,7 +41,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.No
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.topology.discovery.rev130819.LinkDiscovered;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.topology.discovery.rev130819.LinkDiscoveredBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.topology.discovery.rev130819.LinkRemoved;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.topology.discovery.rev130819.LinkRemovedBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.topology.discovery.rev130819.LinkRemovedBuilder;*/
 
 public class TopologyServices implements ITopologyServiceShimListener,
         IPluginInTopologyService, ITopologyService {