Switch to odlparent-lite

The aggregator should not be inheriting from the full parent, just lite.

Change-Id: I9b449d48b28b170040f1f14bace8edab8a5e9fb4
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/pom.xml b/pom.xml
index db64d46fa3969a979e0f8b34108e749027705f04..43729673d177213b81bffcbcec5bdeb5a334f552 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,14 +11,16 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>yangtools-parent</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-      <relativePath>common/parent</relativePath>
+      <groupId>org.opendaylight.odlparent</groupId>
+      <artifactId>odlparent-lite</artifactId>
+      <version>1.7.0-SNAPSHOT</version>
+      <relativePath/>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>yangtools-aggregator</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
     <name>yangtools</name> <!-- Used by Sonar to set project name -->
     <packaging>pom</packaging>
 
@@ -88,32 +90,16 @@
         <pluginManagement>
             <plugins>
                 <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-checkstyle-plugin</artifactId>
-                 <configuration>
-                   <failOnViolation>false</failOnViolation>
-                   <configLocation>checkstyle-logging.xml</configLocation>
-                   <consoleOutput>true</consoleOutput>
-                   <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                   <sourceDirectory>${project.basedir}</sourceDirectory>
-                   <includes>**\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/*.yang</includes>
-                   <excludes>**\/target\/,**\/bin\/,**\/target-ide\/,**\/src/main/yang-gen-config\/,**\/src/main/yang-gen-sal\/,**\/src/main/xtend-gen\/</excludes>
-                 </configuration>
-                 <dependencies>
-                   <dependency>
-                     <groupId>org.opendaylight.yangtools</groupId>
-                     <artifactId>checkstyle-logging</artifactId>
-                     <version>${project.version}</version>
-                   </dependency>
-                 </dependencies>
-                 <executions>
-                   <execution>
-                     <goals>
-                       <goal>check</goal>
-                     </goals>
-                   </execution>
-                 </executions>
-               </plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-checkstyle-plugin</artifactId>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.opendaylight.yangtools</groupId>
+                            <artifactId>checkstyle-logging</artifactId>
+                            <version>${project.version}</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>

diff --git a/yang-validation-tool/pom.xml b/yang-validation-tool/pom.xml
index 6c441f7ba60c64ec322a08b8710839e669eebe60..fae8e2376858724b0e020c373f59d637a473f68f 100644 (file)
--- a/yang-validation-tool/pom.xml
+++ b/yang-validation-tool/pom.xml
@@ -12,9 +12,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yangtools-aggregator</artifactId>
+        <artifactId>yangtools-parent</artifactId>
         <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../common/parent</relativePath>
     </parent>
+
     <artifactId>yang-validation-tool</artifactId>
 
     <dependencies>
@@ -37,6 +39,7 @@
             <artifactId>guava</artifactId>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>