From 11c4b09beddca9e53f0e061de2611028c38ebf72 Mon Sep 17 00:00:00 2001
From: adetalhouet <adetalhouet@inocybe.com>
Date: Tue, 3 Nov 2015 09:27:14 -0500
Subject: [PATCH] Clean up pom files

Change-Id: I31eb3d576d92639b8fca269e76fb5759366074fd
Signed-off-by: adetalhouet <adetalhouet@inocybe.com>
---
 commons/parent/pom.xml                        | 253 ------------------
 distribution-karaf/pom.xml                    |  52 +---
 ...e.xml => eclipse-java-clean-code-style.xml |   0
 groupbasedpolicy-ui/bundle/pom.xml            |  29 +-
 groupbasedpolicy-ui/module/pom.xml            |   5 +-
 groupbasedpolicy-ui/pom.xml                   |  10 +-
 groupbasedpolicy/pom.xml                      |  10 +-
 pom.xml                                       |  23 +-
 8 files changed, 33 insertions(+), 349 deletions(-)
 delete mode 100644 commons/parent/pom.xml
 rename commons/cleanCode/eclipse-java-clean-code-style.xml => eclipse-java-clean-code-style.xml (100%)

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
deleted file mode 100644
index db84a59f7..000000000
--- a/commons/parent/pom.xml
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2015 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.odlparent</groupId>
-    <artifactId>odlparent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
-    <relativePath>../../odlparent/odlparent</relativePath>
-  </parent>
-
-  <groupId>org.opendaylight.groupbasedpolicy</groupId>
-  <artifactId>commons.groupbasedpolicy</artifactId>
-  <version>0.3.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <prerequisites>
-    <maven>3.0</maven>
-  </prerequisites>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <generated.sources.sal>${project.build.directory}/generated-sources/sal</generated.sources.sal>
-    <generated.sources.config>${project.build.directory}/generated-sources/config</generated.sources.config>
-    <generated.yang.docs>${project.build.directory}/site/models</generated.yang.docs>
-    <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
-    <mdsal.version>2.0.0-SNAPSHOT</mdsal.version>
-    <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
-    <controller.mdsal.version>1.3.0-SNAPSHOT</controller.mdsal.version>
-    <controller.config.version>0.4.0-SNAPSHOT</controller.config.version>
-    <openflowplugin.version>0.2.0-SNAPSHOT</openflowplugin.version>
-    <ovsdb.southbound.version>1.2.1-SNAPSHOT</ovsdb.southbound.version>
-    <neutron.version>0.6.0-SNAPSHOT</neutron.version>
-    <sfc.version>0.2.0-SNAPSHOT</sfc.version>
-    <restconf.version>1.3.0-SNAPSHOT</restconf.version>
-    <dlux.version>0.3.0-SNAPSHOT</dlux.version>
-    <liblldp.version>0.10.0-SNAPSHOT</liblldp.version>
-    <apache.felix.osgi.compendium.version>1.4.0</apache.felix.osgi.compendium.version>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <!-- GBP modules -->
-      <dependency>
-        <groupId>org.opendaylight.groupbasedpolicy</groupId>
-        <artifactId>groupbasedpolicy-artifacts</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-
-      <!-- YANG tools -->
-      <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yangtools-artifacts</artifactId>
-        <version>${yangtools.version}</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-
-      <!-- Controller infrastructure -->
-      <dependency>
-        <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.mdsal.model</groupId>
-        <artifactId>mdsal-model-artifacts</artifactId>
-        <version>${mdsal.model.version}</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${controller.mdsal.version}</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-artifacts</artifactId>
-        <version>${controller.config.version}</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-
-      <!-- Openflow plugin -->
-      <dependency>
-        <groupId>org.opendaylight.openflowplugin</groupId>
-        <artifactId>openflowplugin-extension-nicira</artifactId>
-        <version>${openflowplugin.version}</version>
-      </dependency>
-
-      <!-- OVSDB -->
-      <dependency>
-        <groupId>org.opendaylight.ovsdb</groupId>
-        <artifactId>southbound-api</artifactId>
-        <version>${ovsdb.southbound.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.ovsdb</groupId>
-        <artifactId>southbound-impl</artifactId>
-        <version>${ovsdb.southbound.version}</version>
-      </dependency>
-
-      <!-- Others -->
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>liblldp</artifactId>
-        <version>${liblldp.version}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>${java.version.source}</source>
-          <target>${java.version.target}</target>
-          <testSource>${java.version.source}</testSource>
-          <testTarget>${java.version.target}</testTarget>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <phase>generate-sources</phase>
-            <configuration>
-              <sources>
-                <source>${generated.sources.config}</source>
-                <source>${generated.sources.sal}</source>
-                <source>src/main/yang</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.opendaylight.yangtools</groupId>
-          <artifactId>yang-maven-plugin</artifactId>
-          <version>${yangtools.version}</version>
-          <executions>
-            <execution>
-              <goals>
-                <goal>generate-sources</goal>
-              </goals>
-              <configuration>
-                <codeGenerators>
-                  <generator>
-                    <codeGeneratorClass>org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator</codeGeneratorClass>
-                    <outputBaseDir>${generated.sources.config}</outputBaseDir>
-                    <additionalConfiguration>
-                      <namespaceToPackage1>urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang</namespaceToPackage1>
-                    </additionalConfiguration>
-                  </generator>
-                  <generator>
-                    <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
-                    <outputBaseDir>${generated.sources.sal}</outputBaseDir>
-                  </generator>
-                  <generator>
-                    <codeGeneratorClass>org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl</codeGeneratorClass>
-                    <outputBaseDir>${generated.yang.docs}</outputBaseDir>
-                  </generator>
-                </codeGenerators>
-                <inspectDependencies>true</inspectDependencies>
-              </configuration>
-            </execution>
-          </executions>
-          <dependencies>
-            <dependency>
-              <groupId>org.opendaylight.controller</groupId>
-              <artifactId>yang-jmx-generator-plugin</artifactId>
-              <version>${controller.config.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>org.opendaylight.mdsal</groupId>
-              <artifactId>maven-sal-api-gen-plugin</artifactId>
-              <version>${yangtools.version}</version>
-              <type>jar</type>
-            </dependency>
-          </dependencies>
-        </plugin>
-        <!--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>
-                    <execute />
-                  </action>
-                </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-checkstyle-plugin</artifactId>
-                    <versionRange>[2.13,)</versionRange>
-                    <goals>
-                      <goal>check</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <execute />
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-  <url>https://wiki.opendaylight.org/view/Group_Policy:Main</url>
-  <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/groupbasedpolicy.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/groupbasedpolicy.git</developerConnection>
-    <tag>HEAD</tag>
-  </scm>
-</project>
diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index baf4eebd4..4680a6ce7 100644
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -28,6 +28,17 @@
     <sfc.version>0.2.0-SNAPSHOT</sfc.version>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>groupbasedpolicy-artifacts</artifactId>
+        <version>${project.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
     <dependency>
       <!-- scope is compile so all features (there is only one) are installed 
@@ -41,47 +52,6 @@
     <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
       <artifactId>features-groupbasedpolicy</artifactId>
-      <version>${groupbasedpolicy.project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.sfc</groupId>
-      <artifactId>features-sfc</artifactId>
-      <version>${sfc.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.sfc</groupId>
-      <artifactId>features-sfc-sb-rest</artifactId>
-      <version>${sfc.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.sfc</groupId>
-      <artifactId>features-sfc-ovs</artifactId>
-      <version>${sfc.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.sfc</groupId>
-      <artifactId>features-sfcofl2</artifactId>
-      <version>${sfc.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.sfc</groupId>
-      <artifactId>features-sfc-netconf</artifactId>
-      <version>${sfc.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
diff --git a/commons/cleanCode/eclipse-java-clean-code-style.xml b/eclipse-java-clean-code-style.xml
similarity index 100%
rename from commons/cleanCode/eclipse-java-clean-code-style.xml
rename to eclipse-java-clean-code-style.xml
diff --git a/groupbasedpolicy-ui/bundle/pom.xml b/groupbasedpolicy-ui/bundle/pom.xml
index ddb4f8d3a..53b1cb424 100755
--- a/groupbasedpolicy-ui/bundle/pom.xml
+++ b/groupbasedpolicy-ui/bundle/pom.xml
@@ -3,32 +3,19 @@
   <modelVersion>4.0.0</modelVersion>
  <parent>
     <groupId>org.opendaylight.groupbasedpolicy</groupId>
-    <artifactId>commons.groupbasedpolicy</artifactId>
+    <artifactId>groupbasedpolicy-ui</artifactId>
     <version>0.3.0-SNAPSHOT</version>
-    <relativePath>../../commons/parent</relativePath>
   </parent>
-  <groupId>org.opendaylight.groupbasedpolicy</groupId>
+
   <artifactId>groupbasedpolicy-ui-bundle</artifactId>
   <name>groupbasedpolicy-ui-bundle</name>
   <packaging>bundle</packaging>
+
+    <properties>
+        <dlux.version>0.3.0-SNAPSHOT</dlux.version>
+    </properties>
+
   <dependencies>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>${apache.felix.osgi.compendium.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.dlux</groupId>
       <artifactId>loader</artifactId>
@@ -37,7 +24,7 @@
      <dependency>
       <groupId>org.opendaylight.groupbasedpolicy</groupId>
       <artifactId>groupbasedpolicy-ui-module</artifactId>
-      <version>${dlux.version}</version>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
  <build>
diff --git a/groupbasedpolicy-ui/module/pom.xml b/groupbasedpolicy-ui/module/pom.xml
index 6022c8370..2a0c4e6c4 100755
--- a/groupbasedpolicy-ui/module/pom.xml
+++ b/groupbasedpolicy-ui/module/pom.xml
@@ -9,11 +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">
   <modelVersion>4.0.0</modelVersion>
-  <parent>
+ <parent>
     <groupId>org.opendaylight.groupbasedpolicy</groupId>
-    <artifactId>commons.groupbasedpolicy</artifactId>
+    <artifactId>groupbasedpolicy-ui</artifactId>
     <version>0.3.0-SNAPSHOT</version>
-    <relativePath>../../commons/parent</relativePath>
   </parent>
 
   <artifactId>groupbasedpolicy-ui-module</artifactId>
diff --git a/groupbasedpolicy-ui/pom.xml b/groupbasedpolicy-ui/pom.xml
index 28ad29aaf..f2502dacf 100755
--- a/groupbasedpolicy-ui/pom.xml
+++ b/groupbasedpolicy-ui/pom.xml
@@ -9,20 +9,18 @@
 <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.groupbasedpolicy</groupId>
-    <artifactId>commons.groupbasedpolicy</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <relativePath>../commons/parent</relativePath>
-  </parent>
 
+  <groupId>org.opendaylight.groupbasedpolicy</groupId>
   <artifactId>groupbasedpolicy-ui</artifactId>
   <name>groupbasedpolicy-ui</name>
   <description>Resources</description>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
+
   <prerequisites>
     <maven>3.0</maven>
   </prerequisites>
+
   <modules>
     <module>module</module>
     <module>bundle</module>
diff --git a/groupbasedpolicy/pom.xml b/groupbasedpolicy/pom.xml
index acbb0e708..4d16a74bf 100644
--- a/groupbasedpolicy/pom.xml
+++ b/groupbasedpolicy/pom.xml
@@ -8,13 +8,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.groupbasedpolicy</groupId>
-    <artifactId>groupbasedpolicy.project</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>config-parent</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <relativePath/>
   </parent>
 
+  <groupId>org.opendaylight.groupbasedpolicy</groupId>
   <artifactId>groupbasedpolicy</artifactId>
+  <version>0.3.0-SNAPSHOT</version> 
   <packaging>bundle</packaging>
   <name>groupbasedpolicy-base</name>
 
diff --git a/pom.xml b/pom.xml
index 3a69c9d3a..ea0deac22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,14 +5,9 @@
   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.groupbasedpolicy</groupId>
-    <artifactId>commons.groupbasedpolicy</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <relativePath>commons/parent</relativePath>
-  </parent>
-
+  <groupId>org.opendaylight.groupbasedpolicy</groupId>
   <artifactId>groupbasedpolicy.project</artifactId>
+  <version>0.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>groupbasedpolicy</name> <!-- Used by Sonar to set project name -->
 
@@ -22,7 +17,6 @@
 
   <modules>
     <module>artifacts</module>
-    <module>commons/parent</module>
     <module>groupbasedpolicy</module>
     <module>renderers</module>
     <module>neutron-mapper</module>
@@ -33,19 +27,6 @@
     <module>features</module>
   </modules>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <!-- checkstyle is evil -->
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/groupbasedpolicy.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/groupbasedpolicy.git</developerConnection>
-- 
2.36.6