Bumping version of YANG Tools to 2.1; adding YANG smoke STC test.
Change-Id: I8bd719351a5dbe6af286779fdc3ac3105c2bbc62
diff --git a/lib/BUCK b/lib/BUCK
index 5fa76c3..91e5ea2 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1192,55 +1192,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.1.jar',
+ url = 'mvn:org.onosproject:onos-yang-model:jar:2.1',
+ sha1 = '9d6007a856b4827ca97144902a5a76e43d35831d',
+ maven_coords = 'org.onosproject:onos-yang-model:2.1',
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.1.jar',
+ url = 'mvn:org.onosproject:onos-yang-compiler-api:jar:2.1',
+ sha1 = 'ceeb6e18a046b94ba5826eecff3ee0ba7630ede3',
+ maven_coords = 'org.onosproject:onos-yang-compiler-api:2.1',
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.1.jar',
+ url = 'mvn:org.onosproject:onos-yang-runtime:jar:2.1',
+ sha1 = '70324c27c451ef15b2ca792a829c43c633a2e1a2',
+ maven_coords = 'org.onosproject:onos-yang-runtime:2.1',
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.1.jar',
+ url = 'mvn:org.onosproject:onos-yang-serializers-json:jar:2.1',
+ sha1 = '82cfd71ff3e5e5f5d512cab758a79537b5b6b097',
+ maven_coords = 'org.onosproject:onos-yang-serializers-json:2.1',
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.1.jar',
+ url = 'mvn:org.onosproject:onos-yang-serializers-xml:jar:2.1',
+ sha1 = '0b4a5fac8c9f37792b1e236403f58b277d00166e',
+ maven_coords = 'org.onosproject:onos-yang-serializers-xml:2.1',
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.1.jar',
+ url = 'mvn:org.onosproject:onos-yang-serializers-utils:jar:2.1',
+ sha1 = '31076029d26a02696a3deeaaeb3c96c2032033a5',
+ maven_coords = 'org.onosproject:onos-yang-serializers-utils:2.1',
visibility = [ 'PUBLIC' ],
)
diff --git a/lib/deps.json b/lib/deps.json
index 8d1d463..a365106 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -214,12 +214,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.1",
+ "onos-yang-compiler-api":"mvn:org.onosproject:onos-yang-compiler-api:2.1",
+ "onos-yang-runtime":"mvn:org.onosproject:onos-yang-runtime:2.1",
+ "onos-yang-serializers-json":"mvn:org.onosproject:onos-yang-serializers-json:2.1",
+ "onos-yang-serializers-xml":"mvn:org.onosproject:onos-yang-serializers-xml:2.1",
+ "onos-yang-serializers-utils":"mvn:org.onosproject:onos-yang-serializers-utils:2.1",
"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",
diff --git a/lib/pom.xml b/lib/pom.xml
index 608149b..a3b9ee9 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -40,6 +40,7 @@
<netty4.version>4.1.5.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.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>
@@ -387,6 +388,17 @@
<version>${openflowj.version}</version>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-yang-model</artifactId>
+ <version>${onos-yang-tools.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-yang-runtime</artifactId>
+ <version>${onos-yang-tools.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -567,6 +579,27 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-yang-compiler-maven-plugin</artifactId>
+ <version>${onos-yang-tools.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>yang2java</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>