bug 1128:POM Restructuring for Automated Release

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>

diff --git a/code-generator/binding-java-api-generator/pom.xml b/code-generator/binding-java-api-generator/pom.xml
index 6666e155a6dc4a708006e1032c294b1b2bb024f5..5b16fa7eec7432b8ce85b6a1a2fab4869d09ec45 100644 (file)
--- a/code-generator/binding-java-api-generator/pom.xml
+++ b/code-generator/binding-java-api-generator/pom.xml
@@ -44,6 +44,15 @@
             <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>
 

diff --git a/code-generator/maven-sal-api-gen-plugin/pom.xml b/code-generator/maven-sal-api-gen-plugin/pom.xml
index d5bc18d4d990cda56de10e1b0799bb8d90b29fd6..9f8ac51670ef787187d4dccbf5c2f83e3441cd97 100644 (file)
--- a/code-generator/maven-sal-api-gen-plugin/pom.xml
+++ b/code-generator/maven-sal-api-gen-plugin/pom.xml
@@ -10,11 +10,10 @@
 <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>
 

diff --git a/code-generator/pom.xml b/code-generator/pom.xml
index 74f1007f60592547c20ce58beddbb7287879f9b9..58846d1c45a6b35735d2960f324b15d76dc6c99c 100644 (file)
--- a/code-generator/pom.xml
+++ b/code-generator/pom.xml
@@ -11,10 +11,12 @@
 
     <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>
@@ -181,4 +184,5 @@
             </plugins>
         </pluginManagement>
     </build>
+
 </project>

diff --git a/code-generator/samples/maven-code-gen-sample/pom.xml b/code-generator/samples/maven-code-gen-sample/pom.xml
index a42be7582e4a180e08b60b2454862a5774268f7e..e355f24a33c66c85e5119a0573cb6c1117d7ca17 100644 (file)
--- a/code-generator/samples/maven-code-gen-sample/pom.xml
+++ b/code-generator/samples/maven-code-gen-sample/pom.xml
@@ -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>
@@ -73,45 +71,7 @@
                 </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>

diff --git a/code-generator/samples/modeling-sample/pom.xml b/code-generator/samples/modeling-sample/pom.xml
index b7f4ce3505d46b580df9c82c76530b8212170f05..ab3bac3035472b5790dc8801f92c2482a8b350c7 100644 (file)
--- a/code-generator/samples/modeling-sample/pom.xml
+++ b/code-generator/samples/modeling-sample/pom.xml
@@ -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>
@@ -73,45 +70,7 @@
                 </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>

diff --git a/common/checkstyle-logging/pom.xml b/common/checkstyle-logging/pom.xml
index 8960ca957905eb09cc83ded500a3ac9332c43828..0a53537af2a3eb44e77b19eefe3c5182554da60d 100644 (file)
--- a/common/checkstyle-logging/pom.xml
+++ b/common/checkstyle-logging/pom.xml
@@ -9,11 +9,12 @@
 -->
 <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">
   <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.opendaylight.yangtools</groupId>
-    <artifactId>common-parent</artifactId>
-    <version>0.6.2-SNAPSHOT</version>
-  </parent>
+    <parent>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-parent</artifactId>
+        <version>0.6.2-SNAPSHOT</version>
+        <relativePath>/../../common/parent/pom.xml</relativePath>
+    </parent>
   <artifactId>checkstyle-logging</artifactId>
 
   <dependencies>
@@ -32,4 +33,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

diff --git a/common/concepts/pom.xml b/common/concepts/pom.xml
index 657d8a1c6f9ca35af8a910a22fe3d78b85a60118..1c3e9d781b6a598efcb2fee2f2b52222c84317d0 100644 (file)
--- a/common/concepts/pom.xml
+++ b/common/concepts/pom.xml
@@ -11,11 +11,14 @@
 
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>common-parent</artifactId>
+        <artifactId>yangtools-parent</artifactId>
         <version>0.6.2-SNAPSHOT</version>
+        <relativePath>/../../common/parent/pom.xml</relativePath>
     </parent>
+
     <packaging>bundle</packaging>
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>concepts</artifactId>
     <name>${project.artifactId}</name>
     <description>Common concepts</description>

diff --git a/common/feature/pom.xml b/common/feature/pom.xml
index d1d84e1e90c0061bcd25bae8827ef1771cb2674e..84fb5559f6920978aae0b163c57f5f34b4ada7a8 100644 (file)
--- a/common/feature/pom.xml
+++ b/common/feature/pom.xml
@@ -4,8 +4,9 @@
 
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>common-parent</artifactId>
+        <artifactId>yangtools-parent</artifactId>
         <version>0.6.2-SNAPSHOT</version>
+        <relativePath>/../../common/parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>features-file</artifactId>

diff --git a/common/mockito-configuration/pom.xml b/common/mockito-configuration/pom.xml
index 2e896de18b946b4ec59aa8e0540c25acabeb0966..c2e0d3e4472a61df1d5e0c44d53374d08df1e99f 100644 (file)
--- a/common/mockito-configuration/pom.xml
+++ b/common/mockito-configuration/pom.xml
@@ -11,10 +11,12 @@
 
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>common-parent</artifactId>
+        <artifactId>yangtools-parent</artifactId>
         <version>0.6.2-SNAPSHOT</version>
+        <relativePath>/../../common/parent/pom.xml</relativePath>
     </parent>
 
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mockito-configuration</artifactId>
     <description>Default mockito configuration</description>

diff --git a/common/object-cache-api/pom.xml b/common/object-cache-api/pom.xml
index beb2d035d2009dc61ee3b8532d003fdaa217b693..1ef06e20b4e25143dfc737d3c9bff4ddf203d18c 100644 (file)
--- a/common/object-cache-api/pom.xml
+++ b/common/object-cache-api/pom.xml
@@ -9,10 +9,12 @@
 -->
 <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>common-parent</artifactId>
+        <artifactId>yangtools-parent</artifactId>
         <version>0.6.2-SNAPSHOT</version>
+        <relativePath>/../../common/parent/pom.xml</relativePath>
     </parent>
     <packaging>bundle</packaging>
     <modelVersion>4.0.0</modelVersion>

diff --git a/common/object-cache-guava/pom.xml b/common/object-cache-guava/pom.xml
index 8a5b7c471aa3884acb4a3bc53602803997f8cfb4..0291ff95288eb811d3f1d20c05c1ef64a9e5c302 100644 (file)
--- a/common/object-cache-guava/pom.xml
+++ b/common/object-cache-guava/pom.xml
@@ -11,9 +11,11 @@
 
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>common-parent</artifactId>
+        <artifactId>yangtools-parent</artifactId>
         <version>0.6.2-SNAPSHOT</version>
+        <relativePath>/../../common/parent/pom.xml</relativePath>
     </parent>
+
     <packaging>bundle</packaging>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>object-cache-guava</artifactId>

diff --git a/common/object-cache-noop/pom.xml b/common/object-cache-noop/pom.xml
index ca10b3cbb52f634cc66ff5c279f12866112fdb3b..088243dc003d59c2464b5443070dd11b31ced087 100644 (file)
--- a/common/object-cache-noop/pom.xml
+++ b/common/object-cache-noop/pom.xml
@@ -11,8 +11,9 @@
 
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>common-parent</artifactId>
+        <artifactId>yangtools-parent</artifactId>
         <version>0.6.2-SNAPSHOT</version>
+        <relativePath>/../../common/parent/pom.xml</relativePath>
     </parent>
     <packaging>bundle</packaging>
     <modelVersion>4.0.0</modelVersion>

diff --git a/common/parent/pom.xml b/common/parent/pom.xml
new file mode 100644 (file)
index 0000000..a931134
--- /dev/null
+++ b/common/parent/pom.xml
@@ -0,0 +1,745 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ 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">
+
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent</artifactId>
+        <version>1.4.2-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>yangtools-parent</artifactId>
+    <groupId>org.opendaylight.yangtools</groupId>
+    <version>0.6.2-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <prerequisites>
+        <maven>3.0.4</maven>
+    </prerequisites>
+
+    <properties>
+        <junit.version>4.10</junit.version>
+        <exam.version>3.0.0</exam.version>
+        <groovy.version>2.1.6</groovy.version>
+        <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
+        <ctrie.version>0.2.0</ctrie.version>
+        <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>
+        <maven.javadoc.version>2.9.1</maven.javadoc.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- Testing Dependencies -->
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.10</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.shared</groupId>
+                <artifactId>maven-verifier</artifactId>
+                <version>1.5</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam-container-native</artifactId>
+                <version>3.0.0</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam-junit4</artifactId>
+                <version>3.0.0</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam-link-mvn</artifactId>
+                <version>3.0.0</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>equinoxSDK381</groupId>
+                <artifactId>org.eclipse.osgi</artifactId>
+                <version>3.8.1.v20120830-144521</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.groovy</groupId>
+                <artifactId>groovy</artifactId>
+                <version>2.1.6</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.groovy</groupId>
+                <artifactId>groovy-xml</artifactId>
+                <version>2.1.6</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>xmlunit</groupId>
+                <artifactId>xmlunit</artifactId>
+                <version>1.5</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-classic</artifactId>
+                <version>1.0.9</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-codec-http</artifactId>
+                <version>4.0.10.Final</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-data-util</artifactId>
+                <version>0.6.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>maven-sal-api-gen-plugin</artifactId>
+                <version>0.6.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools.thirdparty</groupId>
+                <artifactId>antlr4-runtime-osgi-nohead</artifactId>
+                <version>4.0</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools.thirdparty</groupId>
+                <artifactId>xtend-lib-osgi</artifactId>
+                <version>2.4.3</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>concepts</artifactId>
+                <version>0.6.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>object-cache-api</artifactId>
+                <version>0.6.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>object-cache-guava</artifactId>
+                <version>0.6.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>object-cache-noop</artifactId>
+                <version>0.6.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>binding-model-api</artifactId>
+                <version>0.6.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>binding-generator-api</artifactId>
+                <version>0.6.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>binding-generator-spi</artifactId>
+                <version>0.6.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>binding-generator-util</artifactId>
+                <version>0.6.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>binding-generator-impl</artifactId>
+                <version>0.6.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>binding-java-api-generator</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>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-data-api</artifactId>
+                <version>0.6.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-data-impl</artifactId>
+                <version>0.6.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-model-api</artifactId>
+                <version>0.6.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-model-util</artifactId>
+                <version>0.6.2-SNAPSHOT</version>
+            </dependency>
+            <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-parser-api</artifactId>
+                <version>0.6.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-parser-impl</artifactId>
+                <version>0.6.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-maven-plugin</artifactId>
+                <version>0.6.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-maven-plugin-spi</artifactId>
+                <version>0.6.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools.model</groupId>
+                <artifactId>ietf-inet-types</artifactId>
+                <version>2010.09.24.4-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools.model</groupId>
+                <artifactId>ietf-yang-types</artifactId>
+                <version>2010.09.24.4-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools.model</groupId>
+                <artifactId>ietf-restconf</artifactId>
+                <version>2013.09.04.1-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools.model</groupId>
+                <artifactId>ietf-ted</artifactId>
+                <version>2013.10.21.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools.model</groupId>
+                <artifactId>ietf-topology</artifactId>
+                <version>2013.10.21.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools.model</groupId>
+                <artifactId>ietf-topology-isis</artifactId>
+                <version>2013.10.21.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools.model</groupId>
+                <artifactId>ietf-topology-l3-unicast-igp</artifactId>
+                <version>2013.10.21.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools.model</groupId>
+                <artifactId>ietf-topology-ospf</artifactId>
+                <version>2013.10.21.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools.model</groupId>
+                <artifactId>ietf-topology-l3-unicast</artifactId>
+                <version>2013.10.21.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-data-json</artifactId>
+                <version>0.6.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven</groupId>
+                <artifactId>maven-core</artifactId>
+                <version>3.0.5</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven</groupId>
+                <artifactId>maven-plugin-api</artifactId>
+                <version>3.0.5</version>
+            </dependency>
+            <dependency>
+                <groupId>org.javassist</groupId>
+                <artifactId>javassist</artifactId>
+                <version>3.17.1-GA</version>
+            </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-all</artifactId>
+                <version>1.9.5</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>1.9.5</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-simple</artifactId>
+                <version>1.7.2</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.7.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-log4j12</artifactId>
+                <version>1.7.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>log4j-over-slf4j</artifactId>
+                <version>1.7.2</version>
+            </dependency>
+            <dependency>
+                <groupId>xml-apis</groupId>
+                <artifactId>xml-apis</artifactId>
+                <version>2.0.2</version>
+            </dependency>
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-core</artifactId>
+                <version>1.0.9</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>14.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.xtend</groupId>
+                <artifactId>org.eclipse.xtend.lib</artifactId>
+                <version>2.4.3</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>3.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.core</artifactId>
+                <version>5.0.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>commons-lang</groupId>
+                <artifactId>commons-lang</artifactId>
+                <version>2.6</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>1.8</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.code.findbugs</groupId>
+                <artifactId>jsr305</artifactId>
+                <version>2.0.3</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.jersey</groupId>
+                <artifactId>jersey-client</artifactId>
+                <version>1.17</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.ws.rs</groupId>
+                <artifactId>javax.ws.rs-api</artifactId>
+                <version>2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.ws.rs</groupId>
+                <artifactId>jsr311-api</artifactId>
+                <version>1.1.1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.glassfish.jersey.ext</groupId>
+                <artifactId>jersey-proxy-client</artifactId>
+                <version>2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.glassfish.jersey.core</groupId>
+                <artifactId>jersey-client</artifactId>
+                <version>2.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>2.4</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>restconf-client-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>restconf-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>restconf-util</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>restconf-test-service</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>restconf-client-impl</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>restconf-jaxrs-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>bug527-test-model</artifactId>
+                <version>0.6.2-SNAPSHOT</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>websocket-client</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.github.romix</groupId>
+                <artifactId>java-concurrent-hash-trie-map</artifactId>
+                <version>${ctrie.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>object-cache-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>object-cache-guava</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>object-cache-noop</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>util</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>${maven.jar.version}</version>
+                    <configuration>
+                        <archive>
+                            <!--
+                                 Bundle OSGi Manifest created by maven-bundle-plugin
+                                 into a jar file
+                                 -->
+                            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        </archive>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>${maven.bundle.version}</version>
+                    <extensions>true</extensions>
+                    <executions>
+                        <execution>
+                            <id>bundle-manifest</id>
+                            <phase>process-classes</phase>
+                            <goals>
+                                <goal>manifest</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <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>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>1.8</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.opendaylight.yangtools</groupId>
+                    <artifactId>yang-maven-plugin</artifactId>
+                    <version>0.6.2-SNAPSHOT</version>
+                    <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>
+                <plugin>
+                    <groupId>org.ops4j.pax.exam</groupId>
+                    <artifactId>maven-paxexam-plugin</artifactId>
+                    <version>1.2.4</version>
+                    <executions>
+                        <execution>
+                            <id>generate-config</id>
+                            <goals>
+                                <goal>generate-depends-file</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>${maven.javadoc.version}</version>
+                    <configuration>
+                        <stylesheetfile>stylesheet.css</stylesheetfile>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>attach-javadocs</id>
+                            <goals>
+                                <goal>jar</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <goals>
+                                <goal>aggregate</goal>
+                            </goals>
+                            <phase>site</phase>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
+        <plugins>
+            <!--
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <id>enforce</id>
+                        <configuration>
+                            <rules>
+                                <DependencyConvergence />
+                            </rules>
+                        </configuration>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            -->
+            <plugin>
+                <groupId>org.eclipse.xtend</groupId>
+                <artifactId>xtend-maven-plugin</artifactId>
+                <version>${xtend.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/src/main/xtend-gen</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>2.5</version>
+                <configuration>
+                    <filesets>
+                        <fileset>
+                            <directory>${basedir}/src/main/xtend-gen</directory>
+                            <includes>
+                                <include>**</include>
+                            </includes>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>${maven.source.version}</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
+                <version>${findbugs.maven.plugin.version}</version>
+                <configuration>
+                    <effort>Max</effort>
+                    <threshold>Low</threshold>
+                    <goal>site</goal>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jdepend-maven-plugin</artifactId>
+                <version>${jdepend.maven.plugin.version}</version>
+            </plugin>
+        </plugins>
+    </reporting>
+    <repositories>
+        <!-- OpenDayLight Repo Mirror -->
+        <repository>
+            <id>opendaylight-mirror</id>
+            <name>opendaylight-mirror</name>
+            <url>http://nexus.opendaylight.org/content/groups/public/</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+        </repository>
+
+        <!-- OpenDayLight Snapshot artifact -->
+        <repository>
+            <id>opendaylight-snapshot</id>
+            <name>opendaylight-snapshot</name>
+            <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+    </repositories>
+</project>

diff --git a/common/pom.xml b/common/pom.xml
index cfaf16e46c117908001352ead8f76481a0334404..32c77ea97648bcb176c151bf29c715e950651979 100644 (file)
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -9,14 +9,11 @@
 -->
 <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</artifactId>
-        <version>0.6.2-SNAPSHOT</version>
-    </parent>
 
+    <groupId>org.opendaylight.yangtools</groupId>
+    <version>0.6.2-SNAPSHOT</version>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>common-parent</artifactId>
+    <artifactId>common-aggregator</artifactId>
     <packaging>pom</packaging>
 
     <modules>
@@ -27,27 +24,7 @@
         <module>object-cache-api</module>
         <module>object-cache-guava</module>
         <module>object-cache-noop</module>
+        <module>parent</module>
         <module>util</module>
     </modules>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>object-cache-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>object-cache-guava</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>object-cache-noop</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
 </project>

diff --git a/common/util/pom.xml b/common/util/pom.xml
index 146b009d438035a45b06e1779b9e792350dccb05..081042a406b6dcdc4a2dfc5b630fd33a8abc2b77 100644 (file)
--- a/common/util/pom.xml
+++ b/common/util/pom.xml
@@ -11,8 +11,9 @@
 
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>common-parent</artifactId>
+        <artifactId>yangtools-parent</artifactId>
         <version>0.6.2-SNAPSHOT</version>
+        <relativePath>/../../common/parent/pom.xml</relativePath>
     </parent>
     <packaging>bundle</packaging>
     <modelVersion>4.0.0</modelVersion>

diff --git a/integration-test/bug527-test-model/pom.xml b/integration-test/bug527-test-model/pom.xml
index aa64220cd91fc32a598a5c41fee38851e5139bf4..4dfedba79c419e5205af518eea6c311aab5efdeb 100644 (file)
--- a/integration-test/bug527-test-model/pom.xml
+++ b/integration-test/bug527-test-model/pom.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!-- Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. 
-    This program and the accompanying materials are made available under the 
-    terms of the Eclipse Public License v1.0 which accompanies this distribution, 
+<!-- Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved.
+    This program and the accompanying materials are made available under the
+    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">
 
     <parent>
-        <groupId>org.opendaylight.yangtools.model</groupId>
-        <artifactId>model-parent</artifactId>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-parent</artifactId>
         <version>0.6.2-SNAPSHOT</version>
-        <relativePath>../../model/pom.xml</relativePath>
+        <relativePath>/../../common/parent/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -25,13 +25,17 @@
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
             </plugin>
+            <plugin>
+                    <groupId>org.opendaylight.yangtools</groupId>
+                    <artifactId>yang-maven-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
+                        <Bundle-Name>org.opendaylight.yangtools.model.${project.artifactId}</Bundle-Name>
                     </instructions>
                 </configuration>
             </plugin>
@@ -39,6 +43,16 @@
     </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>
     <dependency>
         <groupId>org.opendaylight.yangtools.model</groupId>
         <artifactId>yang-ext</artifactId>

diff --git a/integration-test/bundle-test/pom.xml b/integration-test/bundle-test/pom.xml
index 5ebad81abc60bdbdd08585ec8fe28456110d2502..4ae787b3d39ba3caa40705c6d6af283d11d95056 100644 (file)
--- a/integration-test/bundle-test/pom.xml
+++ b/integration-test/bundle-test/pom.xml
@@ -8,60 +8,39 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
+        <artifactId>yangtools-parent</artifactId>
         <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>integration-tests</artifactId>
         <version>0.6.2-SNAPSHOT</version>
+        <relativePath>/../../common/parent/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>bundle-test</artifactId>
 
-    <properties>
-        <exam.version>3.0.0</exam.version>
-    </properties>
-
-    <repositories>
-        <repository>
-            <id>thirdparty</id>
-            <name>thirdparty</name>
-            <url>${nexusproxy}/repositories/thirdparty/</url>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-container-native</artifactId>
-            <version>${exam.version}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-junit4</artifactId>
-            <version>${exam.version}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
             <artifactId>pax-exam-link-mvn</artifactId>
-            <version>${exam.version}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>equinoxSDK381</groupId>
             <artifactId>org.eclipse.osgi</artifactId>
-            <version>3.8.1.v20120830-144521</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.0.9</version>
         </dependency>
         <dependency>
             <groupId>org.sonatype.plexus</groupId>
@@ -75,25 +54,18 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-util</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>maven-sal-api-gen-plugin</artifactId>
-            <version>${project.parent.version}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.thirdparty</groupId>
             <artifactId>antlr4-runtime-osgi-nohead</artifactId>
-            <version>4.0</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.thirdparty</groupId>
             <artifactId>xtend-lib-osgi</artifactId>
-            <version>2.4.3</version>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 
@@ -102,49 +74,7 @@
             <plugin>
                 <groupId>org.ops4j.pax.exam</groupId>
                 <artifactId>maven-paxexam-plugin</artifactId>
-                <version>1.2.4</version>
-                <executions>
-                    <execution>
-                        <id>generate-config</id>
-                        <goals>
-                            <goal>generate-depends-file</goal>
-                        </goals>
-                    </execution>
-                </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.ops4j.pax.exam</groupId>
-                                        <artifactId>
-                                            maven-paxexam-plugin
-                                        </artifactId>
-                                        <versionRange>[1.2.4,)</versionRange>
-                                        <goals>
-                                            <goal>generate-depends-file</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <ignore></ignore>
-                                    </action>
-                                </pluginExecution>
-                            </pluginExecutions>
-                        </lifecycleMappingMetadata>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
     </build>
-
 </project>

diff --git a/integration-test/pom.xml b/integration-test/pom.xml
index f609ce861158dfa7509d625177e6dd5ac1241d36..2b9a20c90874456f7ca3e49190bdf48111e8dde7 100644 (file)
--- a/integration-test/pom.xml
+++ b/integration-test/pom.xml
@@ -7,14 +7,10 @@
 <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</artifactId>
-        <version>0.6.2-SNAPSHOT</version>
-    </parent>
-
+    <groupId>org.opendaylight.yangtools</groupId>
+    <version>0.6.2-SNAPSHOT</version>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>integration-tests</artifactId>
+    <artifactId>integration-tests-aggregator</artifactId>
     <packaging>pom</packaging>
 
     <modules>
@@ -25,75 +21,4 @@
         <module>yang-runtime-tests</module>
     </modules>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-common</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-data-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-data-util</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-model-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-model-util</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-binding</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-parser-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-parser-impl</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin-spi</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-            <!-- Plugin-related dependencies -->
-            <dependency>
-                <groupId>org.apache.maven</groupId>
-                <artifactId>maven-core</artifactId>
-                <version>3.0.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.maven</groupId>
-                <artifactId>maven-plugin-api</artifactId>
-                <version>3.0.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>binding-generator-impl</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
 </project>

diff --git a/integration-test/regression-test-model/pom.xml b/integration-test/regression-test-model/pom.xml
index 9cd8a97a72a551af50666ea644a0ea2f3bfd72fd..7f0b373d9a0a72e3518a72334e0d4763240262a0 100644 (file)
--- a/integration-test/regression-test-model/pom.xml
+++ b/integration-test/regression-test-model/pom.xml
@@ -7,11 +7,12 @@
 <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</groupId>
         <version>0.6.2-SNAPSHOT</version>
-        <relativePath>../../model/pom.xml</relativePath>
+        <artifactId>yangtools-parent</artifactId>
+        <relativePath>/../../common/parent/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -31,10 +32,14 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
+                        <Bundle-Name>org.opendaylight.yangtools.model.${project.artifactId}</Bundle-Name>
                     </instructions>
                 </configuration>
             </plugin>
+            <plugin>
+                    <groupId>org.opendaylight.yangtools</groupId>
+                    <artifactId>yang-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
     <dependencies>

diff --git a/integration-test/test-models/pom.xml b/integration-test/test-models/pom.xml
index 1330810048e953495e4191dd036ff919bb061c2a..d3dd239e4cdf68a5e508c85da1a75c68a8a66501 100644 (file)
--- a/integration-test/test-models/pom.xml
+++ b/integration-test/test-models/pom.xml
@@ -11,8 +11,9 @@
 
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>integration-tests</artifactId>
+        <artifactId>yangtools-parent</artifactId>
         <version>0.6.2-SNAPSHOT</version>
+        <relativePath>/../../common/parent/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/integration-test/yang-runtime-tests/pom.xml b/integration-test/yang-runtime-tests/pom.xml
index 033c4944ea15eafd1dfc6a9fd1588bc4385c0e47..beb78c9193491d876d81e1a3f540532646a68091 100644 (file)
--- a/integration-test/yang-runtime-tests/pom.xml
+++ b/integration-test/yang-runtime-tests/pom.xml
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!-- Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. 
-    This program and the accompanying materials are made available under the 
-    terms of the Eclipse Public License v1.0 which accompanies this distribution, 
+<!-- Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved.
+    This program and the accompanying materials are made available under the
+    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">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>integration-tests</artifactId>
+        <artifactId>yangtools-parent</artifactId>
         <version>0.6.2-SNAPSHOT</version>
+        <relativePath>/../../common/parent/pom.xml</relativePath>
     </parent>
+
     <artifactId>yang-runtime-tests</artifactId>
     <packaging>bundle</packaging>
 
@@ -31,7 +34,6 @@
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-topology</artifactId>
-            <version>2013.10.21.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/model/iana/iana-afn-safi/pom.xml b/model/iana/iana-afn-safi/pom.xml
index ab12e14c2eb1cc1de46a71df462e10692851dbbc..34b54a6a73452ec82ad7bf093b7c17d747a1c988 100644 (file)
--- a/model/iana/iana-afn-safi/pom.xml
+++ b/model/iana/iana-afn-safi/pom.xml
@@ -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>

diff --git a/model/iana/iana-if-type/pom.xml b/model/iana/iana-if-type/pom.xml
index 9e20bee8c95f7dd3589574d01c68f9389a038b0e..dbb472788a5b4238321631dad8b03386ceb6c078 100644 (file)
--- a/model/iana/iana-if-type/pom.xml
+++ b/model/iana/iana-if-type/pom.xml
@@ -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>

diff --git a/model/iana/pom.xml b/model/iana/pom.xml
index 7bc1abe2e0331b41105951ab06a009125914dd22..9ad48a2a83da49d27cc052e4baf17156fbea62cc 100644 (file)
--- a/model/iana/pom.xml
+++ b/model/iana/pom.xml
@@ -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>

diff --git a/model/ietf/ietf-inet-types/pom.xml b/model/ietf/ietf-inet-types/pom.xml
index 0186ca24983ae44d9b71a5ef763b2fdf18bc356a..18ceb60480ef09a01141856c270d430ea2533f82 100644 (file)
--- a/model/ietf/ietf-inet-types/pom.xml
+++ b/model/ietf/ietf-inet-types/pom.xml
@@ -21,6 +21,8 @@
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 
+
+
     <build>
         <plugins>
             <plugin>
@@ -36,6 +38,7 @@
                     </instructions>
                 </configuration>
             </plugin>
+
         </plugins>
     </build>
 

diff --git a/model/ietf/ietf-netconf/pom.xml b/model/ietf/ietf-netconf/pom.xml
index 299cfddbf1b2bcf64fd8fb9e5748b925de2b8ff6..23166005206afa8ae7776596552051d52dd14511 100644 (file)
--- a/model/ietf/ietf-netconf/pom.xml
+++ b/model/ietf/ietf-netconf/pom.xml
@@ -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>

diff --git a/model/ietf/ietf-restconf/pom.xml b/model/ietf/ietf-restconf/pom.xml
index 9e8aff00cae7d1af2174f759fc262bd204b03f15..8b62c3e1c71e4ebb26456afe77ce274f3f122947 100644 (file)
--- a/model/ietf/ietf-restconf/pom.xml
+++ b/model/ietf/ietf-restconf/pom.xml
@@ -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>

diff --git a/model/ietf/ietf-ted/pom.xml b/model/ietf/ietf-ted/pom.xml
index 5fdaa6aa8051cb13a402fd9fe0700cf9b580ba7a..8265a7c135b6fed5da815ec434a347e096f033b6 100644 (file)
--- a/model/ietf/ietf-ted/pom.xml
+++ b/model/ietf/ietf-ted/pom.xml
@@ -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>

diff --git a/model/ietf/ietf-topology-isis/pom.xml b/model/ietf/ietf-topology-isis/pom.xml
index 8995299e67ff993f5982b3913cf3c930cf0a2698..b5048c9cc0b0fbf932531690f123d26bd6f6ce5f 100644 (file)
--- a/model/ietf/ietf-topology-isis/pom.xml
+++ b/model/ietf/ietf-topology-isis/pom.xml
@@ -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>

diff --git a/model/ietf/ietf-topology-l3-unicast-igp/pom.xml b/model/ietf/ietf-topology-l3-unicast-igp/pom.xml
index bbc643ab0b5a5105645f9d5241d7be656e79a8e6..2db65be1cd624ee251c8b3d105191243778e652d 100644 (file)
--- a/model/ietf/ietf-topology-l3-unicast-igp/pom.xml
+++ b/model/ietf/ietf-topology-l3-unicast-igp/pom.xml
@@ -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>

diff --git a/model/ietf/ietf-topology-ospf/pom.xml b/model/ietf/ietf-topology-ospf/pom.xml
index 331b610c47da17d04165ebb6f409bcba768e289c..04d847ef7c0cdcaae614d728b149187daebbe887 100644 (file)
--- a/model/ietf/ietf-topology-ospf/pom.xml
+++ b/model/ietf/ietf-topology-ospf/pom.xml
@@ -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>

diff --git a/model/ietf/ietf-topology/pom.xml b/model/ietf/ietf-topology/pom.xml
index 4b72df53a2a923cded8bf233f9292020124dc32e..86b814155451376601c11fbed94a77007dfac6ee 100644 (file)
--- a/model/ietf/ietf-topology/pom.xml
+++ b/model/ietf/ietf-topology/pom.xml
@@ -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>

diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml
index 1cd98f48a3f1d38cef57347c1782d08341288946..50229c823f0f3003173b233b2ebc31f52228fdc5 100644 (file)
--- a/model/ietf/pom.xml
+++ b/model/ietf/pom.xml
@@ -23,7 +23,11 @@
 
     <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>
@@ -42,17 +46,17 @@
             <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>

diff --git a/model/l2-types/pom.xml b/model/l2-types/pom.xml
index 99fc9dec41d36b2311b2f1db7a044cd64cf69722..bbea425cd1740733788737c9d816078567c6e4be 100644 (file)
--- a/model/l2-types/pom.xml
+++ b/model/l2-types/pom.xml
@@ -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>

diff --git a/model/pom.xml b/model/pom.xml
index 3dc26a74396fef51b0a42aa92a6b66e3bf479e76..f0b7c6549d3663a674dddd410214eb903923a2fb 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -11,21 +11,18 @@
 
     <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>
@@ -96,64 +93,16 @@
                 </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>

diff --git a/model/yang-ext/pom.xml b/model/yang-ext/pom.xml
index 6fc7a801ca9d15b3d2c2ba77610d42b03fa6b24f..6a1d7d84e5e486ef9d7dd17033091a5d760df525 100644 (file)
--- a/model/yang-ext/pom.xml
+++ b/model/yang-ext/pom.xml
@@ -10,11 +10,12 @@
 <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>

diff --git a/pom.xml b/pom.xml
index de8b4e1722e1f0ecf50a2a7b057aa6a4d6e91bf4..cf6dcbf84b1b0d514a732ecbde921a184fe938be 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,41 +11,10 @@
          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>
-    <artifactId>yangtools</artifactId>
+    <artifactId>yangtools-aggregator</artifactId>
     <groupId>org.opendaylight.yangtools</groupId>
     <version>0.6.2-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <prerequisites>
-        <maven>3.0.4</maven>
-    </prerequisites>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
-
-        <!-- Java Versions -->
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-
-        <!-- Build Plugin Versions -->
-        <maven.bundle.version>2.4.0</maven.bundle.version>
-        <maven.jar.version>2.3.2</maven.jar.version>
-        <maven.javadoc.version>2.9.1</maven.javadoc.version>
-        <maven.release.version>2.4.2</maven.release.version>
-        <maven.source.version>2.2.1</maven.source.version>
-        <maven.surefire.version>2.16</maven.surefire.version>
-
-        <!-- Supporting Libraries -->
-        <commons.lang.version>3.1</commons.lang.version>
-        <junit.version>4.10</junit.version>
-        <slf4j.version>1.7.2</slf4j.version>
-        <guava.version>14.0.1</guava.version>
-        <xtend.version>2.4.3</xtend.version>
-        <groovy.version>2.1.6</groovy.version>
-        <mockito.version>1.9.5</mockito.version>
-        <javassist.version>3.17.1-GA</javassist.version>
-        <ctrie.version>0.2.0</ctrie.version>
-    </properties>
 
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/yangtools.git</connection>
@@ -65,367 +34,4 @@
         <!-- module>third-party</module -->
     </modules>
 
-    <pluginRepositories>
-        <!-- OpenDayLight Repo Mirror -->
-        <pluginRepository>
-            <id>opendaylight-mirror</id>
-            <name>opendaylight-mirror</name>
-            <url>${nexusproxy}/groups/public/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-        </pluginRepository>
-
-        <!-- OpenDayLight Snapshot artifact -->
-        <pluginRepository>
-            <id>opendaylight-snapshot</id>
-            <name>opendaylight-snapshot</name>
-            <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <repositories>
-        <!-- OpenDayLight Repo Mirror -->
-        <repository>
-            <id>opendaylight-mirror</id>
-            <name>opendaylight-mirror</name>
-            <url>${nexusproxy}/groups/public/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-        </repository>
-
-        <!-- OpenDayLight Snapshot artifact -->
-        <repository>
-            <id>opendaylight-snapshot</id>
-            <name>opendaylight-snapshot</name>
-            <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories>
-
-    <dependencyManagement>
-        <dependencies>
-            <!-- Testing Dependencies -->
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>${junit.version}</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-all</artifactId>
-                <version>${mockito.version}</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-core</artifactId>
-                <version>${mockito.version}</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-simple</artifactId>
-                <version>${slf4j.version}</version>
-                <scope>test</scope>
-            </dependency>
-
-            <!-- Supporting Libraries -->
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>${slf4j.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.guava</groupId>
-                <artifactId>guava</artifactId>
-                <version>${guava.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.xtend</groupId>
-                <artifactId>org.eclipse.xtend.lib</artifactId>
-                <version>${xtend.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>${commons.lang.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.code.findbugs</groupId>
-                <artifactId>jsr305</artifactId>
-                <version>2.0.3</version>
-            </dependency>
-            <dependency>
-                <groupId>com.github.romix</groupId>
-                <artifactId>java-concurrent-hash-trie-map</artifactId>
-                <version>${ctrie.version}</version>
-            </dependency>
-
-            <!-- Plugin integration -->
-            <dependency>
-                <groupId>org.sonatype.plexus</groupId>
-                <artifactId>plexus-build-api</artifactId>
-                <version>0.0.7</version>
-            </dependency>
-            <dependency>
-                <groupId>org.codehaus.plexus</groupId>
-                <artifactId>plexus-slf4j-logging</artifactId>
-                <version>1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>2.4</version>
-            </dependency>
-
-
-            <!-- Our artifacts -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>concepts</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>object-cache-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>object-cache-guava</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>object-cache-noop</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>util</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-        </dependency>
-    </dependencies>
-
-    <distributionManagement>
-        <!-- OpenDayLight Released artifact -->
-        <repository>
-            <id>opendaylight-release</id>
-            <url>${nexusproxy}/repositories/opendaylight.release/</url>
-        </repository>
-        <!-- OpenDayLight Snapshot artifact -->
-        <snapshotRepository>
-            <id>opendaylight-snapshot</id>
-            <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
-        </snapshotRepository>
-        <site>
-            <id>${project.artifactId}-site</id>
-            <url>./</url>
-        </site>
-    </distributionManagement>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>${maven.jar.version}</version>
-                    <configuration>
-                        <archive>
-                            <!-- Bundle OSGi Manifest created by maven-bundle-plugin
-                                into jar file -->
-                            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                        </archive>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <version>${maven.bundle.version}</version>
-                    <extensions>true</extensions>
-                    <executions>
-                        <execution>
-                            <id>bundle-manifest</id>
-                            <phase>process-classes</phase>
-                            <goals>
-                                <goal>manifest</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                    <configuration>
-                        <instructions>
-                            <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                            <!--
-                                                        <Export-Package>*</Export-Package>
-                            -->
-                        </instructions>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.eclipse.xtend</groupId>
-                    <artifactId>xtend-maven-plugin</artifactId>
-                    <version>${xtend.version}</version>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>compile</goal>
-                            </goals>
-                            <configuration>
-                                <outputDirectory>${basedir}/src/main/xtend-gen</outputDirectory>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-clean-plugin</artifactId>
-                    <version>2.5</version>
-                    <configuration>
-                        <filesets>
-                            <fileset>
-                                <directory>${basedir}/src/main/xtend-gen</directory>
-                                <includes>
-                                    <include>**</include>
-                                </includes>
-                            </fileset>
-                        </filesets>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.eclipse.m2e</groupId>
-                    <artifactId>lifecycle-mapping</artifactId>
-                    <version>1.0.0</version>
-                    <configuration>
-                        <lifecycleMappingMetadata>
-                            <pluginExecutions>
-                                <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>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>${maven.javadoc.version}</version>
-                    <configuration>
-                        <stylesheetfile>stylesheet.css</stylesheetfile>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <id>attach-javadocs</id>
-                            <goals>
-                                <goal>jar</goal>
-                            </goals>
-                        </execution>
-                        <execution>
-                            <goals>
-                                <goal>aggregate</goal>
-                            </goals>
-                            <phase>site</phase>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>${maven.release.version}</version>
-
-                    <!-- Since we have a maven plugin, we need to install it -->
-                    <configuration>
-                        <preparationGoals>clean install</preparationGoals>
-                        <completionGoals>clean install</completionGoals>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>${maven.source.version}</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>2.5.3</version>
-                <configuration>
-                    <effort>Max</effort>
-                    <threshold>Low</threshold>
-                    <goal>site</goal>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jdepend-maven-plugin</artifactId>
-                <version>2.0-beta-2</version>
-            </plugin>
-        </plugins>
-    </reporting>
 </project>

diff --git a/restconf/pom.xml b/restconf/pom.xml
index 18392f22f36af78acc8134a5db364e9d711008a5..193d56c5fd68b79093b508b0e5e5bd67e6b4eda9 100644 (file)
--- a/restconf/pom.xml
+++ b/restconf/pom.xml
@@ -11,14 +11,11 @@
 
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yangtools</artifactId>
+        <artifactId>yangtools-parent</artifactId>
         <version>0.6.2-SNAPSHOT</version>
+        <relativePath>../common/parent</relativePath>
     </parent>
-
-    <properties>
-        <yang.binding.version>${project.version}</yang.binding.version>
-    </properties>
-
+    <groupId>org.opendaylight.yangtools</groupId>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>restconf-parent</artifactId>
     <packaging>pom</packaging>
@@ -32,114 +29,6 @@
         <module>restconf-client-impl</module>
   </modules>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>websocket-client</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>restconf-client-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>restconf-common</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>restconf-util</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>restconf-test-service</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>restconf-client-impl</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>restconf-jaxrs-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-common</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-data-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-data-util</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-data-impl</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-model-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-binding</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>concepts</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>javax.ws.rs</groupId>
-                <artifactId>javax.ws.rs-api</artifactId>
-                <version>2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.ws.rs</groupId>
-                <artifactId>jsr311-api</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.glassfish.jersey.ext</groupId>
-                <artifactId>jersey-proxy-client</artifactId>
-                <version>2.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jersey.core</groupId>
-                <artifactId>jersey-client</artifactId>
-                <version>2.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-model-util</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>binding-generator-impl</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <build>
         <plugins>
             <plugin>
@@ -162,40 +51,5 @@
                 </executions>
             </plugin>
         </plugins>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <version>${maven.bundle.version}</version>
-                    <extensions>true</extensions>
-                </plugin>
-                <plugin>
-                    <groupId>org.eclipse.m2e</groupId>
-                    <artifactId>lifecycle-mapping</artifactId>
-                    <version>1.0.0</version>
-                    <configuration>
-                        <lifecycleMappingMetadata>
-                            <pluginExecutions>
-                                <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>
-
 </project>

diff --git a/restconf/restconf-client-api/pom.xml b/restconf/restconf-client-api/pom.xml
index 91e08bd124399958b5d32c5ee2d3231dc795381d..195ed6524a386ea4944a0dd0477c25dec4fcd6dd 100644 (file)
--- a/restconf/restconf-client-api/pom.xml
+++ b/restconf/restconf-client-api/pom.xml
@@ -12,7 +12,7 @@
     <artifactId>restconf-client-api</artifactId>
     <packaging>bundle</packaging>
 
-    <parent>
+   <parent>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>restconf-parent</artifactId>
         <version>0.6.2-SNAPSHOT</version>

diff --git a/restconf/restconf-client-impl/pom.xml b/restconf/restconf-client-impl/pom.xml
index 75eefd3780651bc2f5700d162ab4b628fb93ad48..6431684f3d7ac9baf77afa2064e28b2807a9bf72 100644 (file)
--- a/restconf/restconf-client-impl/pom.xml
+++ b/restconf/restconf-client-impl/pom.xml
@@ -10,12 +10,12 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.opendaylight.yangtools</groupId>
-    <artifactId>restconf-parent</artifactId>
-    <version>0.6.2-SNAPSHOT</version>
-  </parent>
 
+    <parent>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>restconf-parent</artifactId>
+        <version>0.6.2-SNAPSHOT</version>
+    </parent>
 
   <artifactId>restconf-client-impl</artifactId>
   <packaging>bundle</packaging>

diff --git a/restconf/restconf-common/pom.xml b/restconf/restconf-common/pom.xml
index 934fe1686be72a4af39ebb0108037b998a530afe..102ddf760b0fa5658a583efa9498fd9cf674ca19 100644 (file)
--- a/restconf/restconf-common/pom.xml
+++ b/restconf/restconf-common/pom.xml
@@ -10,6 +10,7 @@
 <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">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>restconf-parent</artifactId>

diff --git a/restconf/restconf-jaxrs-api/pom.xml b/restconf/restconf-jaxrs-api/pom.xml
index f62df8a9ba2f43e71d703f29a8584d707ed15ba5..292b7d0f5b5693fabdfd3b205a20b462b090443f 100644 (file)
--- a/restconf/restconf-jaxrs-api/pom.xml
+++ b/restconf/restconf-jaxrs-api/pom.xml
@@ -15,7 +15,6 @@
         <artifactId>restconf-parent</artifactId>
         <version>0.6.2-SNAPSHOT</version>
     </parent>
-
     <artifactId>restconf-jaxrs-api</artifactId>
     <name>restconf-jaxrs-api</name>
 

diff --git a/restconf/restconf-test-service/pom.xml b/restconf/restconf-test-service/pom.xml
index d20270a3394698116dc1389d00a727b63fd0b09e..e5e2a1b98042a887fb5291b62c2a97d9c9269b4d 100644 (file)
--- a/restconf/restconf-test-service/pom.xml
+++ b/restconf/restconf-test-service/pom.xml
@@ -10,14 +10,14 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.opendaylight.yangtools</groupId>
-    <artifactId>restconf-parent</artifactId>
-    <version>0.6.2-SNAPSHOT</version>
-  </parent>
 
+    <parent>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>restconf-parent</artifactId>
+        <version>0.6.2-SNAPSHOT</version>
+    </parent>
 
-  <artifactId>restconf-test-service</artifactId>
+    <artifactId>restconf-test-service</artifactId>
   <dependencies>
       <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
@@ -36,7 +36,7 @@
         <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
     </plugin>
-    <plugin>
+<!--    <plugin>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yang-maven-plugin</artifactId>
         <version>${project.version}</version>
@@ -74,7 +74,7 @@
                 <type>jar</type>
             </dependency>
         </dependencies>
-    </plugin>
+    </plugin> -->
     </plugins>
     </build>
 </project>

diff --git a/restconf/restconf-util/pom.xml b/restconf/restconf-util/pom.xml
index 06c4863a07e3dba0adf81e538cb5c16659031146..99c08eb51511cbf3c24d57d81a6a35a8fe84e499 100644 (file)
--- a/restconf/restconf-util/pom.xml
+++ b/restconf/restconf-util/pom.xml
@@ -7,6 +7,7 @@
 <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">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>restconf-parent</artifactId>

diff --git a/third-party/antlr4-runtime-osgi/pom.xml b/third-party/antlr4-runtime-osgi/pom.xml
index 2232c1315792d3813c24caa5cd19abac0986dc74..061363e288860fe849b0e749c275e4dc10be34cd 100644 (file)
--- a/third-party/antlr4-runtime-osgi/pom.xml
+++ b/third-party/antlr4-runtime-osgi/pom.xml
@@ -10,11 +10,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">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
-        <groupId>org.opendaylight.yangtools.thirdparty</groupId>
+        <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>third-party-parent</artifactId>
-        <version>0.1.2</version>
+        <version>0.6.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
+
     <artifactId>antlr4-runtime-osgi-nohead</artifactId>
     <version>4.0</version>
     <packaging>bundle</packaging>

diff --git a/third-party/pom.xml b/third-party/pom.xml
index 43224c28ab8a7725fccc7d0bf57b30cb9cf1f55c..ba1b0fe6ce424861a9296606325dd340df832c0d 100644 (file)
--- a/third-party/pom.xml
+++ b/third-party/pom.xml
@@ -10,73 +10,24 @@
 <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">
     <modelVersion>4.0.0</modelVersion>
+   
+    <parent>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-parent</artifactId>
+        <version>0.6.2-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
+    </parent>
+
 
-    <version>0.1.2</version>
     <groupId>org.opendaylight.yangtools.thirdparty</groupId>
     <artifactId>third-party-parent</artifactId>
     <packaging>pom</packaging>
 
-    <properties>
-        <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
-    </properties>
-
-    <scm>
-        <connection>scm:git:ssh://git.opendaylight.org:29418/yangtools.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/yangtools.git</developerConnection>
-        <url>https://wiki.opendaylight.org/view/YANG_Tools:Third-Party</url>
-    </scm>
-
     <modules>
         <module>xtend-lib-osgi</module>
         <module>antlr4-runtime-osgi</module>
     </modules>
 
-    <repositories>
-        <!-- OpenDayLight Repo Mirror -->
-        <repository>
-            <id>opendaylight-mirror</id>
-            <name>opendaylight-mirror</name>
-            <url>${nexusproxy}/groups/public/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-        </repository>
-
-        <!-- OpenDayLight Snapshot artifact -->
-        <repository>
-            <id>opendaylight-snapshot</id>
-            <name>opendaylight-snapshot</name>
-            <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories>
-
-    <distributionManagement>
-        <!-- OpenDayLight Released artifact -->
-        <repository>
-            <id>opendaylight-release</id>
-            <url>${nexusproxy}/repositories/opendaylight.release/</url>
-        </repository>
-        <!-- OpenDayLight Snapshot artifact -->
-        <snapshotRepository>
-            <id>opendaylight-snapshot</id>
-            <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
-        </snapshotRepository>
-        <site>
-            <id>${project.artifactId}-site</id>
-            <url>./</url>
-        </site>
-    </distributionManagement>
-
     <build>
         <plugins>
             <plugin>
@@ -92,4 +43,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

diff --git a/third-party/xtend-lib-osgi/pom.xml b/third-party/xtend-lib-osgi/pom.xml
index 16edbf6536266a130155177eaab6bc5a1018236a..2a4017530c477e9d1e3faae8261c27ebcc86084d 100644 (file)
--- a/third-party/xtend-lib-osgi/pom.xml
+++ b/third-party/xtend-lib-osgi/pom.xml
@@ -11,10 +11,12 @@
     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>
-        <groupId>org.opendaylight.yangtools.thirdparty</groupId>
+        <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>third-party-parent</artifactId>
-        <version>0.1.2</version>
+        <version>0.6.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
+
     <artifactId>xtend-lib-osgi</artifactId>
     <version>2.4.3</version>
     <packaging>bundle</packaging>

diff --git a/websocket/pom.xml b/websocket/pom.xml
index d3c9ccf95fd1e09c3e8377b639ca0529ffb6fa13..578384aa5a9a8ca072dc47ad12a218f5cc1901a0 100644 (file)
--- a/websocket/pom.xml
+++ b/websocket/pom.xml
@@ -11,26 +11,13 @@
     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>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yangtools</artifactId>
-        <version>0.6.2-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>websocket-parent</artifactId>
+    <groupId>org.opendaylight.yangtools</groupId>
+    <version>0.6.2-SNAPSHOT</version>
+    <artifactId>websocket-aggregator</artifactId>
     <packaging>pom</packaging>
 
     <modules>
         <module>websocket-client</module>
     </modules>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-codec-http</artifactId>
-                <version>4.0.10.Final</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
 </project>

diff --git a/websocket/websocket-client/pom.xml b/websocket/websocket-client/pom.xml
index 9a1c8df5ae31ecb16f12c60fc8d21114e0ab0341..5276049630adccd14b1371b31cf1d23fae8f3a23 100644 (file)
--- a/websocket/websocket-client/pom.xml
+++ b/websocket/websocket-client/pom.xml
@@ -13,8 +13,9 @@
 
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>websocket-parent</artifactId>
+        <artifactId>yangtools-parent</artifactId>
         <version>0.6.2-SNAPSHOT</version>
+        <relativePath>/../../common/parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>websocket-client</artifactId>

diff --git a/yang/pom.xml b/yang/pom.xml
index 5cbc84271de3ccdb5dd7c02d37cfc2e6b63e0afc..5ed681efabbe66441c2d22cb4ba917a243c0a6a7 100644 (file)
--- a/yang/pom.xml
+++ b/yang/pom.xml
@@ -9,14 +9,10 @@
 -->
 <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</artifactId>
-        <version>0.6.2-SNAPSHOT</version>
-    </parent>
-
+    <groupId>org.opendaylight.yangtools</groupId>
+    <version>0.6.2-SNAPSHOT</version>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>yang</artifactId>
+    <artifactId>yang-aggregator</artifactId>
     <packaging>pom</packaging>
 
     <modules>
@@ -35,84 +31,4 @@
         <module>yang-parser-impl</module>
         <module>yang-data-json</module>
     </modules>
-
-    <properties>
-        <bundle.plugin.version>2.3.7</bundle.plugin.version>
-    </properties>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-common</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-data-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-data-impl</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-data-json</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-data-util</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-model-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-model-util</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-binding</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-parser-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-parser-impl</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin-spi</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-            <!-- Plugin-related dependencies -->
-            <dependency>
-                <groupId>org.apache.maven</groupId>
-                <artifactId>maven-core</artifactId>
-                <version>3.0.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.maven</groupId>
-                <artifactId>maven-plugin-api</artifactId>
-                <version>3.0.5</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
 </project>

diff --git a/yang/yang-binding/pom.xml b/yang/yang-binding/pom.xml
index 679ba67a453894323fcb599096bb909438f5b903..30c62fb271e21c19f48b2748c02ae496906e16e5 100644 (file)
--- a/yang/yang-binding/pom.xml
+++ b/yang/yang-binding/pom.xml
@@ -11,11 +11,13 @@
 
     <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>

diff --git a/yang/yang-common/pom.xml b/yang/yang-common/pom.xml
index c2fea0c66cf538905644dcd975376529d152af44..32038f430e41c71f2bb0eb1f0673660b502cbe7f 100644 (file)
--- a/yang/yang-common/pom.xml
+++ b/yang/yang-common/pom.xml
@@ -11,8 +11,9 @@
 
     <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>

diff --git a/yang/yang-data-api/pom.xml b/yang/yang-data-api/pom.xml
index dd492c6b9657cd26a1b529851520c4fc875796ce..df63489646cbc3e1df8a8bdeea644abfe3f8efc7 100644 (file)
--- a/yang/yang-data-api/pom.xml
+++ b/yang/yang-data-api/pom.xml
@@ -11,8 +11,9 @@
 
     <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>

diff --git a/yang/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml
index 538195109bda19c52cc31fe90d9441269cdf1bae..8543c2be35a44e908fa657062ecd210727efd696 100644 (file)
--- a/yang/yang-data-impl/pom.xml
+++ b/yang/yang-data-impl/pom.xml
@@ -11,8 +11,9 @@
 
     <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>
@@ -20,9 +21,6 @@
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
 
-    <properties>
-        <groovy.version>2.1.6</groovy.version>
-    </properties>
 
     <build>
         <plugins>
@@ -88,25 +86,21 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>${slf4j.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy</artifactId>
-            <version>${groovy.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-xml</artifactId>
-            <version>${groovy.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>xmlunit</groupId>
             <artifactId>xmlunit</artifactId>
-            <version>1.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -117,7 +111,6 @@
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/yang/yang-data-json/pom.xml b/yang/yang-data-json/pom.xml
index 9327cf847d9922f6e8971ce452232ae08067661b..228b9d82d2892afcfd18ea547795548dcfc7d751 100644 (file)
--- a/yang/yang-data-json/pom.xml
+++ b/yang/yang-data-json/pom.xml
@@ -9,8 +9,9 @@
 
        <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>

diff --git a/yang/yang-data-operations/pom.xml b/yang/yang-data-operations/pom.xml
index dee77da4a0c3a48bf65924569ed0d59951642bee..8d5397bb069faac2611a34ebc22c738f690495e1 100644 (file)
--- a/yang/yang-data-operations/pom.xml
+++ b/yang/yang-data-operations/pom.xml
@@ -11,8 +11,9 @@
 
     <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>

diff --git a/yang/yang-data-util/pom.xml b/yang/yang-data-util/pom.xml
index 8fef0865e4a639f73e0f46a8660d6a651adeb3f6..d6615f7afba3229e8883a017e88718aaee932196 100644 (file)
--- a/yang/yang-data-util/pom.xml
+++ b/yang/yang-data-util/pom.xml
@@ -11,8 +11,9 @@
 
     <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>

diff --git a/yang/yang-maven-plugin-it/pom.xml b/yang/yang-maven-plugin-it/pom.xml
index bc4ade4bce7abd8229f01350404c66d21c082639..866b156f4e9ad77b871bbce4561c832df0d3be5b 100644 (file)
--- a/yang/yang-maven-plugin-it/pom.xml
+++ b/yang/yang-maven-plugin-it/pom.xml
@@ -11,8 +11,9 @@
 
     <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>
@@ -22,7 +23,6 @@
         <dependency>
             <groupId>org.apache.maven.shared</groupId>
             <artifactId>maven-verifier</artifactId>
-            <version>1.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/yang/yang-maven-plugin-spi/pom.xml b/yang/yang-maven-plugin-spi/pom.xml
index ade092188db08af227e42f39cf4cf7e6c3c695b1..2cdd00bc40c066f5324f381ca3cd031b83c3d532 100644 (file)
--- a/yang/yang-maven-plugin-spi/pom.xml
+++ b/yang/yang-maven-plugin-spi/pom.xml
@@ -11,8 +11,9 @@
 
     <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>

diff --git a/yang/yang-maven-plugin/pom.xml b/yang/yang-maven-plugin/pom.xml
index 8ffa8204c2ec04fc49f8815ab0b226a68fccdbd8..90beda09f1ace618fccc053429f5e821dea3e0c1 100644 (file)
--- a/yang/yang-maven-plugin/pom.xml
+++ b/yang/yang-maven-plugin/pom.xml
@@ -11,11 +11,13 @@
 
     <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-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
     <description>

diff --git a/yang/yang-model-api/pom.xml b/yang/yang-model-api/pom.xml
index 8f16814a374300e594ba11c54680a0ec6c09c63f..10d7a13fdafcc2c7ce1bbd9c4d8ab7a0f0a2ea99 100644 (file)
--- a/yang/yang-model-api/pom.xml
+++ b/yang/yang-model-api/pom.xml
@@ -11,8 +11,9 @@
 
     <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>

diff --git a/yang/yang-model-util/pom.xml b/yang/yang-model-util/pom.xml
index 5cf126d0a253de5055fadcf41fc0cf02f14389b5..c4c5a8720fd1edf239ecd76466bb91373223a9f7 100644 (file)
--- a/yang/yang-model-util/pom.xml
+++ b/yang/yang-model-util/pom.xml
@@ -11,8 +11,9 @@
 
     <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>

diff --git a/yang/yang-parser-api/pom.xml b/yang/yang-parser-api/pom.xml
index a7e145ba2e5e15f41ad0e88373904cd9d106f121..5188319263d51f97a445c832b59098ea4f762a1e 100644 (file)
--- a/yang/yang-parser-api/pom.xml
+++ b/yang/yang-parser-api/pom.xml
@@ -11,8 +11,9 @@
 
     <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>

diff --git a/yang/yang-parser-impl/pom.xml b/yang/yang-parser-impl/pom.xml
index 7e436362f4a8bee0d56a93472a79d451308149ec..8d1c6d9ad60d3aa7d7e1e3133769addabe45b948 100644 (file)
--- a/yang/yang-parser-impl/pom.xml
+++ b/yang/yang-parser-impl/pom.xml
@@ -11,8 +11,9 @@
 
     <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>
@@ -89,7 +90,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.8</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>