From 5193cb736c41d52f6007e7e2bdfd619b7598604f Mon Sep 17 00:00:00 2001 From: Ray Milkey Date: Fri, 9 Feb 2018 11:21:32 -0800 Subject: [PATCH] Bump yang tools version to 2.4 Change-Id: I7fada36e6ecd93d761c41ba70f057ce3a62b842b --- .../yang/impl/YangRuntimeManager.java | 4 +- .../yang/MockYangRuntimeManager.java | 21 ++++---- lib/BUCK | 50 +++++++++---------- lib/deps.json | 12 ++--- lib/pom.xml | 2 +- tools/build/onos-buck | 4 +- tools/dev/bin/patch-yang-libs | 4 +- 7 files changed, 50 insertions(+), 47 deletions(-) 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 950a63e866..c338c333fa 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 @@ -26,6 +26,7 @@ import org.onosproject.core.CoreService; import org.onosproject.yang.YangClassLoaderRegistry; import org.onosproject.yang.model.ModelConverter; import org.onosproject.yang.model.ModelObjectData; +import org.onosproject.yang.model.ModelObjectId; import org.onosproject.yang.model.NodeKey; import org.onosproject.yang.model.ResourceData; import org.onosproject.yang.model.ResourceId; @@ -163,7 +164,8 @@ public class YangRuntimeManager implements YangModelRegistry, } @Override - public void registerAnydataSchema(Class id, Class id1) { + public void registerAnydataSchema(ModelObjectId arg0, ModelObjectId arg1) + throws IllegalArgumentException { throw new UnsupportedOperationException("registerAnydataSchema() needs to be implemented"); } 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 3bebf4c182..5cfa3ef3b2 100644 --- a/drivers/microsemi/src/test/java/org/onosproject/yang/MockYangRuntimeManager.java +++ b/drivers/microsemi/src/test/java/org/onosproject/yang/MockYangRuntimeManager.java @@ -23,6 +23,7 @@ import org.onosproject.core.CoreService; import org.onosproject.drivers.netconf.MockCoreService; import org.onosproject.yang.model.ModelConverter; import org.onosproject.yang.model.ModelObjectData; +import org.onosproject.yang.model.ModelObjectId; import org.onosproject.yang.model.NodeKey; import org.onosproject.yang.model.ResourceData; import org.onosproject.yang.model.ResourceId; @@ -109,17 +110,17 @@ public class MockYangRuntimeManager implements YangModelRegistry, return modelRegistry.getModels(); } - @Override - public YangModel getModel(String s) { - return modelRegistry.getModel(s); - } + @Override + public YangModel getModel(String s) { + return modelRegistry.getModel(s); + } - @Override - public YangModule getModule(YangModuleId yangModuleId) { - return modelRegistry.getModule(yangModuleId); - } + @Override + public YangModule getModule(YangModuleId yangModuleId) { + return modelRegistry.getModule(yangModuleId); + } - @Override + @Override public void registerSerializer(YangSerializer ys) { serializerRegistry.registerSerializer(ys); } @@ -130,7 +131,7 @@ public class MockYangRuntimeManager implements YangModelRegistry, } @Override - public void registerAnydataSchema(Class id, Class id1) { + public void registerAnydataSchema(ModelObjectId arg0, ModelObjectId arg1) { throw new UnsupportedOperationException("registerAnydataSchema() needs to be implemented"); } diff --git a/lib/BUCK b/lib/BUCK index 3feb1b36fc..8a82203e1c 100644 --- a/lib/BUCK +++ b/lib/BUCK @@ -1,4 +1,4 @@ -# ***** This file was auto-generated at Fri, 9 Feb 2018 12:32:20 GMT. Do not edit this file manually. ***** +# ***** This file was auto-generated at Fri, 9 Feb 2018 19:42:50 GMT. Do not edit this file manually. ***** # ***** Use onos-lib-gen ***** pass_thru_pom( @@ -1340,55 +1340,55 @@ remote_jar ( remote_jar ( name = 'onos-yang-model', - 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', + out = 'onos-yang-model-2.4.jar', + url = 'mvn:org.onosproject:onos-yang-model:jar:2.4', + sha1 = '1afb955024cbb8db15d30e7b4e0b1bb9ad20b712', + maven_coords = 'org.onosproject:onos-yang-model:2.4', visibility = [ 'PUBLIC' ], ) remote_jar ( name = 'onos-yang-compiler-api', - 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', + out = 'onos-yang-compiler-api-2.4.jar', + url = 'mvn:org.onosproject:onos-yang-compiler-api:jar:2.4', + sha1 = '1457d2f9c509155fd249d042b9c1200bd74c2669', + maven_coords = 'org.onosproject:onos-yang-compiler-api:2.4', visibility = [ 'PUBLIC' ], ) remote_jar ( name = 'onos-yang-runtime', - 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', + out = 'onos-yang-runtime-2.4.jar', + url = 'mvn:org.onosproject:onos-yang-runtime:jar:2.4', + sha1 = 'c422d7f87c5baa79edf0a322bdfe40aff1530ef4', + maven_coords = 'org.onosproject:onos-yang-runtime:2.4', visibility = [ 'PUBLIC' ], ) remote_jar ( name = 'onos-yang-serializers-json', - 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', + out = 'onos-yang-serializers-json-2.4.jar', + url = 'mvn:org.onosproject:onos-yang-serializers-json:jar:2.4', + sha1 = '9b22a27c27912e7df8721268f23639312c21d361', + maven_coords = 'org.onosproject:onos-yang-serializers-json:2.4', visibility = [ 'PUBLIC' ], ) remote_jar ( name = 'onos-yang-serializers-xml', - 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', + out = 'onos-yang-serializers-xml-2.4.jar', + url = 'mvn:org.onosproject:onos-yang-serializers-xml:jar:2.4', + sha1 = '02e3155af7326fabe268048ab970267f2047f487', + maven_coords = 'org.onosproject:onos-yang-serializers-xml:2.4', visibility = [ 'PUBLIC' ], ) remote_jar ( name = 'onos-yang-serializers-utils', - 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', + out = 'onos-yang-serializers-utils-2.4.jar', + url = 'mvn:org.onosproject:onos-yang-serializers-utils:jar:2.4', + sha1 = 'a4e7f6f87ebf17b9f5f800765dcc562a40c2c08c', + maven_coords = 'org.onosproject:onos-yang-serializers-utils:2.4', visibility = [ 'PUBLIC' ], ) diff --git a/lib/deps.json b/lib/deps.json index bdad81040f..6233aac8c3 100644 --- a/lib/deps.json +++ b/lib/deps.json @@ -248,12 +248,12 @@ "guava20": "mvn:com.google.guava:guava:20.0", // Note: update BVER in tools/dev/bin/patch-yang-libs - "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", + "onos-yang-model":"mvn:org.onosproject:onos-yang-model:2.4", + "onos-yang-compiler-api":"mvn:org.onosproject:onos-yang-compiler-api:2.4", + "onos-yang-runtime":"mvn:org.onosproject:onos-yang-runtime:2.4", + "onos-yang-serializers-json":"mvn:org.onosproject:onos-yang-serializers-json:2.4", + "onos-yang-serializers-xml":"mvn:org.onosproject:onos-yang-serializers-xml:2.4", + "onos-yang-serializers-utils":"mvn:org.onosproject:onos-yang-serializers-utils:2.4", "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 8cc00c4c59..95f56409ce 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -40,7 +40,7 @@ 4.1.8.Final 3.2.0.onos 1.11 - 2.3.1 + 2.4 5.0.0 3.0.8 2.25.1 diff --git a/tools/build/onos-buck b/tools/build/onos-buck index f9452c85a1..9ebed5d598 100755 --- a/tools/build/onos-buck +++ b/tools/build/onos-buck @@ -5,8 +5,8 @@ set -e -BUCK_URL="http://repo1.maven.org/maven2/org/onosproject/onos-buck/v2018.01.17.01/buck-v2018.01.17.01.zip" -BUCK_SHA="4a70a84ef40a06762a7248db25590696e80af9fe" +BUCK_URL="http://repo1.maven.org/maven2/org/onosproject/onos-buck/v2018.02.09.01/buck-v2018.02.09.01.zip" +BUCK_SHA="45d8bd28f441991257babf89f7a317edb3a2b536" [ "-U" = "$1" ] && shift && FORCE_UPDATE=True diff --git a/tools/dev/bin/patch-yang-libs b/tools/dev/bin/patch-yang-libs index 9e590d7c6f..3e269fef62 100755 --- a/tools/dev/bin/patch-yang-libs +++ b/tools/dev/bin/patch-yang-libs @@ -3,8 +3,8 @@ # Patches lib/BUCK file to use locally built YANG tools. # ----------------------------------------------------------------------------- -BVER=2.3.1 -SVER=2.4-SNAPSHOT +BVER=2.4 +SVER=2.5-SNAPSHOT YANG_TOOLS_ROOT=${YANG_TOOLS_ROOT:-~/onos-yang-tools}