kmcpeake

[ONOS-3203] Migrate to 1.5.0-SNAPHOT

Fix merge problem with Change-Id: If9ce4ca5f5f6d089e9f088e710367f4e2ca1c9b6

Change-Id: I56a5b7c67085c1cd31a7274ece55f962e908d01b
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
24 <parent> 24 <parent>
25 <groupId>org.onosproject</groupId> 25 <groupId>org.onosproject</groupId>
26 <artifactId>onos-app-fm</artifactId> 26 <artifactId>onos-app-fm</artifactId>
27 - <version>1.4.0-SNAPSHOT</version> 27 + <version>1.5.0-SNAPSHOT</version>
28 <relativePath>../pom.xml</relativePath> 28 <relativePath>../pom.xml</relativePath>
29 </parent> 29 </parent>
30 30
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 <parent> 22 <parent>
23 <groupId>org.onosproject</groupId> 23 <groupId>org.onosproject</groupId>
24 <artifactId>onos-app-fm</artifactId> 24 <artifactId>onos-app-fm</artifactId>
25 - <version>1.4.0-SNAPSHOT</version> 25 + <version>1.5.0-SNAPSHOT</version>
26 <relativePath>../pom.xml</relativePath> 26 <relativePath>../pom.xml</relativePath>
27 </parent> 27 </parent>
28 28
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 <parent> 22 <parent>
23 <groupId>org.onosproject</groupId> 23 <groupId>org.onosproject</groupId>
24 <artifactId>onos-snmp-providers</artifactId> 24 <artifactId>onos-snmp-providers</artifactId>
25 - <version>1.4.0-SNAPSHOT</version> 25 + <version>1.5.0-SNAPSHOT</version>
26 <relativePath>../pom.xml</relativePath> 26 <relativePath>../pom.xml</relativePath>
27 </parent> 27 </parent>
28 28
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 <parent> 22 <parent>
23 <groupId>org.onosproject</groupId> 23 <groupId>org.onosproject</groupId>
24 <artifactId>onos-snmp-providers</artifactId> 24 <artifactId>onos-snmp-providers</artifactId>
25 - <version>1.4.0-SNAPSHOT</version> 25 + <version>1.5.0-SNAPSHOT</version>
26 <relativePath>../pom.xml</relativePath> 26 <relativePath>../pom.xml</relativePath>
27 </parent> 27 </parent>
28 28
...@@ -61,4 +61,4 @@ ...@@ -61,4 +61,4 @@
61 </build> 61 </build>
62 62
63 </project> 63 </project>
64 -
...\ No newline at end of file ...\ No newline at end of file
64 +
......