X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fpom.xml;h=f08202aeefef80cc1853b9382098d3d6df6aa536;hb=5856cf521232fd72dffe19a8258f39a5b4b55432;hp=6c9738079d337a903644487e6d1b4f4696d04b06;hpb=77e50131ecff6d66bd856947fb1f7cf06eb9d1fd;p=yangtools.git

diff --git a/yang/pom.xml b/yang/pom.xml
index 6c9738079d..f08202aeef 100644
--- a/yang/pom.xml
+++ b/yang/pom.xml
@@ -12,19 +12,20 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.0.5</version>
+        <version>3.1.2</version>
         <relativePath/>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>yang-aggregator</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.7-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
         <module>yang-common</module>
         <module>yang-data-api</module>
+        <module>yang-data-jaxen</module>
         <module>yang-data-util</module>
         <module>yang-data-impl</module>
         <module>yang-data-transform</module>
@@ -37,44 +38,45 @@
         <module>yang-model-export</module>
         <module>yang-model-immutable</module>
         <module>yang-model-util</module>
+
+        <!-- End-user utility for validating YANG models -->
+        <module>yang-model-validator</module>
+
+        <!-- YANG parser end-user API -->
         <module>yang-parser-api</module>
+        <module>yang-test-util</module>
+
+        <!-- YANG parser reference implementation -->
+        <module>yang-parser-impl</module>
+
+        <!-- Metamodel statement reactor -->
         <module>yang-parser-spi</module>
         <module>yang-parser-reactor</module>
-        <module>yang-parser-impl</module>
-        <module>yang-data-jaxen</module>
-        <module>yang-model-validator</module>
-        <module>yang-test-util</module>
+
+        <!-- Combined RFC6020/RFC7960 metamodel implementation -->
+        <module>yang-parser-rfc7950</module>
 
         <!-- OpenConfig (semantic version, hashed value) metamodel support -->
         <module>openconfig-model-api</module>
+        <!-- OpenConfig hashed value parser support. Semantic version support
+             is integrated in yang-parser-rfc7950. -->
         <module>openconfig-parser-support</module>
 
         <!-- OpenDaylight messy extensions -->
         <module>odlext-model-api</module>
+        <module>odlext-parser-support</module>
+
+        <!-- NACM metamodel support -->
+        <module>rfc6536-model-api</module>
+        <module>rfc6536-parser-support</module>
 
         <!-- Metadata (annotation) metamodel support -->
         <module>rfc7952-model-api</module>
         <module>rfc7952-parser-support</module>
 
+        <!-- RFC8040 (yang-data) metamodel support -->
         <module>rfc8040-model-api</module>
-        <!-- FIXME: solve circular dependency with rfc6020 and activate this
-            <module>rfc8040-parser</module>
-        -->
+        <module>rfc8040-parser-support</module>
     </modules>
 
-    <!--
-        Maven Site Configuration
-
-        The following configuration is necessary for maven-site-plugin to
-        correctly identify the correct deployment path for OpenDaylight Maven
-        sites.
-    -->
-    <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
-
-    <distributionManagement>
-        <site>
-            <id>opendaylight-site</id>
-            <url>${nexus.site.url}/${project.artifactId}/</url>
-        </site>
-    </distributionManagement>
 </project>