Move openflowplugin-parent

Parent should be in a subdirectory, so we have a top-level aggregator.

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

diff --git a/applications/pom.xml b/applications/pom.xml
index 9974c53a346248dbb3cd836ca6df406ab5573f5a..add9923befff9d4b0e6ba282725c878ec4aeaa9a 100644 (file)
--- a/applications/pom.xml
+++ b/applications/pom.xml
@@ -6,6 +6,7 @@
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
         <version>0.1.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>applications</artifactId>

diff --git a/distribution/karaf/pom.xml b/distribution/karaf/pom.xml
index 4dc58411f72154f5387153e38dbd86ad61eca6a3..4f4a0f867caa155da71d64c40c48ff48be1c1f4f 100644 (file)
--- a/distribution/karaf/pom.xml
+++ b/distribution/karaf/pom.xml
@@ -5,7 +5,7 @@
     <groupId>org.opendaylight.openflowplugin</groupId>
     <artifactId>openflowplugin-parent</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+    <relativePath>../../parent</relativePath>
   </parent>
   <artifactId>openflowplugin-karaf</artifactId>
   <packaging>pom</packaging>

diff --git a/drop-test-karaf/pom.xml b/drop-test-karaf/pom.xml
index b8ac62e4387e64870c6fcfd6c0fdaab54e76eefe..080461856c0447149a55cd6b100043a1da8c1e9e 100644 (file)
--- a/drop-test-karaf/pom.xml
+++ b/drop-test-karaf/pom.xml
@@ -5,7 +5,7 @@
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
         <version>0.1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
     <artifactId>drop-test-karaf</artifactId>
     <packaging>bundle</packaging>

diff --git a/drop-test/pom.xml b/drop-test/pom.xml
index 88ee816322bacc3dded2f632494944a2ace5f9b3..9073be711af11e83ce0311172fc50b205cfed893 100644 (file)
--- a/drop-test/pom.xml
+++ b/drop-test/pom.xml
@@ -4,7 +4,7 @@
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
         <version>0.1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
     <artifactId>drop-test</artifactId>
     <packaging>bundle</packaging>

diff --git a/extension/pom.xml b/extension/pom.xml
index f4cbb6be03bc06266671e6ef4f5ac3849e373bd8..ca3feee59690ff22014405f76eb1bccf9573a454 100644 (file)
--- a/extension/pom.xml
+++ b/extension/pom.xml
@@ -7,7 +7,7 @@
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
         <version>0.1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>openflowplugin-extension-parent</artifactId>

diff --git a/features/pom.xml b/features/pom.xml
index 2d44e31e44a4db6af88f648dc347bae9af100cb6..cb8dedfd6d976094931558d6a1761b6152067831 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -5,7 +5,7 @@
     <groupId>org.opendaylight.openflowplugin</groupId>
     <artifactId>openflowplugin-parent</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
+    <relativePath>../parent</relativePath>
   </parent>
   <artifactId>features-openflowplugin</artifactId>
 

diff --git a/legacy/pom.xml b/legacy/pom.xml
index da2c24dc481759c4b944774613bd9c7b642d557f..ebed3035c0d731ec70e4f1d9fc84570e9353a3bb 100644 (file)
--- a/legacy/pom.xml
+++ b/legacy/pom.xml
@@ -5,7 +5,7 @@
     <groupId>org.opendaylight.openflowplugin</groupId>
     <artifactId>openflowplugin-parent</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
+    <relativePath>../parent</relativePath>
   </parent>
   <groupId>org.opendaylight.openflowplugin.legacy</groupId>
   <artifactId>legacy-parent</artifactId>

diff --git a/model/pom.xml b/model/pom.xml
index 4dd3563b675baf669a51d7023b901059a46dc9cc..30135f6ec52f8ccd99999268bba7930af778dafb 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -7,6 +7,7 @@
     <groupId>org.opendaylight.openflowplugin</groupId>
     <artifactId>openflowplugin-parent</artifactId>
     <version>0.1.0-SNAPSHOT</version>
+    <relativePath>../parent</relativePath>
   </parent>
   <groupId>org.opendaylight.openflowplugin.model</groupId>
   <artifactId>model-parent</artifactId>

diff --git a/openflowplugin-api/pom.xml b/openflowplugin-api/pom.xml
index 54c1a0949790dd59e5886e48395bd794beb20f21..a8f824241793686c1034d9f26b5dff5b36899d37 100644 (file)
--- a/openflowplugin-api/pom.xml
+++ b/openflowplugin-api/pom.xml
@@ -6,7 +6,7 @@
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
         <version>0.1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>openflowplugin-api</artifactId>

diff --git a/openflowplugin-controller-config/pom.xml b/openflowplugin-controller-config/pom.xml
index b762dc674c40e486332a878c58ef492fef07d6df..2c1d5c0d4dd01dee999155f17fa8ddd22ca0bea9 100644 (file)
--- a/openflowplugin-controller-config/pom.xml
+++ b/openflowplugin-controller-config/pom.xml
@@ -13,6 +13,7 @@
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowplugin-parent</artifactId>
       <version>0.1.0-SNAPSHOT</version>
+      <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>openflowplugin-controller-config</artifactId>

diff --git a/openflowplugin-impl/pom.xml b/openflowplugin-impl/pom.xml
index 234f1ce8d04af2a5a2a3398a4f691e56a35f83fc..692372a14805cb6da3adce71c7eecd366fe1c0e2 100644 (file)
--- a/openflowplugin-impl/pom.xml
+++ b/openflowplugin-impl/pom.xml
@@ -5,7 +5,7 @@
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
         <version>0.1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>openflowplugin-impl</artifactId>

diff --git a/openflowplugin-it/pom.xml b/openflowplugin-it/pom.xml
index 1e2e727377f7086777569b703bf6788b69171039..313476368dae3e6e0ea0903602b27723edbd3913 100644 (file)
--- a/openflowplugin-it/pom.xml
+++ b/openflowplugin-it/pom.xml
@@ -4,7 +4,7 @@
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
         <version>0.1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>openflowplugin-it</artifactId>

diff --git a/openflowplugin/pom.xml b/openflowplugin/pom.xml
index bd9f57d64f02b196133f76c91b465676b70e51ad..305bad3bdb6519016f6c9ac2aead744f95f3f774 100644 (file)
--- a/openflowplugin/pom.xml
+++ b/openflowplugin/pom.xml
@@ -5,7 +5,7 @@
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
         <version>0.1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
 
     <artifactId>openflowplugin</artifactId>

diff --git a/parent/pom.xml b/parent/pom.xml
new file mode 100644 (file)
index 0000000..43feb78
--- /dev/null
+++ b/parent/pom.xml
@@ -0,0 +1,461 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2013 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">
+
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent</artifactId>
+        <version>1.5.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>openflowplugin-parent</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <scm>
+        <connection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</developerConnection>
+        <url>https://wiki.opendaylight.org/view/OpenDaylight_OpenFlow_Plugin:Main</url>
+        <tag>HEAD</tag>
+    </scm>
+
+    <properties>
+        <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
+        <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
+        <openflowjava.version>0.6.0-SNAPSHOT</openflowjava.version>
+        <openflowplugin.version>0.1.0-SNAPSHOT</openflowplugin.version>
+        <sal.api.version>0.9.0-SNAPSHOT</sal.api.version>
+        <build.helper.version>1.8</build.helper.version>
+        <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
+        <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
+        <exi.nagasena.version>0000.0002.0038.0</exi.nagasena.version>
+        <controller.distribution.version>0.2.0-SNAPSHOT</controller.distribution.version>
+        <features.test.version>1.5.0-SNAPSHOT</features.test.version>
+
+        <!-- Sonar config -->
+        <sonar-jacoco-listeners.version>2.4</sonar-jacoco-listeners.version>
+        <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+        <sonar.jacoco.reportPath>target/code-coverage/jacoco.exec</sonar.jacoco.reportPath>
+        <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
+        <sonar.profile>Sonar way with Findbugs</sonar.profile>
+
+        <config.version>0.3.0-SNAPSHOT</config.version>
+        <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
+        <netconf.version>0.3.0-SNAPSHOT</netconf.version>
+        <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
+
+        <features.test.version>1.5.0-SNAPSHOT</features.test.version>
+        <karaf.distro.empty.version>1.5.0-SNAPSHOT</karaf.distro.empty.version>
+        <dlux.version>0.2.0-SNAPSHOT</dlux.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.openflowplugin</groupId>
+                <artifactId>openflowplugin-artifacts</artifactId>
+                <version>${openflowplugin.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yangtools-artifacts</artifactId>
+                <version>${yangtools.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>config-artifacts</artifactId>
+                <version>${config.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${mdsal.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>netconf-artifacts</artifactId>
+                <version>${netconf.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.openflowjava</groupId>
+                <artifactId>openflowjava-artifacts</artifactId>
+                <version>${openflowjava.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.odlparent</groupId>
+                <artifactId>features-test</artifactId>
+                <version>${features.test.version}</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>liblldp</artifactId>
+                <version>${sal.api.version}</version>
+            </dependency>
+
+            <!-- thirdparty -->
+            <dependency>
+                <groupId>org.openexi</groupId>
+                <artifactId>nagasena</artifactId>
+                <version>${exi.nagasena.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.openexi</groupId>
+                <artifactId>nagasena-rta</artifactId>
+                <version>${exi.nagasena.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>xml-apis</groupId>
+                <artifactId>xml-apis</artifactId>
+                <version>1.4.01</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <!-- Sonar -->
+        <dependency>
+            <groupId>org.codehaus.sonar-plugins.java</groupId>
+            <artifactId>sonar-jacoco-listeners</artifactId>
+            <version>${sonar-jacoco-listeners.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>prepare-ut-agent</id>
+                        <phase>process-test-classes</phase>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${sonar.jacoco.reportPath}</destFile>
+                            <propertyName>jacoco.agent.ut.arg</propertyName>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>prepare-it-agent</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${sonar.jacoco.itReportPath}</destFile>
+                            <propertyName>jacoco.agent.it.arg</propertyName>
+                        </configuration>
+                    </execution>
+                </executions>
+
+                <configuration>
+                    <includes>
+                        <include>org.opendaylight.openflowplugin.*</include>
+                    </includes>
+                </configuration>
+
+            </plugin>
+        </plugins>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <configuration>
+                        <source>1.7</source>
+                        <target>1.7</target>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <configuration>
+                        <filesets>
+                            <fileset>
+                                <directory>${jmxGeneratorPath}</directory>
+                                <includes>
+                                    <include>**</include>
+                                </includes>
+                            </fileset>
+                            <fileset>
+                                <directory>${salGeneratorPath}</directory>
+                                <includes>
+                                    <include>**</include>
+                                </includes>
+                            </fileset>
+                        </filesets>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>${build.helper.version}</version>
+                    <executions>
+                        <execution>
+                            <id>add-source</id>
+                            <phase>generate-sources</phase>
+                            <goals>
+                                <goal>add-source</goal>
+                            </goals>
+                            <configuration>
+                                <sources>
+                                    <source>${jmxGeneratorPath}</source>
+                                    <source>${salGeneratorPath}</source>
+                                </sources>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.opendaylight.yangtools</groupId>
+                    <artifactId>yang-maven-plugin</artifactId>
+                    <version>${yangtools.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>${maven.bundle.version}</version>
+                    <extensions>true</extensions>
+                    <configuration>
+                        <instructions>
+                            <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
+                        </instructions>
+                        <manifestLocation>${project.build.directory}/META-INF</manifestLocation>
+                    </configuration>
+                </plugin>
+                <!-- Ignore/Execute plugin execution -->
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.codehaus.mojo</groupId>
+                                        <artifactId>properties-maven-plugin</artifactId>
+                                        <versionRange>[0.0,)</versionRange>
+                                        <goals>
+                                            <goal>set-system-properties</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore/>
+                                    </action>
+                                </pluginExecution>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.codehaus.enunciate</groupId>
+                                        <artifactId>maven-enunciate-plugin</artifactId>
+                                        <versionRange>[0.0,)</versionRange>
+                                        <goals>
+                                            <goal>docs</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore/>
+                                    </action>
+                                </pluginExecution>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.jacoco</groupId>
+                                        <artifactId>jacoco-maven-plugin</artifactId>
+                                        <versionRange>[0.0,)</versionRange>
+                                        <goals>
+                                            <goal>prepare-agent</goal>
+                                            <goal>pre-test</goal>
+                                            <goal>post-test</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore/>
+                                    </action>
+                                </pluginExecution>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.ops4j.pax.exam</groupId>
+                                        <artifactId>maven-paxexam-plugin</artifactId>
+                                        <versionRange>[1.2.4,)</versionRange>
+                                        <goals>
+                                            <goal>generate-depends-file</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <execute>
+                                            <runOnIncremental>false</runOnIncremental>
+                                        </execute>
+                                    </action>
+                                </pluginExecution>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.apache.maven.plugins</groupId>
+                                        <artifactId>maven-checkstyle-plugin</artifactId>
+                                        <versionRange>[2.0,)</versionRange>
+                                        <goals>
+                                            <goal>check</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore/>
+                                    </action>
+                                </pluginExecution>
+                                <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.codehaus.groovy.maven</groupId>
+                                        <artifactId>gmaven-plugin</artifactId>
+                                        <versionRange>1.0</versionRange>
+                                        <goals>
+                                            <goal>execute</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore/>
+                                    </action>
+                                </pluginExecution>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.apache.maven.plugins</groupId>
+                                        <artifactId>maven-enforcer-plugin</artifactId>
+                                        <versionRange>${enforcer.version}</versionRange>
+                                        <goals>
+                                            <goal>enforce</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore/>
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <configuration>
+                        <!-- Specific to generate mapping between tests and covered code -->
+                        <argLine>${jacoco.agent.it.arg}</argLine>
+                        <properties>
+                            <property>
+                                <name>listener</name>
+                                <value>org.sonar.java.jacoco.JUnitListener</value>
+                            </property>
+                        </properties>
+                        <!-- Let's put failsafe reports with surefire to have access to tests failures/success reports in sonar -->
+                        <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <!-- Specific to generate mapping between tests and covered code -->
+                        <argLine>${jacoco.agent.ut.arg}</argLine>
+                        <properties>
+                            <property>
+                                <name>listener</name>
+                                <value>org.sonar.java.jacoco.JUnitListener</value>
+                            </property>
+                        </properties>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>findbugsReport</id>
+            <reporting>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-project-info-reports-plugin</artifactId>
+                        <version>2.7</version>
+                        <configuration>
+                            <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+                            <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+                        </configuration>
+                        <reportSets>
+                            <reportSet>
+                                <reports>
+                                    <report>index</report>
+                                    <report>project-team</report>
+                                    <report>license</report>
+                                    <report>mailing-list</report>
+                                    <report>plugin-management</report>
+                                    <report>cim</report>
+                                    <report>issue-tracking</report>
+                                    <report>scm</report>
+                                    <report>summary</report>
+                                </reports>
+                            </reportSet>
+                        </reportSets>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>findbugs-maven-plugin</artifactId>
+                        <version>2.5.2</version>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-pmd-plugin</artifactId>
+                        <version>3.0.1</version>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-jxr-plugin</artifactId>
+                        <version>2.3</version>
+                    </plugin>
+                </plugins>
+            </reporting>
+        </profile>
+    </profiles>
+</project>
+

diff --git a/pom.xml b/pom.xml
index 74ea79e78b738788947d377ce7163938b4d8a995..1caa77a4957b7736f22b6246c0258ff637343d2e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -2,17 +2,14 @@
 <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.5.0-SNAPSHOT</version>
-        <relativePath/>
+        <groupId>org.opendaylight.openflowplugin</groupId>
+        <artifactId>openflowplugin-parent</artifactId>
+        <version>0.1.0-SNAPSHOT</version>
+        <relativePath>parent</relativePath>
     </parent>
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
 
     <groupId>org.opendaylight.openflowplugin</groupId>
-    <artifactId>openflowplugin-parent</artifactId>
+    <artifactId>openflowplugin-aggregator</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <name>openflowplugin</name> <!-- Used by Sonar to set project name -->
     <packaging>pom</packaging>
@@ -24,453 +21,6 @@
       <tag>HEAD</tag>
     </scm>
 
-    <distributionManagement>
-      <!-- OpenDayLight Released artifact -->
-      <repository>
-        <id>opendaylight-release</id>
-        <url>${nexusproxy}/repositories/opendaylight.release</url>
-      </repository>
-      <!-- OpenDayLight Snapshot artifact -->
-      <snapshotRepository>
-        <id>opendaylight-snapshot</id>
-        <url>${nexusproxy}/repositories/opendaylight.snapshot</url>
-      </snapshotRepository>
-      <!-- Site deployment -->
-      <!-- site>
-           <id>website</id>
-           <url>${sitedeploy}</url>
-           </site -->
-    </distributionManagement>
-
-    <properties>
-      <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-      <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
-      <openflowjava.version>0.6.0-SNAPSHOT</openflowjava.version>
-      <openflowplugin.version>0.1.0-SNAPSHOT</openflowplugin.version>
-      <sal.api.version>0.9.0-SNAPSHOT</sal.api.version>
-      <build.helper.version>1.8</build.helper.version>
-      <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
-      <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
-      <exi.nagasena.version>0000.0002.0038.0</exi.nagasena.version>
-      <controller.distribution.version>0.2.0-SNAPSHOT</controller.distribution.version>
-      <features.test.version>1.5.0-SNAPSHOT</features.test.version>
-
-      <!-- Sonar config -->
-      <sonar-jacoco-listeners.version>2.4</sonar-jacoco-listeners.version>
-      <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-      <sonar.jacoco.reportPath>target/code-coverage/jacoco.exec</sonar.jacoco.reportPath>
-      <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
-      <sonar.profile>Sonar way with Findbugs</sonar.profile>
-
-      <config.version>0.3.0-SNAPSHOT</config.version>
-      <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
-      <netconf.version>0.3.0-SNAPSHOT</netconf.version>
-      <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
-
-      <features.test.version>1.5.0-SNAPSHOT</features.test.version>
-      <karaf.distro.empty.version>1.5.0-SNAPSHOT</karaf.distro.empty.version>
-      <dlux.version>0.2.0-SNAPSHOT</dlux.version>
-    </properties>
-
-    <dependencyManagement>
-      <dependencies>
-        <dependency>
-          <groupId>org.opendaylight.openflowplugin</groupId>
-          <artifactId>openflowplugin-artifacts</artifactId>
-          <version>${openflowplugin.version}</version>
-          <scope>import</scope>
-          <type>pom</type>
-        </dependency>
-
-        <dependency>
-          <groupId>org.opendaylight.yangtools</groupId>
-          <artifactId>yangtools-artifacts</artifactId>
-          <version>${yangtools.version}</version>
-          <scope>import</scope>
-          <type>pom</type>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>config-artifacts</artifactId>
-          <version>${config.version}</version>
-          <scope>import</scope>
-          <type>pom</type>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>mdsal-artifacts</artifactId>
-          <version>${mdsal.version}</version>
-          <scope>import</scope>
-          <type>pom</type>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>netconf-artifacts</artifactId>
-          <version>${netconf.version}</version>
-          <scope>import</scope>
-          <type>pom</type>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.openflowjava</groupId>
-          <artifactId>openflowjava-artifacts</artifactId>
-          <version>${openflowjava.version}</version>
-          <scope>import</scope>
-          <type>pom</type>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.odlparent</groupId>
-          <artifactId>features-test</artifactId>
-         <version>${features.test.version}</version>
-         <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>liblldp</artifactId>
-            <version>${sal.api.version}</version>
-        </dependency>
-
-        <!-- thirdparty -->
-        <dependency>
-          <groupId>org.openexi</groupId>
-          <artifactId>nagasena</artifactId>
-          <version>${exi.nagasena.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.openexi</groupId>
-          <artifactId>nagasena-rta</artifactId>
-          <version>${exi.nagasena.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
-            <version>1.4.01</version>
-        </dependency>
-      </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <!-- Sonar -->
-        <dependency>
-            <groupId>org.codehaus.sonar-plugins.java</groupId>
-            <artifactId>sonar-jacoco-listeners</artifactId>
-            <version>${sonar-jacoco-listeners.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                 <groupId>org.codehaus.mojo</groupId>
-                 <artifactId>build-helper-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>prepare-ut-agent</id>
-                        <phase>process-test-classes</phase>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <destFile>${sonar.jacoco.reportPath}</destFile>
-                            <propertyName>jacoco.agent.ut.arg</propertyName>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>prepare-it-agent</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <destFile>${sonar.jacoco.itReportPath}</destFile>
-                            <propertyName>jacoco.agent.it.arg</propertyName>
-                        </configuration>
-                    </execution>
-                </executions>
-
-                <configuration>
-                  <includes>
-                    <include>org.opendaylight.openflowplugin.*</include>
-                  </includes>
-                </configuration>
-
-            </plugin>
-        </plugins>
-
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-compiler-plugin</artifactId>
-              <configuration>
-                <source>1.7</source>
-                <target>1.7</target>
-              </configuration>
-            </plugin>
-            <plugin>
-              <artifactId>maven-clean-plugin</artifactId>
-              <configuration>
-                  <filesets>
-                      <fileset>
-                          <directory>${jmxGeneratorPath}</directory>
-                          <includes>
-                              <include>**</include>
-                          </includes>
-                      </fileset>
-                      <fileset>
-                          <directory>${salGeneratorPath}</directory>
-                          <includes>
-                              <include>**</include>
-                          </includes>
-                      </fileset>
-                  </filesets>
-              </configuration>
-            </plugin>
-          <plugin>
-             <groupId>org.codehaus.mojo</groupId>
-             <artifactId>build-helper-maven-plugin</artifactId>
-             <version>${build.helper.version}</version>
-             <executions>
-                <execution>
-                   <id>add-source</id>
-                   <phase>generate-sources</phase>
-                   <goals>
-                      <goal>add-source</goal>
-                   </goals>
-                   <configuration>
-                      <sources>
-                         <source>${jmxGeneratorPath}</source>
-                         <source>${salGeneratorPath}</source>
-                      </sources>
-                   </configuration>
-                </execution>
-             </executions>
-            </plugin>
-            <plugin>
-              <groupId>org.opendaylight.yangtools</groupId>
-              <artifactId>yang-maven-plugin</artifactId>
-              <version>${yangtools.version}</version>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.felix</groupId>
-              <artifactId>maven-bundle-plugin</artifactId>
-              <version>${maven.bundle.version}</version>
-              <extensions>true</extensions>
-              <configuration>
-                <instructions>
-                  <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                </instructions>
-                <manifestLocation>${project.build.directory}/META-INF</manifestLocation>
-              </configuration>
-            </plugin>
-            <!-- Ignore/Execute plugin execution -->
-            <plugin>
-              <groupId>org.eclipse.m2e</groupId>
-              <artifactId>lifecycle-mapping</artifactId>
-              <version>1.0.0</version>
-              <configuration>
-                <lifecycleMappingMetadata>
-                  <pluginExecutions>
-                    <pluginExecution>
-                      <pluginExecutionFilter>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>properties-maven-plugin</artifactId>
-                        <versionRange>[0.0,)</versionRange>
-                        <goals>
-                          <goal>set-system-properties</goal>
-                        </goals>
-                      </pluginExecutionFilter>
-                      <action>
-                        <ignore/>
-                      </action>
-                    </pluginExecution>
-                    <pluginExecution>
-                      <pluginExecutionFilter>
-                        <groupId>org.codehaus.enunciate</groupId>
-                        <artifactId>maven-enunciate-plugin</artifactId>
-                        <versionRange>[0.0,)</versionRange>
-                        <goals>
-                          <goal>docs</goal>
-                        </goals>
-                      </pluginExecutionFilter>
-                      <action>
-                        <ignore/>
-                      </action>
-                    </pluginExecution>
-                    <pluginExecution>
-                      <pluginExecutionFilter>
-                        <groupId>org.jacoco</groupId>
-                        <artifactId>jacoco-maven-plugin</artifactId>
-                        <versionRange>[0.0,)</versionRange>
-                        <goals>
-                          <goal>prepare-agent</goal>
-                          <goal>pre-test</goal>
-                          <goal>post-test</goal>
-                        </goals>
-                      </pluginExecutionFilter>
-                      <action>
-                        <ignore/>
-                      </action>
-                    </pluginExecution>
-                    <pluginExecution>
-                      <pluginExecutionFilter>
-                        <groupId>org.ops4j.pax.exam</groupId>
-                        <artifactId>maven-paxexam-plugin</artifactId>
-                        <versionRange>[1.2.4,)</versionRange>
-                        <goals>
-                          <goal>generate-depends-file</goal>
-                        </goals>
-                      </pluginExecutionFilter>
-                      <action>
-                        <execute>
-                          <runOnIncremental>false</runOnIncremental>
-                        </execute>
-                      </action>
-                    </pluginExecution>
-                    <pluginExecution>
-                      <pluginExecutionFilter>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-checkstyle-plugin</artifactId>
-                        <versionRange>[2.0,)</versionRange>
-                        <goals>
-                          <goal>check</goal>
-                        </goals>
-                      </pluginExecutionFilter>
-                      <action>
-                        <ignore/>
-                      </action>
-                    </pluginExecution>
-                    <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.codehaus.groovy.maven</groupId>
-                        <artifactId>gmaven-plugin</artifactId>
-                        <versionRange>1.0</versionRange>
-                        <goals>
-                          <goal>execute</goal>
-                        </goals>
-                      </pluginExecutionFilter>
-                      <action>
-                        <ignore/>
-                      </action>
-                    </pluginExecution>
-                    <pluginExecution>
-                      <pluginExecutionFilter>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-enforcer-plugin</artifactId>
-                        <versionRange>${enforcer.version}</versionRange>
-                        <goals>
-                          <goal>enforce</goal>
-                        </goals>
-                      </pluginExecutionFilter>
-                      <action>
-                        <ignore/>
-                      </action>
-                    </pluginExecution>
-                  </pluginExecutions>
-                </lifecycleMappingMetadata>
-              </configuration>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-failsafe-plugin</artifactId>
-              <configuration>
-                <!-- Specific to generate mapping between tests and covered code -->
-                <argLine>${jacoco.agent.it.arg}</argLine>
-                <properties>
-                  <property>
-                    <name>listener</name>
-                    <value>org.sonar.java.jacoco.JUnitListener</value>
-                  </property>
-                </properties>
-                <!-- Let's put failsafe reports with surefire to have access to tests failures/success reports in sonar -->
-                <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
-              </configuration>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-surefire-plugin</artifactId>
-              <configuration>
-                <!-- Specific to generate mapping between tests and covered code -->
-                <argLine>${jacoco.agent.ut.arg}</argLine>
-                <properties>
-                  <property>
-                    <name>listener</name>
-                    <value>org.sonar.java.jacoco.JUnitListener</value>
-                  </property>
-                </properties>
-              </configuration>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-    </build>
-
-    <profiles>
-      <profile>
-        <id>findbugsReport</id>
-        <reporting>
-          <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-project-info-reports-plugin</artifactId>
-              <version>2.7</version>
-              <configuration>
-                <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
-                <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-              </configuration>
-              <reportSets>
-                <reportSet>
-                  <reports>
-                    <report>index</report>
-                    <report>project-team</report>
-                    <report>license</report>
-                    <report>mailing-list</report>
-                    <report>plugin-management</report>
-                    <report>cim</report>
-                    <report>issue-tracking</report>
-                    <report>scm</report>
-                    <report>summary</report>
-                  </reports>
-                </reportSet>
-              </reportSets>
-            </plugin>
-            <plugin>
-              <groupId>org.codehaus.mojo</groupId>
-              <artifactId>findbugs-maven-plugin</artifactId>
-              <version>2.5.2</version>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-pmd-plugin</artifactId>
-              <version>3.0.1</version>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-jxr-plugin</artifactId>
-              <version>2.3</version>
-            </plugin>
-          </plugins>
-        </reporting>
-      </profile>
-    </profiles>
-
     <modules>
       <module>artifacts</module>
       <module>openflowplugin-api</module>

diff --git a/samples/learning-switch/pom.xml b/samples/learning-switch/pom.xml
index f7fce4499327b206b528050c1d7b9912c6e98baf..1a101d3e6923560d843b4e9983132131c965f5ad 100644 (file)
--- a/samples/learning-switch/pom.xml
+++ b/samples/learning-switch/pom.xml
@@ -5,7 +5,7 @@
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
         <version>0.1.0-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
+        <relativePath>../../parent</relativePath>
     </parent>
 
     <artifactId>learning-switch</artifactId>

diff --git a/samples/sample-consumer/pom.xml b/samples/sample-consumer/pom.xml
index efa3f9f51bdaabeafcd1eb73754c08dfe7550673..b38ee2e33d57218e5e2750e06b9270b6f11b5c84 100644 (file)
--- a/samples/sample-consumer/pom.xml
+++ b/samples/sample-consumer/pom.xml
@@ -5,7 +5,7 @@
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
         <version>0.1.0-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
+        <relativePath>../../parent</relativePath>
     </parent>
 
     <artifactId>sample-consumer</artifactId>

diff --git a/test-common/pom.xml b/test-common/pom.xml
index 4ea0c9b5348fe3769367e87d09b2400416f3ee55..454db66cdad78d8272138afe0133326522660c7c 100644 (file)
--- a/test-common/pom.xml
+++ b/test-common/pom.xml
@@ -5,7 +5,7 @@
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
         <version>0.1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
     <artifactId>test-common</artifactId>
     <packaging>bundle</packaging>

diff --git a/test-provider/pom.xml b/test-provider/pom.xml
index 8cc74c07f985bc1e232361432d3900a99516effc..345576fce00b1e7d4f1a8bfc1aa9cb875578496f 100644 (file)
--- a/test-provider/pom.xml
+++ b/test-provider/pom.xml
@@ -4,7 +4,7 @@
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-parent</artifactId>
         <version>0.1.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
+        <relativePath>../parent</relativePath>
     </parent>
     <artifactId>test-provider</artifactId>
     <packaging>bundle</packaging>