Bump up ONOS to version 2.3.1 of yangtools
Change-Id: I96c3ce7672df6c11f9049eb8462b395b75087da2
diff --git a/apps/yang/src/main/java/org/onosproject/yang/impl/YangRuntimeManager.java b/apps/yang/src/main/java/org/onosproject/yang/impl/YangRuntimeManager.java
index 5d9a076..950a63e 100644
--- a/apps/yang/src/main/java/org/onosproject/yang/impl/YangRuntimeManager.java
+++ b/apps/yang/src/main/java/org/onosproject/yang/impl/YangRuntimeManager.java
@@ -163,6 +163,17 @@
}
@Override
+ public void registerAnydataSchema(Class id, Class id1) {
+ throw new UnsupportedOperationException("registerAnydataSchema() needs to be implemented");
+ }
+
+ @Override
+ public void unregisterAnydataSchema(Class id, Class id1) {
+ throw new UnsupportedOperationException("unregisterAnydataSchema() needs to be implemented");
+
+ }
+
+ @Override
public SchemaContext getSchemaContext(ResourceId resourceId) {
checkNotNull(resourceId, " resource id can't be null.");
NodeKey key = resourceId.nodeKeys().get(0);
diff --git a/drivers/microsemi/src/test/java/org/onosproject/yang/MockYangRuntimeManager.java b/drivers/microsemi/src/test/java/org/onosproject/yang/MockYangRuntimeManager.java
index 1a941e0..3bebf4c 100644
--- a/drivers/microsemi/src/test/java/org/onosproject/yang/MockYangRuntimeManager.java
+++ b/drivers/microsemi/src/test/java/org/onosproject/yang/MockYangRuntimeManager.java
@@ -130,6 +130,17 @@
}
@Override
+ public void registerAnydataSchema(Class id, Class id1) {
+ throw new UnsupportedOperationException("registerAnydataSchema() needs to be implemented");
+ }
+
+ @Override
+ public void unregisterAnydataSchema(Class id, Class id1) {
+ throw new UnsupportedOperationException("unregisterAnydataSchema() needs to be implemented");
+
+ }
+
+ @Override
public Set<YangSerializer> getSerializers() {
return serializerRegistry.getSerializers();
}
diff --git a/lib/BUCK b/lib/BUCK
index a2ecb14..b26fdf5 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Wed, 15 Nov 2017 22:08:56 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Thu, 30 Nov 2017 18:21:47 GMT. Do not edit this file manually. *****
# ***** Use onos-lib-gen *****
pass_thru_pom(
@@ -1249,55 +1249,55 @@
remote_jar (
name = 'onos-yang-model',
- out = 'onos-yang-model-2.3.jar',
- url = 'mvn:org.onosproject:onos-yang-model:jar:2.3',
- sha1 = 'fcf992089acd1c9cc8333197b0c55466a47bd323',
- maven_coords = 'org.onosproject:onos-yang-model:2.3',
+ out = 'onos-yang-model-2.3.1.jar',
+ url = 'mvn:org.onosproject:onos-yang-model:jar:2.3.1',
+ sha1 = 'ffe8a79368ae816220a47bb9cad39e2d48ae415d',
+ maven_coords = 'org.onosproject:onos-yang-model:2.3.1',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'onos-yang-compiler-api',
- out = 'onos-yang-compiler-api-2.3.jar',
- url = 'mvn:org.onosproject:onos-yang-compiler-api:jar:2.3',
- sha1 = 'ffd675b28b4e06ddde1825fa32f0e1d8b5ed5344',
- maven_coords = 'org.onosproject:onos-yang-compiler-api:2.3',
+ out = 'onos-yang-compiler-api-2.3.1.jar',
+ url = 'mvn:org.onosproject:onos-yang-compiler-api:jar:2.3.1',
+ sha1 = '11edae3442f9fc8b4cb69aec2004203189fb3034',
+ maven_coords = 'org.onosproject:onos-yang-compiler-api:2.3.1',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'onos-yang-runtime',
- out = 'onos-yang-runtime-2.3.jar',
- url = 'mvn:org.onosproject:onos-yang-runtime:jar:2.3',
- sha1 = '8406d50dba81ed879c9ec85db9702dc346b3fad4',
- maven_coords = 'org.onosproject:onos-yang-runtime:2.3',
+ out = 'onos-yang-runtime-2.3.1.jar',
+ url = 'mvn:org.onosproject:onos-yang-runtime:jar:2.3.1',
+ sha1 = 'b5da218f5841a39787aff51a58d154a76f07d249',
+ maven_coords = 'org.onosproject:onos-yang-runtime:2.3.1',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'onos-yang-serializers-json',
- out = 'onos-yang-serializers-json-2.3.jar',
- url = 'mvn:org.onosproject:onos-yang-serializers-json:jar:2.3',
- sha1 = 'e182fcfe11233eae444140ab79d18501a289b823',
- maven_coords = 'org.onosproject:onos-yang-serializers-json:2.3',
+ out = 'onos-yang-serializers-json-2.3.1.jar',
+ url = 'mvn:org.onosproject:onos-yang-serializers-json:jar:2.3.1',
+ sha1 = '8f101d36ebcb14176121ddfddd15599c07967138',
+ maven_coords = 'org.onosproject:onos-yang-serializers-json:2.3.1',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'onos-yang-serializers-xml',
- out = 'onos-yang-serializers-xml-2.3.jar',
- url = 'mvn:org.onosproject:onos-yang-serializers-xml:jar:2.3',
- sha1 = '6c0b2d40a5d6d5b399a9e54e47d05fa79c185dbd',
- maven_coords = 'org.onosproject:onos-yang-serializers-xml:2.3',
+ out = 'onos-yang-serializers-xml-2.3.1.jar',
+ url = 'mvn:org.onosproject:onos-yang-serializers-xml:jar:2.3.1',
+ sha1 = '58090e77105c6f0cbf594b7130263056d4f9a473',
+ maven_coords = 'org.onosproject:onos-yang-serializers-xml:2.3.1',
visibility = [ 'PUBLIC' ],
)
remote_jar (
name = 'onos-yang-serializers-utils',
- out = 'onos-yang-serializers-utils-2.3.jar',
- url = 'mvn:org.onosproject:onos-yang-serializers-utils:jar:2.3',
- sha1 = '3ab96f3087f7d4c97edc791be90db9340f1832fa',
- maven_coords = 'org.onosproject:onos-yang-serializers-utils:2.3',
+ out = 'onos-yang-serializers-utils-2.3.1.jar',
+ url = 'mvn:org.onosproject:onos-yang-serializers-utils:jar:2.3.1',
+ sha1 = '58d6d3a6b10e236b1b65230a02cd7c2389478645',
+ maven_coords = 'org.onosproject:onos-yang-serializers-utils:2.3.1',
visibility = [ 'PUBLIC' ],
)
diff --git a/lib/deps.json b/lib/deps.json
index 01541d6..59fdddf 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -238,12 +238,12 @@
"openstack4j-http-connector": "mvn:org.pacesys.openstack4j.connectors:openstack4j-http-connector:2.11",
"openstack4j-httpclient": "mvn:org.pacesys.openstack4j.connectors:openstack4j-httpclient:2.11",
// Note: update BVER in tools/dev/bin/patch-yang-libs
- "onos-yang-model":"mvn:org.onosproject:onos-yang-model:2.3",
- "onos-yang-compiler-api":"mvn:org.onosproject:onos-yang-compiler-api:2.3",
- "onos-yang-runtime":"mvn:org.onosproject:onos-yang-runtime:2.3",
- "onos-yang-serializers-json":"mvn:org.onosproject:onos-yang-serializers-json:2.3",
- "onos-yang-serializers-xml":"mvn:org.onosproject:onos-yang-serializers-xml:2.3",
- "onos-yang-serializers-utils":"mvn:org.onosproject:onos-yang-serializers-utils:2.3",
+ "onos-yang-model":"mvn:org.onosproject:onos-yang-model:2.3.1",
+ "onos-yang-compiler-api":"mvn:org.onosproject:onos-yang-compiler-api:2.3.1",
+ "onos-yang-runtime":"mvn:org.onosproject:onos-yang-runtime:2.3.1",
+ "onos-yang-serializers-json":"mvn:org.onosproject:onos-yang-serializers-json:2.3.1",
+ "onos-yang-serializers-xml":"mvn:org.onosproject:onos-yang-serializers-xml:2.3.1",
+ "onos-yang-serializers-utils":"mvn:org.onosproject:onos-yang-serializers-utils:2.3.1",
"org.apache.servicemix.bundles.dom4j":"mvn:org.apache.servicemix.bundles:org.apache.servicemix.bundles.dom4j:1.6.1_5",
"plexus-utils": "mvn:org.codehaus.plexus:plexus-utils:3.0.24",
"sshd-core": "mvn:org.apache.sshd:sshd-core:1.4.0",
diff --git a/lib/pom.xml b/lib/pom.xml
index f9e9ebd..12045a9 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -40,7 +40,7 @@
<netty4.version>4.1.8.Final</netty4.version>
<openflowj.version>3.2.0.onos</openflowj.version>
<onos-maven-plugin.version>1.10</onos-maven-plugin.version>
- <onos-yang-tools.version>2.3</onos-yang-tools.version>
+ <onos-yang-tools.version>2.3.1</onos-yang-tools.version>
<osgi.version>5.0.0</osgi.version>
<karaf.version>3.0.8</karaf.version>
<jersey.version>2.25.1</jersey.version>
diff --git a/tools/build/onos-buck b/tools/build/onos-buck
index 8162a4e..2e3a149 100755
--- a/tools/build/onos-buck
+++ b/tools/build/onos-buck
@@ -5,8 +5,8 @@
set -e
-BUCK_URL="http://onlab.vicci.org/onos/third-party/buck-v2017.11.15.01.zip"
-BUCK_SHA="ce53b55f4e4f492dafce5fb9af312be751bd9054"
+BUCK_URL="http://onlab.vicci.org/onos/third-party/buck-v2017.11.30.01.zip"
+BUCK_SHA="8f8d807f591d72adfab212fd405237a398e2e836"
[ "-U" = "$1" ] && shift && FORCE_UPDATE=True
diff --git a/tools/dev/bin/patch-yang-libs b/tools/dev/bin/patch-yang-libs
index 6cd96e7..9e590d7 100755
--- a/tools/dev/bin/patch-yang-libs
+++ b/tools/dev/bin/patch-yang-libs
@@ -3,7 +3,7 @@
# Patches lib/BUCK file to use locally built YANG tools.
# -----------------------------------------------------------------------------
-BVER=2.3
+BVER=2.3.1
SVER=2.4-SNAPSHOT
YANG_TOOLS_ROOT=${YANG_TOOLS_ROOT:-~/onos-yang-tools}