Bumping versions by x.y.(z+1) for next dev cycle

[mdsal.git] / model / pom.xml

diff --git a/model/pom.xml b/model/pom.xml
index 1167a64fa65e40636868f465ca50f99d11131646..70f61ef69d0fe5b2c54f15ecf1e9bea7c242f0a0 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -10,75 +10,48 @@
 <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>yangtools-parent</artifactId>
-        <version>0.6.2-SNAPSHOT</version>
-        <relativePath>../common/parent</relativePath>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>0.9.4-SNAPSHOT</version>
+        <relativePath>../binding/binding-parent</relativePath>
     </parent>
-    <groupId>org.opendaylight.yangtools.model</groupId>
-    <!--<version>0.6.2-SNAPSHOT</version>-->
+    <groupId>org.opendaylight.mdsal.model</groupId>
+    <!--<version>0.9.4-SNAPSHOT</version>-->
     <modelVersion>4.0.0</modelVersion>
     <artifactId>model-parent</artifactId>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 
+    <properties>
+       <mdsal.model.version>0.9.4-SNAPSHOT</mdsal.model.version>
+    </properties>
+
     <modules>
+        <module>features</module>
+        <module>artifacts</module>
         <module>yang-ext</module>
         <module>iana</module>
         <module>ietf</module>
         <module>l2-types</module>
+        <module>general-entity</module>
     </modules>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate-sources</goal>
-                        </goals>
-                        <configuration>
-                            <yangFilesRootDir>src/main/yang</yangFilesRootDir>
-                            <codeGenerators>
-                                <generator>
-                                    <codeGeneratorClass>
-                                        org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
-                                    </codeGeneratorClass>
-                                    <outputBaseDir>
-                                        target/generated-sources/sal
-                                    </outputBaseDir>
-                                </generator>
-                                <generator>
-                                    <codeGeneratorClass>org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl</codeGeneratorClass>
-                                    <outputBaseDir>target/site/restconf</outputBaseDir>
-                                </generator>
-                                <generator>
-                                    <codeGeneratorClass>org.opendaylight.yangtools.yang.wadl.generator.maven.WadlGenerator</codeGeneratorClass>
-                                    <outputBaseDir>target/site/restconf</outputBaseDir>
-                                </generator>
-                            </codeGenerators>
-                            <inspectDependencies>true</inspectDependencies>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.yangtools</groupId>
-                        <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>0.6.2-SNAPSHOT</version>
-                        <type>jar</type>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
+    <dependencyManagement>
+      <dependencies>
+          <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>mdsal-model-artifacts</artifactId>
+            <version>${mdsal.model.version}</version>
+            <type>pom</type>
+            <scope>import</scope>
+          </dependency>
+      </dependencies>
+    </dependencyManagement>
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>yang-binding</artifactId>
         </dependency>
         <dependency>
@@ -86,4 +59,21 @@
             <artifactId>yang-common</artifactId>
         </dependency>
     </dependencies>
+
+  <!--
+      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>