From 83c87ccd0cbdf125edfcbe24dd74e6d5f6b72f4e Mon Sep 17 00:00:00 2001
From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Wed, 16 Dec 2015 00:03:42 -0500
Subject: [PATCH] Enable checkstyle plugin and switch to odlparent

- Switches parent to odlparent
- Enables checkstyle plugin

Change-Id: Ie91049bcf9eb65bf8e3106e062bb6ec065a00cc3
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---
 packetcable-driver/pom.xml | 13 +++++++++++++
 pom.xml                    | 33 +++++++--------------------------
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/packetcable-driver/pom.xml b/packetcable-driver/pom.xml
index 4269718..d20f516 100644
--- a/packetcable-driver/pom.xml
+++ b/packetcable-driver/pom.xml
@@ -158,4 +158,17 @@
 			</plugin>
 		</plugins>
 	</build>
+
+  <profiles>
+    <!-- Disable Java 8 linter since umu/cops fails it -->
+    <profile>
+      <id>jdk8</id>
+      <activation>
+        <jdk>[1.8,)</jdk>
+      </activation>
+      <properties>
+        <additionalparam>-Xdoclint:none</additionalparam>
+      </properties>
+    </profile>
+  </profiles>
 </project>
diff --git a/pom.xml b/pom.xml
index 8c100ea..2f76ea6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,17 +4,19 @@
     <modelVersion>4.0.0</modelVersion>
     <!-- FIXME: Do not use sal-parent, use odlparent:odlparent or mdsal:binding-parent intstead. -->
     <parent>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal-parent</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
-        <relativePath />
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent</artifactId>
+        <version>1.6.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
     <groupId>org.opendaylight.packetcable</groupId>
     <artifactId>packetcable</artifactId>
+    <version>1.3.0-SNAPSHOT</version>
     <name>packetcable</name> <!-- Used by Sonar to set project name -->
     <packaging>pom</packaging>
     <properties>
         <openflowplugin.version>0.2.0-SNAPSHOT</openflowplugin.version>
+        <controller.model.version>1.3.0-SNAPSHOT</controller.model.version>
     </properties>
     <distributionManagement>
         <!-- OpenDayLight Released artifact -->
@@ -75,21 +77,10 @@
             <artifactId>model-flow-service</artifactId>
             <version>${openflowplugin.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-inet-types</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-yang-types</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-inventory</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>opendaylight-l2-types</artifactId>
+            <version>${controller.model.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin.model</groupId>
@@ -97,14 +88,4 @@
             <version>${openflowplugin.version}</version>
         </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
-- 
2.36.6