X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=139c3bd528e2c9407aade8c0c60b96343fc0838f;hb=e5bdde99f1437f9b493ddf5497b40ee6676d7ab6;hp=74ea79e78b738788947d377ce7163938b4d8a995;hpb=93cc9aa399738c2c73ef3073936cfbf08c42d0e9;p=openflowplugin.git

diff --git a/pom.xml b/pom.xml
index 74ea79e78b..139c3bd528 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,18 +2,15 @@
 <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.3.1-SNAPSHOT</version>
+        <relativePath>parent</relativePath>
     </parent>
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
 
     <groupId>org.opendaylight.openflowplugin</groupId>
-    <artifactId>openflowplugin-parent</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
+    <artifactId>openflowplugin-aggregator</artifactId>
+    <version>0.3.1-SNAPSHOT</version>
     <name>openflowplugin</name> <!-- Used by Sonar to set project name -->
     <packaging>pom</packaging>
 
@@ -24,471 +21,30 @@
       <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>parent</module>
       <module>openflowplugin-api</module>
       <module>openflowplugin</module>
       <module>openflowplugin-impl</module>
+      <module>openflowplugin-common</module>
       <module>extension</module>
       <module>distribution/karaf</module>
       <module>openflowplugin-controller-config</module>
+      <module>openflowplugin-blueprint-config-he</module>
+      <module>openflowplugin-blueprint-config</module>
+      <!--
       <module>openflowplugin-it</module>
+      -->
       <module>test-provider</module>
       <module>drop-test</module>
       <module>drop-test-karaf</module>
       <module>test-common</module>
       <module>features</module>
+      <module>features-he</module>
       <module>samples/sample-consumer</module>
       <module>samples/learning-switch</module>
       <module>applications</module>
       <module>model</module>
-      <module>legacy</module>
   </modules>
 </project>