bug 1128:POM Restructuring for Automated Release
authorVaishali Mithbaokar <vmithbao@cisco.com>
Thu, 10 Apr 2014 01:39:04 +0000 (18:39 -0700)
committerRobert Varga <rovarga@cisco.com>
Fri, 6 Jun 2014 14:26:55 +0000 (16:26 +0200)
Temporarily hosting odlrootparent as part of the project just for review purpose

Change-Id: Ia9f14f1f5544e3ef5a543cf8e0e904fb31ffbeee
Signed-off-by: Surekha Bejgam <sbejgam@cisco.com>
Signed-off-by: Vaishali Mithbaokar <vmithbao@cisco.com>
Signed-off-by: Robert Varga <rovarga@cisco.com>
21 files changed:
code-generator/binding-java-api-generator/pom.xml
code-generator/maven-sal-api-gen-plugin/pom.xml
code-generator/pom.xml
code-generator/samples/maven-code-gen-sample/pom.xml
code-generator/samples/modeling-sample/pom.xml
model/iana/iana-afn-safi/pom.xml
model/iana/iana-if-type/pom.xml
model/iana/pom.xml
model/ietf/ietf-inet-types/pom.xml
model/ietf/ietf-netconf/pom.xml
model/ietf/ietf-restconf/pom.xml
model/ietf/ietf-ted/pom.xml
model/ietf/ietf-topology-isis/pom.xml
model/ietf/ietf-topology-l3-unicast-igp/pom.xml
model/ietf/ietf-topology-ospf/pom.xml
model/ietf/ietf-topology/pom.xml
model/ietf/pom.xml
model/l2-types/pom.xml
model/pom.xml
model/yang-ext/pom.xml
yang/yang-binding/pom.xml

index 6666e155a6dc4a708006e1032c294b1b2bb024f5..5b16fa7eec7432b8ce85b6a1a2fab4869d09ec45 100644 (file)
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
             </plugin>
+<!--      <plugin>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce</id>
+            <phase>none</phase>
+          </execution>
+        </executions>
+      </plugin> -->
         </plugins>
     </build>
 
index d5bc18d4d990cda56de10e1b0799bb8d90b29fd6..9f8ac51670ef787187d4dccbf5c2f83e3441cd97 100644 (file)
 <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>
+        <artifactId>binding-generator</artifactId>
         <version>0.6.2-SNAPSHOT</version>
     </parent>
-
     <modelVersion>4.0.0</modelVersion>
     <artifactId>maven-sal-api-gen-plugin</artifactId>
 
index 74f1007f60592547c20ce58beddbb7287879f9b9..58846d1c45a6b35735d2960f324b15d76dc6c99c 100644 (file)
 
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yangtools</artifactId>
+        <artifactId>yangtools-parent</artifactId>
         <version>0.6.2-SNAPSHOT</version>
+        <relativePath>../common/parent</relativePath>
     </parent>
-
+    <groupId>org.opendaylight.yangtools</groupId>
+    <version>0.6.2-SNAPSHOT</version>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>binding-generator</artifactId>
     <packaging>pom</packaging>
@@ -32,6 +34,7 @@
         <module>maven-sal-api-gen-plugin</module>
     </modules>
 
+
     <dependencyManagement>
         <dependencies>
             <dependency>
             </plugins>
         </pluginManagement>
     </build>
+
 </project>
index a42be7582e4a180e08b60b2454862a5774268f7e..e355f24a33c66c85e5119a0573cb6c1117d7ca17 100644 (file)
@@ -11,9 +11,9 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>binding-generator</artifactId>
         <groupId>org.opendaylight.yangtools</groupId>
-        <version>0.6.0-SNAPSHOT</version>
+        <artifactId>binding-generator</artifactId>
+        <version>0.6.2-SNAPSHOT</version>
     </parent>
     <artifactId>maven-code-gen-sample</artifactId>
 
@@ -49,7 +49,6 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>0.6.0-SNAPSHOT</version>
                         <type>jar</type>
                     </dependency>
                 </dependencies>
@@ -57,7 +56,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.8</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
                 </executions>
             </plugin>
         </plugins>
-        <pluginManagement>
-            <plugins>
-                <!--This plugin's configuration is used to store Eclipse 
-                    m2e settings only. It has no influence on the Maven build itself. -->
-                <plugin>
-                    <groupId>org.eclipse.m2e</groupId>
-                    <artifactId>lifecycle-mapping</artifactId>
-                    <version>1.0.0</version>
-                    <configuration>
-                        <lifecycleMappingMetadata>
-                            <pluginExecutions>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>
-                                            org.opendaylight.yangtools
-                                        </groupId>
-                                        <artifactId>
-                                            yang-maven-plugin
-                                        </artifactId>
-                                        <versionRange>
-                                            [0.5,)
-                                        </versionRange>
-                                        <goals>
-                                            <goal>
-                                                generate-sources
-                                            </goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <ignore></ignore>
-                                    </action>
-                                </pluginExecution>
-                            </pluginExecutions>
-                        </lifecycleMappingMetadata>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
+       </build>
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
index b7f4ce3505d46b580df9c82c76530b8212170f05..ab3bac3035472b5790dc8801f92c2482a8b350c7 100644 (file)
@@ -11,9 +11,9 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>binding-generator</artifactId>
         <groupId>org.opendaylight.yangtools</groupId>
-        <version>0.6.0-SNAPSHOT</version>
+        <artifactId>binding-generator</artifactId>
+        <version>0.6.2-SNAPSHOT</version>
     </parent>
     <artifactId>modeling-sample</artifactId>
 
@@ -22,7 +22,6 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.8-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>
@@ -49,7 +48,6 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>0.6.0-SNAPSHOT</version>
                         <type>jar</type>
                     </dependency>
                 </dependencies>
@@ -57,7 +55,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.8</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
                 </executions>
             </plugin>
         </plugins>
-        <pluginManagement>
-            <plugins>
-                <!--This plugin's configuration is used to store Eclipse 
-                    m2e settings only. It has no influence on the Maven build itself. -->
-                <plugin>
-                    <groupId>org.eclipse.m2e</groupId>
-                    <artifactId>lifecycle-mapping</artifactId>
-                    <version>1.0.0</version>
-                    <configuration>
-                        <lifecycleMappingMetadata>
-                            <pluginExecutions>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>
-                                            org.opendaylight.yangtools
-                                        </groupId>
-                                        <artifactId>
-                                            yang-maven-plugin
-                                        </artifactId>
-                                        <versionRange>
-                                            [0.5,)
-                                        </versionRange>
-                                        <goals>
-                                            <goal>
-                                                generate-sources
-                                            </goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <ignore></ignore>
-                                    </action>
-                                </pluginExecution>
-                            </pluginExecutions>
-                        </lifecycleMappingMetadata>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
+          </build>
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
index ab12e14c2eb1cc1de46a71df462e10692851dbbc..34b54a6a73452ec82ad7bf093b7c17d747a1c988 100644 (file)
@@ -13,6 +13,7 @@
         <artifactId>model-iana</artifactId>
         <groupId>org.opendaylight.yangtools.model</groupId>
         <version>0.6.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
index 9e20bee8c95f7dd3589574d01c68f9389a038b0e..dbb472788a5b4238321631dad8b03386ceb6c078 100644 (file)
@@ -13,6 +13,7 @@
         <artifactId>model-iana</artifactId>
         <groupId>org.opendaylight.yangtools.model</groupId>
         <version>0.6.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
index 7bc1abe2e0331b41105951ab06a009125914dd22..9ad48a2a83da49d27cc052e4baf17156fbea62cc 100644 (file)
@@ -13,6 +13,7 @@
         <artifactId>model-parent</artifactId>
         <groupId>org.opendaylight.yangtools.model</groupId>
         <version>0.6.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
index 0186ca24983ae44d9b71a5ef763b2fdf18bc356a..18ceb60480ef09a01141856c270d430ea2533f82 100644 (file)
@@ -21,6 +21,8 @@
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 
+
+
     <build>
         <plugins>
             <plugin>
@@ -36,6 +38,7 @@
                     </instructions>
                 </configuration>
             </plugin>
+
         </plugins>
     </build>
 
index 299cfddbf1b2bcf64fd8fb9e5748b925de2b8ff6..23166005206afa8ae7776596552051d52dd14511 100644 (file)
@@ -13,7 +13,7 @@
     <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>
index 9e8aff00cae7d1af2174f759fc262bd204b03f15..8b62c3e1c71e4ebb26456afe77ce274f3f122947 100644 (file)
@@ -16,6 +16,7 @@
         <version>0.6.2-SNAPSHOT</version>
     </parent>
 
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ietf-restconf</artifactId>
     <version>2013.10.19.1-SNAPSHOT</version>
index 5fdaa6aa8051cb13a402fd9fe0700cf9b580ba7a..8265a7c135b6fed5da815ec434a347e096f033b6 100644 (file)
@@ -15,6 +15,7 @@
         <version>0.6.2-SNAPSHOT</version>
     </parent>
 
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ietf-ted</artifactId>
     <version>2013.10.21.2-SNAPSHOT</version>
index 8995299e67ff993f5982b3913cf3c930cf0a2698..b5048c9cc0b0fbf932531690f123d26bd6f6ce5f 100644 (file)
@@ -15,6 +15,7 @@
         <version>0.6.2-SNAPSHOT</version>
     </parent>
 
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ietf-topology-isis</artifactId>
     <version>2013.10.21.2-SNAPSHOT</version>
index bbc643ab0b5a5105645f9d5241d7be656e79a8e6..2db65be1cd624ee251c8b3d105191243778e652d 100644 (file)
@@ -9,12 +9,14 @@
 -->
 <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.2-SNAPSHOT</version>
     </parent>
 
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ietf-topology-l3-unicast-igp</artifactId>
     <version>2013.10.21.2-SNAPSHOT</version>
index 331b610c47da17d04165ebb6f409bcba768e289c..04d847ef7c0cdcaae614d728b149187daebbe887 100644 (file)
@@ -15,6 +15,7 @@
         <version>0.6.2-SNAPSHOT</version>
     </parent>
 
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ietf-topology-ospf</artifactId>
     <version>2013.10.21.2-SNAPSHOT</version>
index 4b72df53a2a923cded8bf233f9292020124dc32e..86b814155451376601c11fbed94a77007dfac6ee 100644 (file)
@@ -14,7 +14,6 @@
         <groupId>org.opendaylight.yangtools.model</groupId>
         <version>0.6.2-SNAPSHOT</version>
     </parent>
-
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ietf-topology</artifactId>
     <version>2013.10.21.2-SNAPSHOT</version>
index 1cd98f48a3f1d38cef57347c1782d08341288946..50229c823f0f3003173b233b2ebc31f52228fdc5 100644 (file)
 
     <properties>
         <ietf.topology.version>2013.10.21.2-SNAPSHOT</ietf.topology.version>
+        <ietf.inet.types.version>2010.09.24.4-SNAPSHOT</ietf.inet.types.version>
+        <ietf.yang.types.version>2010.09.24.4-SNAPSHOT</ietf.yang.types.version>
+        <ietf.restconf.version>2013.09.04.1-SNAPSHOT</ietf.restconf.version>
     </properties>
+
     <modules>
         <module>ietf-inet-types</module>
         <module>ietf-yang-types</module>
             <dependency>
                 <groupId>org.opendaylight.yangtools.model</groupId>
                 <artifactId>ietf-inet-types</artifactId>
-                <version>2010.09.24.4-SNAPSHOT</version>
+                <version>${ietf.inet.types.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools.model</groupId>
                 <artifactId>ietf-yang-types</artifactId>
-                <version>2010.09.24.4-SNAPSHOT</version>
+                <version>${ietf.yang.types.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools.model</groupId>
                 <artifactId>ietf-restconf</artifactId>
-                <version>2013.09.04.1-SNAPSHOT</version>
+                <version>${ietf.restconf.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
@@ -81,4 +85,4 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-</project>
+   </project>
index 99fc9dec41d36b2311b2f1db7a044cd64cf69722..bbea425cd1740733788737c9d816078567c6e4be 100644 (file)
@@ -15,6 +15,7 @@
         <version>0.6.2-SNAPSHOT</version>
     </parent>
 
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>opendaylight-l2-types</artifactId>
     <version>2013.08.27.4-SNAPSHOT</version>
index 3dc26a74396fef51b0a42aa92a6b66e3bf479e76..f0b7c6549d3663a674dddd410214eb903923a2fb 100644 (file)
 
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yangtools</artifactId>
+        <artifactId>yangtools-parent</artifactId>
         <version>0.6.2-SNAPSHOT</version>
+        <relativePath>../common/parent</relativePath>
     </parent>
-
-    <modelVersion>4.0.0</modelVersion>
     <groupId>org.opendaylight.yangtools.model</groupId>
+    <!--<version>0.6.2-SNAPSHOT</version>-->
+    <modelVersion>4.0.0</modelVersion>
     <artifactId>model-parent</artifactId>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
     <modules>
         <module>yang-ext</module>
         <module>iana</module>
                 </executions>
             </plugin>
         </plugins>
-        <pluginManagement>
-            <plugins>
-                <!--This plugin's configuration is used to store Eclipse 
-                    m2e settings only. It has no influence on the Maven build itself. -->
-                <plugin>
-                    <groupId>org.eclipse.m2e</groupId>
-                    <artifactId>lifecycle-mapping</artifactId>
-                    <version>1.0.0</version>
-                    <configuration>
-                        <lifecycleMappingMetadata>
-                            <pluginExecutions>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>org.opendaylight.yangtools</groupId>
-                                        <artifactId>yang-maven-plugin</artifactId>
-                                        <versionRange>[0.5,)</versionRange>
-                                        <goals>
-                                            <goal>
-                                                generate-sources
-                                            </goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <ignore />
-                                    </action>
-                                </pluginExecution>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>org.apache.felix</groupId>
-                                        <artifactId>maven-bundle-plugin</artifactId>
-                                        <versionRange>[1.0,)</versionRange>
-                                        <goals>
-                                            <goal>manifest</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <execute />
-                                    </action>
-                                </pluginExecution>
-                            </pluginExecutions>
-                        </lifecycleMappingMetadata>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
     </build>
 
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>0.6.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
-            <version>0.6.2-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
 </project>
index 6fc7a801ca9d15b3d2c2ba77610d42b03fa6b24f..6a1d7d84e5e486ef9d7dd17033091a5d760df525 100644 (file)
 <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.model</groupId>
         <artifactId>model-parent</artifactId>
+        <groupId>org.opendaylight.yangtools.model</groupId>
         <version>0.6.2-SNAPSHOT</version>
     </parent>
 
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>yang-ext</artifactId>
     <version>2013.09.07.4-SNAPSHOT</version>
index 679ba67a453894323fcb599096bb909438f5b903..30c62fb271e21c19f48b2748c02ae496906e16e5 100644 (file)
 
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yang</artifactId>
+        <artifactId>yangtools-parent</artifactId>
         <version>0.6.2-SNAPSHOT</version>
+        <relativePath>/../../common/parent/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>yang-binding</artifactId>
     <name>${project.artifactId}</name>
     <description>Java binding for YANG</description>