X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=915e6bbd8cf2f23c153ef679fb347fd2f90e82b6;hb=074cbedd46fa5d9a7f63809bfb5e46fde53615fb;hp=767f04c0611d2bc79f39b51a2cde44ca31f5395e;hpb=1e19fe3dc29c15b29f29a7b1f8264de72495bf1c;p=openflowplugin.git

diff --git a/pom.xml b/pom.xml
old mode 100755
new mode 100644
index 767f04c061..915e6bbd8c
--- 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.2.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.2.0-SNAPSHOT</version>
+    <name>openflowplugin</name> <!-- Used by Sonar to set project name -->
     <packaging>pom</packaging>
 
     <scm>
@@ -16,296 +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.4</openflowjava.version>
-      <controller.model.version>1.0</controller.model.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>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>0.7.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal.connection</artifactId>
-            <version>0.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-util</artifactId>
-            <version>1.0</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>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
-        </dependency>
-
-        <dependency>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-          <version>4.8.1</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>
-        <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>
-          </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-release</id>
-        <name>opendaylight-release</name>
-        <url>${nexusproxy}/repositories/opendaylight.release/</url>
-        <snapshots>
-          <enabled>false</enabled>
-        </snapshots>
-      </repository>
-      <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>
-</project>
\ No newline at end of file
+      <module>applications</module>
+      <module>model</module>
+      <module>legacy</module>
+  </modules>
+</project>