X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=2e627ab6b412e46aac2e598424eed395a945af07;hb=560b43575ccc0e86f87e0910ec44ff893bc609b6;hp=6e7c2b98fbced974d249d9ce65244a1c2873f41d;hpb=cd423528eb915dea53b584db2b56b727415b2691;p=openflowplugin.git

diff --git a/pom.xml b/pom.xml
index 6e7c2b98fb..2e627ab6b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
+    <parent>
+        <groupId>org.opendaylight.openflowplugin</groupId>
+        <artifactId>openflowplugin-parent</artifactId>
+        <version>0.1.0-SNAPSHOT</version>
+        <relativePath>parent</relativePath>
+    </parent>
+
     <groupId>org.opendaylight.openflowplugin</groupId>
-    <artifactId>openflowplugin-parent</artifactId>
-    <version>0.0.3-SNAPSHOT</version>
+    <artifactId>openflowplugin-aggregator</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <name>openflowplugin</name> <!-- Used by Sonar to set project name -->
     <packaging>pom</packaging>
 
     <scm>
@@ -16,498 +21,27 @@
       <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>
-      <slf4j.version>1.7.2</slf4j.version>
-      <logback.version>1.0.9</logback.version>
-      <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
-      <openflowjava.version>0.5-SNAPSHOT</openflowjava.version>
-      <controller.model.version>1.1-SNAPSHOT</controller.model.version>
-      <osgi.core.version>5.0.0</osgi.core.version>
-      <sal.api.version>0.8.1-SNAPSHOT</sal.api.version>
-      <sal.connection.api.version>0.1.2-SNAPSHOT</sal.connection.api.version>
-      <netconf.parent.version>0.2.5-SNAPSHOT</netconf.parent.version>
-      <config.parent.version>0.2.5-SNAPSHOT</config.parent.version>
-      <build.helper.version>1.8</build.helper.version>
-      <xtend.version>2.4.3</xtend.version>
-      <xtend.dstdir>src/main/xtend-gen</xtend.dstdir>
-      <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
-      <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
-      <maven.bundle.version>2.4.0</maven.bundle.version>
-      <exi.nagasena.version>0000.0002.0038.0</exi.nagasena.version>
-    </properties>
-
-    <dependencyManagement>
-      <dependencies>
-        <dependency>
-          <groupId>org.javassist</groupId>
-          <artifactId>javassist</artifactId>
-          <version>3.17.1-GA</version>
-        </dependency>
-
-        <dependency>
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava</artifactId>
-          <version>14.0.1</version>
-        </dependency>
-        <dependency>
-          <groupId>equinoxSDK381</groupId>
-          <artifactId>org.eclipse.osgi</artifactId>
-          <version>3.8.1.v20120830-144521</version>
-        </dependency>
-        <dependency>
-          <groupId>equinoxSDK381</groupId>
-          <artifactId>org.eclipse.equinox.console</artifactId>
-          <version>1.0.0.v20120522-1841</version>
-        </dependency>
-        <dependency>
-          <groupId>equinoxSDK381</groupId>
-          <artifactId>org.apache.felix.gogo.command</artifactId>
-          <version>0.8.0.v201108120515</version>
-        </dependency>
-        <dependency>
-          <groupId>equinoxSDK381</groupId>
-          <artifactId>org.apache.felix.gogo.runtime</artifactId>
-          <version>0.8.0.v201108120515</version>
-        </dependency>
-        <dependency>
-          <groupId>equinoxSDK381</groupId>
-          <artifactId>org.apache.felix.gogo.shell</artifactId>
-          <version>0.8.0.v201110170705</version>
-        </dependency>
-
-        <dependency>
-          <groupId>org.opendaylight.openflowjava</groupId>
-          <artifactId>openflow-protocol-impl</artifactId>
-          <version>${openflowjava.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.openflowjava</groupId>
-          <artifactId>openflow-protocol-api</artifactId>
-          <version>${openflowjava.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.openflowjava</groupId>
-          <artifactId>openflow-protocol-spi</artifactId>
-          <version>${openflowjava.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.openflowjava</groupId>
-          <artifactId>simple-client</artifactId>
-          <version>${openflowjava.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller.model</groupId>
-          <artifactId>model-flow-base</artifactId>
-          <version>${controller.model.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller.model</groupId>
-          <artifactId>model-flow-management</artifactId>
-          <version>${controller.model.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller.model</groupId>
-          <artifactId>model-flow-service</artifactId>
-          <version>${controller.model.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller.model</groupId>
-          <artifactId>model-flow-statistics</artifactId>
-          <version>${controller.model.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller.model</groupId>
-          <artifactId>model-inventory</artifactId>
-          <version>${controller.model.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>sal-binding-api</artifactId>
-          <version>${controller.model.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal</artifactId>
-            <version>${sal.api.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal.connection</artifactId>
-            <version>${sal.connection.api.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-util</artifactId>
-            <version>${controller.model.version}</version>
-        </dependency>
-
-        <!-- IT -->
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-netconf-connector</artifactId>
-            <version>${netconf.parent.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-it</artifactId>
-            <version>${controller.model.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
-            <version>${controller.model.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <version>${config.parent.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools.thirdparty</groupId>
-            <artifactId>antlr4-runtime-osgi-nohead</artifactId>
-            <version>4.0</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>logback-config</artifactId>
-          <version>${config.parent.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>config-persister-api</artifactId>
-          <version>${config.parent.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>config-persister-impl</artifactId>
-          <version>${config.parent.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>config-persister-file-xml-adapter</artifactId>
-          <version>${config.parent.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>netconf-monitoring</artifactId>
-          <version>${netconf.parent.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>netconf-client</artifactId>
-          <version>${netconf.parent.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>netconf-impl</artifactId>
-          <version>${netconf.parent.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>org.opendaylight.controller.thirdparty</groupId>
-          <artifactId>ganymed</artifactId>
-          <version>1.1-SNAPSHOT</version>
-        </dependency>
-        
-        
-
-        <dependency>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
-            <version>1.4.01</version>
-        </dependency>
-
-        <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-log4j12</artifactId>
-          <version>${slf4j.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>log4j-over-slf4j</artifactId>
-          <version>${slf4j.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>ch.qos.logback</groupId>
-          <artifactId>logback-core</artifactId>
-          <version>${logback.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>ch.qos.logback</groupId>
-          <artifactId>logback-classic</artifactId>
-          <version>${logback.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.yangtools.thirdparty</groupId>
-            <artifactId>xtend-lib-osgi</artifactId>
-            <version>2.4.3</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-          <groupId>org.osgi</groupId>
-          <artifactId>org.osgi.core</artifactId>
-          <version>${osgi.core.version}</version>
-          <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.7</version>
-        </dependency>
-
-        <dependency>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-          <version>4.11</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.9.5</version>
-            <scope>test</scope>
-        </dependency>
-      </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <plugins>
-          <plugin>
-             <groupId>org.codehaus.mojo</groupId>
-             <artifactId>build-helper-maven-plugin</artifactId>
-          </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>
-              <groupId>org.ops4j.pax.exam</groupId>
-              <artifactId>maven-paxexam-plugin</artifactId>
-              <version>1.2.4</version>
-            </plugin>
-            <plugin>
-              <groupId>org.eclipse.xtend</groupId>
-              <artifactId>xtend-maven-plugin</artifactId>
-              <version>${xtend.version}</version>
-              <executions>
-                  <execution>
-                      <goals>
-                          <goal>compile</goal>
-                      </goals>
-                      <configuration>
-                          <outputDirectory>${xtend.dstdir}</outputDirectory>
-                      </configuration>
-                  </execution>
-              </executions>
-          </plugin>
-          <plugin>
-              <artifactId>maven-clean-plugin</artifactId>
-              <configuration>
-                  <filesets>
-                      <fileset>
-                          <directory>${xtend.dstdir}</directory>
-                          <includes>
-                              <include>**</include>
-                          </includes>
-                      </fileset>
-                      <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>
-                         <source>${xtend.dstdir}</source>
-                      </sources>
-                   </configuration>
-                </execution>
-             </executions>
-            </plugin>
-            <plugin>
-              <groupId>org.opendaylight.yangtools</groupId>
-              <artifactId>yang-maven-plugin</artifactId>
-              <version>0.6.2-SNAPSHOT</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>
-          </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>
-
-    <repositories>
-      <repository>
-        <id>opendaylight-snapshot</id>
-        <name>opendaylight-snapshot</name>
-        <url>${nexusproxy}/repositories/opendaylight.snapshot</url>
-        <releases>
-          <enabled>false</enabled>
-        </releases>
-      </repository>
-      <repository>
-        <id>public</id>
-        <name>public</name>
-        <url>${nexusproxy}/groups/public</url>
-        <snapshots>
-          <enabled>false</enabled>
-        </snapshots>
-      </repository>
-
-    </repositories>
-
-    <pluginRepositories>
-      <pluginRepository>
-        <id>opendaylight-central</id>
-        <name>opendaylight-central</name>
-        <url>${nexusproxy}/repositories/public</url>
-        <snapshots>
-          <enabled>false</enabled>
-        </snapshots>
-      </pluginRepository>
-      <pluginRepository>
-        <id>opendaylight-snapshot</id>
-        <name>central2</name>
-        <url>${nexusproxy}/repositories/opendaylight.snapshot</url>
-        <releases>
-          <enabled>false</enabled>
-        </releases>
-      </pluginRepository>
-    </pluginRepositories>
-
     <modules>
+      <module>artifacts</module>
+      <module>parent</module>
+      <module>openflowplugin-api</module>
       <module>openflowplugin</module>
-      <module>distribution/base</module>
+      <module>openflowplugin-impl</module>
+      <module>openflowplugin-common</module>
+      <module>extension</module>
+      <module>distribution/karaf</module>
       <module>openflowplugin-controller-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-li</module>
       <module>samples/sample-consumer</module>
       <module>samples/learning-switch</module>
-    </modules>
+      <module>applications</module>
+      <module>model</module>
+      <module>legacy</module>
+  </modules>
 </project>