Bump odlparent to 3.1.1

[yangtools.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 572b21b28805d229fb070847bf32134301bd65e5..ec7b7811637cbf25718c9ca3aba0ff1bd028a3be 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -7,18 +7,19 @@
  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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>yangtools-parent</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-      <relativePath>common/parent</relativePath>
+      <groupId>org.opendaylight.odlparent</groupId>
+      <artifactId>odlparent-lite</artifactId>
+      <version>3.1.1</version>
+      <relativePath/>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>yangtools-aggregator</artifactId>
+    <version>2.0.4-SNAPSHOT</version>
     <name>yangtools</name> <!-- Used by Sonar to set project name -->
     <packaging>pom</packaging>
 
@@ -31,9 +32,10 @@
 
     <modules>
         <module>common</module>
+        <module>features</module>
         <module>yang</module>
-        <module>websocket</module>
         <module>yang-validation-tool</module>
+        <module>third-party</module>
     </modules>
 
     <profiles>
@@ -47,17 +49,6 @@
         </modules>
       </profile>
 
-      <!-- Turn off doclint on aggregated API javadoc build -->
-      <profile>
-        <id>jdk8</id>
-        <activation>
-          <jdk>[1.8,)</jdk>
-        </activation>
-        <properties>
-          <javadoc.args>-Xdoclint:none</javadoc.args>
-        </properties>
-      </profile>
-
       <profile>
         <!--
             This profile is to ensure we only build javadocs reports
@@ -84,8 +75,8 @@
                   </goals>
                   <phase>package</phase>
                   <configuration>
-                    <!-- ignore javadoc warnings caused by JDK8 -->
-                    <additionalparam>${javadoc.args}</additionalparam>
+                    <!-- Xerces-J has non-compliant javadocs -->
+                    <additionalparam>-Xdoclint:none</additionalparam>
                   </configuration>
               </execution>
               </executions>
@@ -99,49 +90,18 @@
         <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>
 
-  <!--
-      Maven Site Configuration
-
-      The following configuration is necessary for maven-site-plugin to
-      correctly identify the correct deployment path for OpenDaylight Maven
-      sites.
-  -->
-  <url>${odl.site.url}/${project.groupId}/${stream}/</url>
-
-  <distributionManagement>
-    <site>
-      <id>opendaylight-site</id>
-      <url>${nexus.site.url}/</url>
-    </site>
-  </distributionManagement>
 </project>