Bump up ONOS to yang tools version 2.0
Change-Id: Ib22b256a15096c29eee83938866d06d283c37c4c
diff --git a/apps/config/pom.xml b/apps/config/pom.xml
index b5eb7a6..9f68e3f 100755
--- a/apps/config/pom.xml
+++ b/apps/config/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-yang-model</artifactId>
- <version>1.12.0-b8</version>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
diff --git a/apps/netconf/client/src/main/java/org/onosproject/netconf/client/impl/NetconfTranslatorImpl.java b/apps/netconf/client/src/main/java/org/onosproject/netconf/client/impl/NetconfTranslatorImpl.java
index 87ff7b9..b8ecbf2 100644
--- a/apps/netconf/client/src/main/java/org/onosproject/netconf/client/impl/NetconfTranslatorImpl.java
+++ b/apps/netconf/client/src/main/java/org/onosproject/netconf/client/impl/NetconfTranslatorImpl.java
@@ -52,7 +52,7 @@
import org.onosproject.yang.runtime.DefaultYangSerializerContext;
import org.onosproject.yang.runtime.YangRuntimeService;
import org.onosproject.yang.runtime.YangSerializerContext;
-import org.onosproject.yang.runtime.helperutils.SerializerHelper;
+import org.onosproject.yang.runtime.SerializerHelper;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -71,7 +71,7 @@
import static com.google.common.base.Preconditions.checkNotNull;
import static org.onosproject.netconf.TargetConfig.RUNNING;
import static org.onosproject.yang.model.DataNode.Type.SINGLE_INSTANCE_LEAF_VALUE_NODE;
-import static org.onosproject.yang.runtime.helperutils.SerializerHelper.addDataNode;
+import static org.onosproject.yang.runtime.SerializerHelper.addDataNode;
/*FIXME these imports are not visible using OSGI*/
diff --git a/apps/restconf/restconfmgr/pom.xml b/apps/restconf/restconfmgr/pom.xml
index 68f4efe..4f014de 100644
--- a/apps/restconf/restconfmgr/pom.xml
+++ b/apps/restconf/restconfmgr/pom.xml
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-yang-model</artifactId>
- <version>1.12.0-b8</version>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
diff --git a/apps/restconf/utils/pom.xml b/apps/restconf/utils/pom.xml
index f5ba9e1..5ec1e13 100644
--- a/apps/restconf/utils/pom.xml
+++ b/apps/restconf/utils/pom.xml
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-yang-runtime</artifactId>
- <version>1.12.0-b8</version>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>org.onosproject</groupId>
diff --git a/drivers/huawei/driver/pom.xml b/drivers/huawei/driver/pom.xml
index 373c23d..fc26a56 100644
--- a/drivers/huawei/driver/pom.xml
+++ b/drivers/huawei/driver/pom.xml
@@ -31,7 +31,7 @@
<description>Huawei driver implementation</description>
<properties>
- <yang-tool-version>1.12.0-b7</yang-tool-version>
+ <yang-tool-version>2.0</yang-tool-version>
</properties>
<dependencies>
<dependency>
diff --git a/drivers/huawei/yangmodel/pom.xml b/drivers/huawei/yangmodel/pom.xml
index ca28572..e1ad445 100644
--- a/drivers/huawei/yangmodel/pom.xml
+++ b/drivers/huawei/yangmodel/pom.xml
@@ -22,7 +22,7 @@
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-yang-model</artifactId>
- <version>1.12.0-b7</version>
+ <version>2.0</version>
</dependency>
</dependencies>
@@ -43,7 +43,7 @@
<plugin>
<groupId>org.onosproject</groupId>
<artifactId>onos-yang-compiler-maven-plugin</artifactId>
- <version>1.12.0-b7</version>
+ <version>2.0</version>
<executions>
<execution>
<goals>
diff --git a/lib/BUCK b/lib/BUCK
index 8cb7400..cd1497d 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Mon, 15 May 2017 22:50:55 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Tue, 16 May 2017 21:20:19 GMT. Do not edit this file manually. *****
# ***** Use onos-lib-gen *****
pass_thru_pom(
@@ -1191,55 +1191,55 @@
remote_jar (
name = 'onos-yang-model',
- out = 'onos-yang-model-1.12.0-b8.jar',
- url = 'mvn:org.onosproject:onos-yang-model:jar:1.12.0-b8',
- sha1 = '272ab5dd687d20d9a483cc58c8f71da31ee8b1b6',
- maven_coords = 'org.onosproject:onos-yang-model:1.12.0-b8',
+ out = 'onos-yang-model-2.0.jar',
+ url = 'mvn:org.onosproject:onos-yang-model:jar:2.0',
+ sha1 = '9b509898055cf6f4cf4462811f0e301ac2bdf214',
+ maven_coords = 'org.onosproject:onos-yang-model:2.0',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'onos-yang-compiler-api',
- out = 'onos-yang-compiler-api-1.12.0-b8.jar',
- url = 'mvn:org.onosproject:onos-yang-compiler-api:jar:1.12.0-b8',
- sha1 = '0c0961fb0b55b2ba82e3b69216b2fbb1b35b1d6f',
- maven_coords = 'org.onosproject:onos-yang-compiler-api:1.12.0-b8',
+ out = 'onos-yang-compiler-api-2.0.jar',
+ url = 'mvn:org.onosproject:onos-yang-compiler-api:jar:2.0',
+ sha1 = '8daa41e55445f08f0cef345c048fe2dba66d16ee',
+ maven_coords = 'org.onosproject:onos-yang-compiler-api:2.0',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'onos-yang-runtime',
- out = 'onos-yang-runtime-1.12.0-b8.jar',
- url = 'mvn:org.onosproject:onos-yang-runtime:jar:1.12.0-b8',
- sha1 = 'b7f8d35cfe8f57978efc741f56b1431f881a8c83',
- maven_coords = 'org.onosproject:onos-yang-runtime:1.12.0-b8',
+ out = 'onos-yang-runtime-2.0.jar',
+ url = 'mvn:org.onosproject:onos-yang-runtime:jar:2.0',
+ sha1 = '8e4638cf2a3fabd1a0ea133ee917de191212b19f',
+ maven_coords = 'org.onosproject:onos-yang-runtime:2.0',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'onos-yang-serializers-json',
- out = 'onos-yang-serializers-json-1.12.0-b8.jar',
- url = 'mvn:org.onosproject:onos-yang-serializers-json:jar:1.12.0-b8',
- sha1 = '72cb9f767f22c01f0fe7bc1e6d2ba83a20397aa0',
- maven_coords = 'org.onosproject:onos-yang-serializers-json:1.12.0-b8',
+ out = 'onos-yang-serializers-json-2.0.jar',
+ url = 'mvn:org.onosproject:onos-yang-serializers-json:jar:2.0',
+ sha1 = '2f3fe84763ba131fa09ef39b96e45028b771db41',
+ maven_coords = 'org.onosproject:onos-yang-serializers-json:2.0',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'onos-yang-serializers-xml',
- out = 'onos-yang-serializers-xml-1.12.0-b8.jar',
- url = 'mvn:org.onosproject:onos-yang-serializers-xml:jar:1.12.0-b8',
- sha1 = 'cf5b1e7b85883d13efe35d83330cd8bbe8ba7315',
- maven_coords = 'org.onosproject:onos-yang-serializers-xml:1.12.0-b8',
+ out = 'onos-yang-serializers-xml-2.0.jar',
+ url = 'mvn:org.onosproject:onos-yang-serializers-xml:jar:2.0',
+ sha1 = '17a5c110edeb5404c2b2bfc6e244da5d80bad6c9',
+ maven_coords = 'org.onosproject:onos-yang-serializers-xml:2.0',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'onos-yang-serializers-utils',
- out = 'onos-yang-serializers-utils-1.12.0-b8.jar',
- url = 'mvn:org.onosproject:onos-yang-serializers-utils:jar:1.12.0-b8',
- sha1 = 'b0d685c517e9b22d93ccefffdab455f3476545ba',
- maven_coords = 'org.onosproject:onos-yang-serializers-utils:1.12.0-b8',
+ out = 'onos-yang-serializers-utils-2.0.jar',
+ url = 'mvn:org.onosproject:onos-yang-serializers-utils:jar:2.0',
+ sha1 = '86b500b8ed84084c8c05f99f3e1feac8dc3eda35',
+ maven_coords = 'org.onosproject:onos-yang-serializers-utils:2.0',
visibility = [ 'PUBLIC' ],
)
diff --git a/lib/deps.json b/lib/deps.json
index e6074f2..c97e75e 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -213,12 +213,12 @@
"onos-yang-datamodel": "mvn:org.onosproject:onos-yang-datamodel:1.11",
"onos-yang-maven-plugin": "mvn:org.onosproject:onos-yang-maven-plugin:1.11",
"onos-yang-utils-generator": "mvn:org.onosproject:onos-yang-utils-generator:1.11",
- "onos-yang-model":"mvn:org.onosproject:onos-yang-model:1.12.0-b8",
- "onos-yang-compiler-api":"mvn:org.onosproject:onos-yang-compiler-api:1.12.0-b8",
- "onos-yang-runtime":"mvn:org.onosproject:onos-yang-runtime:1.12.0-b8",
- "onos-yang-serializers-json":"mvn:org.onosproject:onos-yang-serializers-json:1.12.0-b8",
- "onos-yang-serializers-xml":"mvn:org.onosproject:onos-yang-serializers-xml:1.12.0-b8",
- "onos-yang-serializers-utils":"mvn:org.onosproject:onos-yang-serializers-utils:1.12.0-b8",
+ "onos-yang-model":"mvn:org.onosproject:onos-yang-model:2.0",
+ "onos-yang-compiler-api":"mvn:org.onosproject:onos-yang-compiler-api:2.0",
+ "onos-yang-runtime":"mvn:org.onosproject:onos-yang-runtime:2.0",
+ "onos-yang-serializers-json":"mvn:org.onosproject:onos-yang-serializers-json:2.0",
+ "onos-yang-serializers-xml":"mvn:org.onosproject:onos-yang-serializers-xml:2.0",
+ "onos-yang-serializers-utils":"mvn:org.onosproject:onos-yang-serializers-utils:2.0",
"org.apache.servicemix.bundles.dom4j":"mvn:org.apache.servicemix.bundles:org.apache.servicemix.bundles.dom4j:1.6.1_5",
"openflowj-3.0": {
"uri": "mvn:org.projectfloodlight:openflowj:3.0.0-SNAPSHOT",