From 7eba8dd46119ea7f8a3c2b6abecf640730d503a5 Mon Sep 17 00:00:00 2001
From: Tom Pantelis <tompantelis@gmail.com>
Date: Tue, 19 Dec 2017 16:47:14 -0500
Subject: [PATCH] Bump odlparent-3.0.2-SNAPSHOT to 3.0.2

Bump to yangtools-2.0.0 and odlparent-3.0.2

Change-Id: I88e82f3c6c9030051f367cd95d6559ad078f78aa
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
---
 .../features4-packetcable-policy/pom.xml      |   2 +-
 .../odl-packetcable-policy-model/pom.xml      |   2 +-
 .../odl-packetcable-policy-server-all/pom.xml |   2 +-
 .../odl-packetcable-policy-server/pom.xml     |   2 +-
 features-packetcable-policy/pom.xml           |   2 +-
 packetcable-driver/pom.xml                    | 222 +++++++++---------
 packetcable-policy-karaf/pom.xml              |   2 +-
 pom.xml                                       |   2 +-
 8 files changed, 119 insertions(+), 117 deletions(-)

diff --git a/features-packetcable-policy/features4-packetcable-policy/pom.xml b/features-packetcable-policy/features4-packetcable-policy/pom.xml
index 1ad7b30..e2be200 100644
--- a/features-packetcable-policy/features4-packetcable-policy/pom.xml
+++ b/features-packetcable-policy/features4-packetcable-policy/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
     
diff --git a/features-packetcable-policy/odl-packetcable-policy-model/pom.xml b/features-packetcable-policy/odl-packetcable-policy-model/pom.xml
index 2b91b9c..8e271cf 100644
--- a/features-packetcable-policy/odl-packetcable-policy-model/pom.xml
+++ b/features-packetcable-policy/odl-packetcable-policy-model/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 
diff --git a/features-packetcable-policy/odl-packetcable-policy-server-all/pom.xml b/features-packetcable-policy/odl-packetcable-policy-server-all/pom.xml
index 7347190..52c90a0 100644
--- a/features-packetcable-policy/odl-packetcable-policy-server-all/pom.xml
+++ b/features-packetcable-policy/odl-packetcable-policy-server-all/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 
diff --git a/features-packetcable-policy/odl-packetcable-policy-server/pom.xml b/features-packetcable-policy/odl-packetcable-policy-server/pom.xml
index 51f9311..c59e679 100644
--- a/features-packetcable-policy/odl-packetcable-policy-server/pom.xml
+++ b/features-packetcable-policy/odl-packetcable-policy-server/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 
diff --git a/features-packetcable-policy/pom.xml b/features-packetcable-policy/pom.xml
index 3c93d36..6fda7ed 100644
--- a/features-packetcable-policy/pom.xml
+++ b/features-packetcable-policy/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath />
     </parent>
     <artifactId>features-packetcable-policy-aggregator</artifactId>
diff --git a/packetcable-driver/pom.xml b/packetcable-driver/pom.xml
index 9c218b1..28627bc 100644
--- a/packetcable-driver/pom.xml
+++ b/packetcable-driver/pom.xml
@@ -1,112 +1,114 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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.packetcable</groupId>
-		<artifactId>packetcable</artifactId>
-		<version>1.7.0-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<artifactId>packetcable-driver</artifactId>
-	<packaging>bundle</packaging>
-
-	<description>
+    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.packetcable</groupId>
+        <artifactId>packetcable</artifactId>
+        <version>1.7.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+    <artifactId>packetcable-driver</artifactId>
+    <packaging>bundle</packaging>
+
+    <description>
         A lightweight implementation of PCMM COPS PDP client
     </description>
 
-	<url></url>
-	<inceptionYear>2013</inceptionYear>
-
-	<licenses>
-		<license>
-		</license>
-	</licenses>
-
-	<mailingLists>
-		<mailingList>
-		</mailingList>
-	</mailingLists>
-
-	<developers>
-		<developer>
-		</developer>
-	</developers>
-
-	<contributors>
-		<contributor>
-		</contributor>
-	</contributors>
-
-	<scm>
-		<connection></connection>
-		<developerConnection></developerConnection>
-		<url></url>
-	</scm>
-
-	<issueManagement>
-		<system></system>
-		<url></url>
-	</issueManagement>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<yangtools.version>1.2.0</yangtools.version>
-		<salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
-		<nexus.repository.snapshot>opendaylight.snapshot</nexus.repository.snapshot>
-		<nexus.repository.release>opendaylight.release</nexus.repository.release>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-		</dependency>
-	</dependencies>
-
-	<modules></modules>
-
-	<build>
-		<directory>${project.basedir}/target</directory>
-		<outputDirectory>${project.build.directory}/classes</outputDirectory>
-		<finalName>${project.artifactId}-${project.version}</finalName>
-		<testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
-		<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
-		<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
-		<resources>
-			<resource>
-				<directory>${project.basedir}/src/main/resources</directory>
-			</resource>
-		</resources>
-		<testResources>
-			<testResource>
-				<directory>${project.basedir}/src/test/resources</directory>
-			</testResource>
-		</testResources>
-		<plugins>
-
-		<plugin>
+    <url></url>
+    <inceptionYear>2013</inceptionYear>
+
+    <licenses>
+        <license>
+        </license>
+    </licenses>
+
+    <mailingLists>
+        <mailingList>
+        </mailingList>
+    </mailingLists>
+
+    <developers>
+        <developer>
+        </developer>
+    </developers>
+
+    <contributors>
+        <contributor>
+        </contributor>
+    </contributors>
+
+    <scm>
+        <connection></connection>
+        <developerConnection></developerConnection>
+        <url></url>
+    </scm>
+
+    <issueManagement>
+        <system></system>
+        <url></url>
+    </issueManagement>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <yangtools.version>2.0.0</yangtools.version>
+        <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
+        <nexus.repository.snapshot>opendaylight.snapshot</nexus.repository.snapshot>
+        <nexus.repository.release>opendaylight.release</nexus.repository.release>
+        <maven.javadoc.skip>true</maven.javadoc.skip>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+    </dependencies>
+
+    <modules></modules>
+
+    <build>
+        <directory>${project.basedir}/target</directory>
+        <outputDirectory>${project.build.directory}/classes</outputDirectory>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+        <testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
+        <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
+        <testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
+        <resources>
+            <resource>
+                <directory>${project.basedir}/src/main/resources</directory>
+            </resource>
+        </resources>
+        <testResources>
+            <testResource>
+                <directory>${project.basedir}/src/test/resources</directory>
+            </testResource>
+        </testResources>
+        <plugins>
+
+        <plugin>
           <artifactId>maven-checkstyle-plugin</artifactId>
           <version>${checkstyle.version}</version>
           <dependencies>
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
               <artifactId>checkstyle</artifactId>
-              <version>${odl.checkstyle.version}</version>
+              <version>3.0.2</version>
             </dependency>
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
               <artifactId>odl-license</artifactId>
-              <version>2.0.5</version>
+              <version>3.0.2</version>
             </dependency>
           </dependencies>
+
           <executions>
             <execution>
               <id>check-license</id>
@@ -132,24 +134,24 @@
           </executions>
         </plugin>
 
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-						<Export-Package>org.pcmm*, org.umu.cops*</Export-Package>
-					</instructions>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>org.pcmm*, org.umu.cops*</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
   <profiles>
     <!-- Disable Java 8 linter since umu/cops fails it -->
diff --git a/packetcable-policy-karaf/pom.xml b/packetcable-policy-karaf/pom.xml
index 950f27f..73a963f 100644
--- a/packetcable-policy-karaf/pom.xml
+++ b/packetcable-policy-karaf/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath />
     </parent>
     <artifactId>packetcable-policy-karaf</artifactId>
diff --git a/pom.xml b/pom.xml
index efe44b8..d9b7825 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.packetcable</groupId>
-- 
2.36.6