Merge "Fixed bug in generation of return type for list key properties."

diff --git a/code-generator/binding-generator-api/pom.xml b/code-generator/binding-generator-api/pom.xml
index 00d1abb863a585b7e8a67235eaf28ffaf7ba812b..0f7f958660bfe0a9725b999807db7920f88fcd19 100644 (file)
--- a/code-generator/binding-generator-api/pom.xml
+++ b/code-generator/binding-generator-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>binding-generator</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/code-generator/binding-generator-impl/pom.xml b/code-generator/binding-generator-impl/pom.xml
index f91b562764f5e36e8a1181f4e173d29456cba271..38d18ed22e36228b54572c1d6da7c687b74b5689 100644 (file)
--- a/code-generator/binding-generator-impl/pom.xml
+++ b/code-generator/binding-generator-impl/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>binding-generator</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/LazyGeneratedCodecRegistry.java b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/LazyGeneratedCodecRegistry.java
index a8488bd34a5e74896cc3dcf79f06bf5bcbd487ad..9f151ded7783917406873dbe0c245d53189704c0 100644 (file)
--- a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/LazyGeneratedCodecRegistry.java
+++ b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/LazyGeneratedCodecRegistry.java
@@ -117,7 +117,7 @@ public class LazyGeneratedCodecRegistry implements //
             } catch (InstantiationException e) {
                 LOG.error("Can not instantiate raw augmentation codec {}", object.getSimpleName(), e);
             } catch (IllegalAccessException e) {
-                LOG.debug("BUG: Constructor for {} is not accessible.", object.getSimpleName(), e);
+                LOG.debug("Run-time consistency issue: constructor {} is not available. This indicates either a code generation bug or a misconfiguration of JVM.", object.getSimpleName(), e);
             }
         Class<? extends Augmentable<?>> objectSupertype = getAugmentableArgumentFrom(object);
         if (objectSupertype != null) {
@@ -387,7 +387,7 @@ public class LazyGeneratedCodecRegistry implements //
             ChoiceCaseNode node = (ChoiceCaseNode) SchemaContextUtil.findDataSchemaNode(module, caseNode.getKey());
 
             if (node == null) {
-                LOG.error("YANGTools Bug: SchemaNode for {}, with path {} was not found in context.",
+                LOG.warn("Failed to find YANG SchemaNode for {}, with path {} was not found in context.",
                         typeref.getFullyQualifiedName(), caseNode.getKey());
                 @SuppressWarnings("rawtypes")
                 ChoiceCaseCodecImpl value = new ChoiceCaseCodecImpl();

diff --git a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/RuntimeGeneratedMappingServiceImpl.xtend b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/RuntimeGeneratedMappingServiceImpl.xtend
index 6fc4a815d61409f110f4c52f58a7550010d3cab6..04d66dcb89acf9f2283a8e43907a16951b529ad8 100644 (file)
--- a/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/RuntimeGeneratedMappingServiceImpl.xtend
+++ b/code-generator/binding-generator-impl/src/main/java/org/opendaylight/yangtools/sal/binding/generator/impl/RuntimeGeneratedMappingServiceImpl.xtend
@@ -12,6 +12,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext
 import org.opendaylight.yangtools.yang.model.api.SchemaServiceListener
 import org.opendaylight.yangtools.sal.binding.generator.impl.BindingGeneratorImpl
 import java.util.Map
+import java.util.Collections
 import org.opendaylight.yangtools.sal.binding.model.api.Type
 import org.opendaylight.yangtools.sal.binding.model.api.type.builder.GeneratedTypeBuilder
 import org.opendaylight.yangtools.yang.model.api.SchemaNode
@@ -106,8 +107,8 @@ class RuntimeGeneratedMappingServiceImpl implements BindingIndependentMappingSer
             val namespace = BindingGeneratorUtil.moduleNamespaceToPackageName(module);
 
             if(!module.rpcs.empty) {
-            val rpcs = FluentIterable.from(module.rpcs).transform[QName].toSet
-            val serviceClass = new ReferencedTypeImpl(namespace,BindingGeneratorUtil.parseToClassName(module.name)+"Service");
+                val rpcs = FluentIterable.from(module.rpcs).transform[QName].toSet
+                val serviceClass = new ReferencedTypeImpl(namespace,BindingGeneratorUtil.parseToClassName(module.name)+"Service");
                 serviceTypeToRpc.put(serviceClass,rpcs);
             }
 
@@ -268,7 +269,11 @@ class RuntimeGeneratedMappingServiceImpl implements BindingIndependentMappingSer
     }
 
     override getRpcQNamesFor(Class<? extends RpcService> service) {
-        return serviceTypeToRpc.get(new ReferencedTypeImpl(service.package.name,service.simpleName));
+        var serviceRef = serviceTypeToRpc.get(new ReferencedTypeImpl(service.package.name, service.simpleName))
+        if (serviceRef == null) {
+            serviceRef = Collections.emptySet()
+        }
+        return serviceRef
     }
 
     private def void getSchemaWithRetry(Type type) {

diff --git a/code-generator/binding-generator-spi/pom.xml b/code-generator/binding-generator-spi/pom.xml
index b012264062a4a07e925dae10a3cf39c56f2003d9..08b3cf478bc0f92352b294731e088f71386d16e4 100644 (file)
--- a/code-generator/binding-generator-spi/pom.xml
+++ b/code-generator/binding-generator-spi/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>binding-generator</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/code-generator/binding-generator-util/pom.xml b/code-generator/binding-generator-util/pom.xml
index 72c8432d79e0860ecbf3bbb1ccb18936142d943c..d6c7df04e61f8697836312e5f5becc5e0c7cefd5 100644 (file)
--- a/code-generator/binding-generator-util/pom.xml
+++ b/code-generator/binding-generator-util/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>binding-generator</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/code-generator/binding-java-api-generator/pom.xml b/code-generator/binding-java-api-generator/pom.xml
index c4bde2daf05057e351e9ae976a815ce8a0821f91..57c1066a8ceb386df7e8bce28e4435e98ca0d089 100644 (file)
--- a/code-generator/binding-java-api-generator/pom.xml
+++ b/code-generator/binding-java-api-generator/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>binding-generator</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/YangModuleInfoTemplate.xtend b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/YangModuleInfoTemplate.xtend
index b805fb232358244205842c4aa87b6c103941a2fb..7c19f20a9db35d6b6263b8ce49c7050031fb2b4a 100644 (file)
--- a/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/YangModuleInfoTemplate.xtend
+++ b/code-generator/binding-java-api-generator/src/main/java/org/opendaylight/yangtools/sal/java/api/generator/YangModuleInfoTemplate.xtend
@@ -97,10 +97,9 @@ class YangModuleInfoTemplate {
                 importedModules = «Collections.importedName».emptySet();
             «ENDIF»
 
-            «val path = m.moduleSourcePath.replace(java.io.File.separatorChar, '/')»
-            «InputStream.importedName» stream = «CLASS».class.getResourceAsStream("«path»");
+            «InputStream.importedName» stream = «CLASS».class.getResourceAsStream("«sourcePath»");
             if (stream == null) {
-                throw new IllegalStateException("Resource «path» is missing");
+                throw new IllegalStateException("Resource «sourcePath» is missing");
             }
             try {
                 stream.close();
@@ -127,9 +126,9 @@ class YangModuleInfoTemplate {
 
         @Override
         public «InputStream.importedName» getModuleSourceStream() throws IOException {
-            «InputStream.importedName» stream = «CLASS».class.getResourceAsStream("«path»");
+            «InputStream.importedName» stream = «CLASS».class.getResourceAsStream("«sourcePath»");
             if (stream == null) {
-                throw new «IOException.importedName»("Resource «path» is missing");
+                throw new «IOException.importedName»("Resource «sourcePath» is missing");
             }
             return stream;
         }
@@ -139,6 +138,10 @@ class YangModuleInfoTemplate {
             return importedModules;
         }
     '''
+    
+    def getSourcePath() {
+        return "/" + module.moduleSourcePath.replace(java.io.File.separatorChar, '/')
+    }
 
     private def imports() ''' 
         «IF !importMap.empty»

diff --git a/code-generator/binding-model-api/pom.xml b/code-generator/binding-model-api/pom.xml
index 27902735af226db1add0aa0b1b69375847d2b690..7473059676fc17ec0900aea55bda309792cdbb7a 100644 (file)
--- a/code-generator/binding-model-api/pom.xml
+++ b/code-generator/binding-model-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>binding-generator</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/code-generator/binding-type-provider/pom.xml b/code-generator/binding-type-provider/pom.xml
index 3ce094e3d895508cf65bb1fc2ccff36602f5d613..57b32fa25938056a619318483163c483c67a6bcb 100644 (file)
--- a/code-generator/binding-type-provider/pom.xml
+++ b/code-generator/binding-type-provider/pom.xml
@@ -7,13 +7,12 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>binding-generator</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/code-generator/maven-sal-api-gen-plugin/pom.xml b/code-generator/maven-sal-api-gen-plugin/pom.xml
index 1289e1118a054a8e7425132843ef7aa0d1ac9f78..dc77859ec9dbccc34fca17451544ebf66c979439 100644 (file)
--- a/code-generator/maven-sal-api-gen-plugin/pom.xml
+++ b/code-generator/maven-sal-api-gen-plugin/pom.xml
@@ -7,13 +7,12 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <artifactId>binding-generator</artifactId>
         <groupId>org.opendaylight.yangtools</groupId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/code-generator/pom.xml b/code-generator/pom.xml
index 7015f1bb095260b20de23dc3baacb3a49e2d1e05..74f1007f60592547c20ce58beddbb7287879f9b9 100644 (file)
--- a/code-generator/pom.xml
+++ b/code-generator/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/model/iana/iana-afn-safi/pom.xml b/model/iana/iana-afn-safi/pom.xml
index e60e0a714975f8405766cf1989b0cb92d89387a8..ab12e14c2eb1cc1de46a71df462e10692851dbbc 100644 (file)
--- a/model/iana/iana-afn-safi/pom.xml
+++ b/model/iana/iana-afn-safi/pom.xml
@@ -12,12 +12,12 @@
     <parent>
         <artifactId>model-iana</artifactId>
         <groupId>org.opendaylight.yangtools.model</groupId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>iana-afn-safi</artifactId>
-    <version>2013.07.04.2-SNAPSHOT</version>
+    <version>2013.07.04.4-SNAPSHOT</version>
 
     <build>
         <plugins>

diff --git a/model/iana/iana-if-type/pom.xml b/model/iana/iana-if-type/pom.xml
index aa9d6f9087bba68761a5d96d4a84f2aebfe3db61..9e20bee8c95f7dd3589574d01c68f9389a038b0e 100644 (file)
--- a/model/iana/iana-if-type/pom.xml
+++ b/model/iana/iana-if-type/pom.xml
@@ -12,12 +12,12 @@
     <parent>
         <artifactId>model-iana</artifactId>
         <groupId>org.opendaylight.yangtools.model</groupId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>iana-if-type</artifactId>
-    <version>2013.07.04.2-SNAPSHOT</version>
+    <version>2013.07.04.4-SNAPSHOT</version>
 
     <build>
         <plugins>

diff --git a/model/iana/pom.xml b/model/iana/pom.xml
index cfa9eb976082976e57e518ff41e02e5dcddad377..7bc1abe2e0331b41105951ab06a009125914dd22 100644 (file)
--- a/model/iana/pom.xml
+++ b/model/iana/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <artifactId>model-parent</artifactId>
         <groupId>org.opendaylight.yangtools.model</groupId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/model/ietf/ietf-inet-types/pom.xml b/model/ietf/ietf-inet-types/pom.xml
index a5a08f1834fd39530e088376cd7a1d62f2eddbc6..0186ca24983ae44d9b71a5ef763b2fdf18bc356a 100644 (file)
--- a/model/ietf/ietf-inet-types/pom.xml
+++ b/model/ietf/ietf-inet-types/pom.xml
@@ -12,12 +12,12 @@
     <parent>
         <artifactId>model-ietf</artifactId>
         <groupId>org.opendaylight.yangtools.model</groupId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ietf-inet-types</artifactId>
-    <version>2010.09.24.2-SNAPSHOT</version>
+    <version>2010.09.24.4-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 

diff --git a/model/ietf/ietf-ted/pom.xml b/model/ietf/ietf-ted/pom.xml
index 9757014b6bfed86c218cb330b16c64fb596f68a7..5fdaa6aa8051cb13a402fd9fe0700cf9b580ba7a 100644 (file)
--- a/model/ietf/ietf-ted/pom.xml
+++ b/model/ietf/ietf-ted/pom.xml
@@ -12,12 +12,12 @@
     <parent>
         <artifactId>model-ietf</artifactId>
         <groupId>org.opendaylight.yangtools.model</groupId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ietf-ted</artifactId>
-    <version>2013.10.21.0-SNAPSHOT</version>
+    <version>2013.10.21.2-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 

diff --git a/model/ietf/ietf-topology-isis/pom.xml b/model/ietf/ietf-topology-isis/pom.xml
index 225da125312de3c108ed1d9402161765b9f90b9e..8995299e67ff993f5982b3913cf3c930cf0a2698 100644 (file)
--- a/model/ietf/ietf-topology-isis/pom.xml
+++ b/model/ietf/ietf-topology-isis/pom.xml
@@ -7,18 +7,17 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <artifactId>model-ietf</artifactId>
         <groupId>org.opendaylight.yangtools.model</groupId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ietf-topology-isis</artifactId>
-    <version>2013.10.21.0-SNAPSHOT</version>
+    <version>2013.10.21.2-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 

diff --git a/model/ietf/ietf-topology-l3-unicast-igp/pom.xml b/model/ietf/ietf-topology-l3-unicast-igp/pom.xml
index 3920aa0737358e5becea5e1cef47811ca2c3aff6..bbc643ab0b5a5105645f9d5241d7be656e79a8e6 100644 (file)
--- a/model/ietf/ietf-topology-l3-unicast-igp/pom.xml
+++ b/model/ietf/ietf-topology-l3-unicast-igp/pom.xml
@@ -7,18 +7,17 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <artifactId>model-ietf</artifactId>
         <groupId>org.opendaylight.yangtools.model</groupId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ietf-topology-l3-unicast-igp</artifactId>
-    <version>2013.10.21.0-SNAPSHOT</version>
+    <version>2013.10.21.2-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 

diff --git a/model/ietf/ietf-topology-ospf/pom.xml b/model/ietf/ietf-topology-ospf/pom.xml
index 70724713a97682bbfe2710e750f254aaf002f9cd..331b610c47da17d04165ebb6f409bcba768e289c 100644 (file)
--- a/model/ietf/ietf-topology-ospf/pom.xml
+++ b/model/ietf/ietf-topology-ospf/pom.xml
@@ -7,18 +7,17 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <artifactId>model-ietf</artifactId>
         <groupId>org.opendaylight.yangtools.model</groupId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ietf-topology-ospf</artifactId>
-    <version>2013.10.21.0-SNAPSHOT</version>
+    <version>2013.10.21.2-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 

diff --git a/model/ietf/ietf-topology/pom.xml b/model/ietf/ietf-topology/pom.xml
index f161b81d94d59c8ac20ed2ef1b597e1a30db5a20..4b72df53a2a923cded8bf233f9292020124dc32e 100644 (file)
--- a/model/ietf/ietf-topology/pom.xml
+++ b/model/ietf/ietf-topology/pom.xml
@@ -7,18 +7,17 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <artifactId>model-ietf</artifactId>
         <groupId>org.opendaylight.yangtools.model</groupId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ietf-topology</artifactId>
-    <version>2013.10.21.0-SNAPSHOT</version>
+    <version>2013.10.21.2-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 

diff --git a/model/ietf/ietf-yang-types/pom.xml b/model/ietf/ietf-yang-types/pom.xml
index 72b99ccc050a672e7795b7321e69fcfe15ee4b6e..fced463f9f204149435e2091a6fbf14e977084ee 100644 (file)
--- a/model/ietf/ietf-yang-types/pom.xml
+++ b/model/ietf/ietf-yang-types/pom.xml
@@ -12,12 +12,12 @@
     <parent>
         <artifactId>model-ietf</artifactId>
         <groupId>org.opendaylight.yangtools.model</groupId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ietf-yang-types</artifactId>
-    <version>2010.09.24.2-SNAPSHOT</version>
+    <version>2010.09.24.4-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 

diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml
index 2bb111a8c60dc9304eccb605c64f0fdee188e257..ba520987f5c991ccb0a76255a1be12d1b7a97bdd 100644 (file)
--- a/model/ietf/pom.xml
+++ b/model/ietf/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <artifactId>model-parent</artifactId>
         <groupId>org.opendaylight.yangtools.model</groupId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -22,7 +22,7 @@
     <description>${project.artifactId}</description>
 
     <properties>
-        <ietf.topology.version>2013.10.21.0-SNAPSHOT</ietf.topology.version>
+        <ietf.topology.version>2013.10.21.2-SNAPSHOT</ietf.topology.version>
     </properties>
     <modules>
         <module>ietf-inet-types</module>
@@ -40,12 +40,12 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools.model</groupId>
                 <artifactId>ietf-inet-types</artifactId>
-                <version>2010.09.24.2-SNAPSHOT</version>
+                <version>2010.09.24.4-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools.model</groupId>
                 <artifactId>ietf-yang-types</artifactId>
-                <version>2010.09.24.2-SNAPSHOT</version>
+                <version>2010.09.24.4-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>

diff --git a/model/l2-types/pom.xml b/model/l2-types/pom.xml
index bbcceb3363c841ce156a67e4b6e7c6933809b1a0..99fc9dec41d36b2311b2f1db7a044cd64cf69722 100644 (file)
--- a/model/l2-types/pom.xml
+++ b/model/l2-types/pom.xml
@@ -12,12 +12,12 @@
     <parent>
         <artifactId>model-parent</artifactId>
         <groupId>org.opendaylight.yangtools.model</groupId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>opendaylight-l2-types</artifactId>
-    <version>2013.08.27.2-SNAPSHOT</version>
+    <version>2013.08.27.4-SNAPSHOT</version>
 
     <build>
         <plugins>

diff --git a/model/pom.xml b/model/pom.xml
index c466e460160de835afd6645589796c2e15ad34ef..3dc26a74396fef51b0a42aa92a6b66e3bf479e76 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -38,7 +38,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.6.0-SNAPSHOT</version>
+                <version>0.6.2-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -72,7 +72,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>0.6.0-SNAPSHOT</version>
+                        <version>0.6.2-SNAPSHOT</version>
                         <type>jar</type>
                     </dependency>
                 </dependencies>
@@ -147,12 +147,12 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>0.6.0-SNAPSHOT</version>
+            <version>0.6.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
-            <version>0.6.0-SNAPSHOT</version>
+            <version>0.6.2-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

diff --git a/model/yang-ext/pom.xml b/model/yang-ext/pom.xml
index c52323dd04fb602e683f12fc0a2cc1fc3843ee57..6fc7a801ca9d15b3d2c2ba77610d42b03fa6b24f 100644 (file)
--- a/model/yang-ext/pom.xml
+++ b/model/yang-ext/pom.xml
@@ -12,12 +12,12 @@
     <parent>
         <groupId>org.opendaylight.yangtools.model</groupId>
         <artifactId>model-parent</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>yang-ext</artifactId>
-    <version>2013.09.07.2-SNAPSHOT</version>
+    <version>2013.09.07.4-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 

diff --git a/yang/yang-binding/pom.xml b/yang/yang-binding/pom.xml
index 0b9ee1530cd07369c455987b87518acc01c79edf..679ba67a453894323fcb599096bb909438f5b903 100644 (file)
--- a/yang/yang-binding/pom.xml
+++ b/yang/yang-binding/pom.xml
@@ -7,13 +7,12 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yang</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
+        <version>0.6.2-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>