diff --git a/pom.xml b/pom.xml
index 47d26fa..aa4905d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,13 +22,13 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-dependencies</artifactId>
-        <version>1.8.0</version>
+        <version>1.10.3</version>
         <relativePath></relativePath>
     </parent>
 
     <groupId>org.opencord</groupId>
     <artifactId>vtn</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <description>Virtual tenant network service for CORD</description>
@@ -51,7 +51,9 @@
             APIs for interacting with the CORD VTN application.
         </api.description>
 	<api.package>org.opencord.cordvtn.rest</api.package>
-	<cord.config.version>1.2.0-SNAPSHOT</cord.config.version>
+        <cord.config.version>1.3.0-SNAPSHOT</cord.config.version>
+        <!-- TODO onos-build-conf.version can be dropped when onos.version > 1.10.3 -->
+        <onos-build-conf.version>1.10.3-onf</onos-build-conf.version>
     </properties>
 
     <dependencies>
diff --git a/src/main/java/org/opencord/cordvtn/api/core/ServiceNetworkStore.java b/src/main/java/org/opencord/cordvtn/api/core/ServiceNetworkStore.java
index 6b68a6b..341f3c2 100644
--- a/src/main/java/org/opencord/cordvtn/api/core/ServiceNetworkStore.java
+++ b/src/main/java/org/opencord/cordvtn/api/core/ServiceNetworkStore.java
@@ -103,6 +103,7 @@
      * Removes service port.
      *
      * @param portId port id
+     * @return service port removed
      */
     ServicePort removeServicePort(PortId portId);
 }
diff --git a/src/main/java/org/opencord/cordvtn/api/node/CordVtnNodeState.java b/src/main/java/org/opencord/cordvtn/api/node/CordVtnNodeState.java
index 9d8f196..aaa3f8d 100644
--- a/src/main/java/org/opencord/cordvtn/api/node/CordVtnNodeState.java
+++ b/src/main/java/org/opencord/cordvtn/api/node/CordVtnNodeState.java
@@ -76,6 +76,7 @@
 
     /**
      * Returns the next node state.
+     * @return next node state
      */
     public abstract CordVtnNodeState nextState();
 }
diff --git a/src/main/java/org/opencord/cordvtn/rest/ServicePortWebResource.java b/src/main/java/org/opencord/cordvtn/rest/ServicePortWebResource.java
index 88cc665..dfdefad 100644
--- a/src/main/java/org/opencord/cordvtn/rest/ServicePortWebResource.java
+++ b/src/main/java/org/opencord/cordvtn/rest/ServicePortWebResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-present Open Porting Laboratory
+ * Copyright 2016-present Open Networking Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.