Reworked pom files

Each pom (artifact) declares it's dependencies (internal and external)
No dependencies declared at parent POM level, only dependency Management.

Also moved the <modules> from distribution/opendaylight to the root pom.xml
distribution/opendaylight now builds entirely from dependencies

I have intentionally left some things in here I think are wrong,
because the goal of this commit is to reproduce the existing build
(which it does, I've checked).  Subsequent commits will clean up other things.

Change-Id: I358bdac1c0f6a59b37a418a811a30235967fdfdc
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

diff --git a/opendaylight/appauth/pom.xml b/opendaylight/appauth/pom.xml
index 2cfa45cc8469c09268b2bcf5d2beb02aa87c8c7b..6f2e9ee1eb4c6ce010b368791aff8e22eaeed733 100644 (file)
--- a/opendaylight/appauth/pom.xml
+++ b/opendaylight/appauth/pom.xml
@@ -62,5 +62,30 @@
           <groupId>junit</groupId>
           <artifactId>junit</artifactId>
         </dependency>
+        <dependency>
+          <groupId>equinoxSDK381</groupId>
+          <artifactId>javax.servlet</artifactId>
+        </dependency>
+        <!-- Spring security -->
+        <dependency>
+          <groupId>org.springframework.security</groupId>
+          <artifactId>spring-security-config</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.springframework.security</groupId>
+          <artifactId>spring-security-core</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.springframework.security</groupId>
+          <artifactId>spring-security-web</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.springframework.security</groupId>
+          <artifactId>spring-security-taglibs</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.springframework</groupId>
+          <artifactId>org.springframework.transaction</artifactId>
+        </dependency>
     </dependencies>
 </project>

diff --git a/opendaylight/arphandler/pom.xml b/opendaylight/arphandler/pom.xml
index dcd51f7627beeed312c877a550bb176fb6661475..367cf95c3ac41a2c15ec60b7559a28b87673d0d1 100644 (file)
--- a/opendaylight/arphandler/pom.xml
+++ b/opendaylight/arphandler/pom.xml
@@ -78,5 +78,9 @@
       <artifactId>sal</artifactId>
       <version>0.5.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/clustering/integrationtest/pom.xml b/opendaylight/clustering/integrationtest/pom.xml
index 60dae9be3592654dead0c98d825b1fe95011c8df..e3d523484bc37cc243ea3f1ccd8b706b20e11f19 100644 (file)
--- a/opendaylight/clustering/integrationtest/pom.xml
+++ b/opendaylight/clustering/integrationtest/pom.xml
@@ -48,6 +48,50 @@
       <artifactId>containermanager.it.implementation</artifactId>
       <version>0.5.1-SNAPSHOT</version>
     </dependency>
+        <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
+       <groupId>org.ops4j.pax.exam</groupId>
+       <artifactId>pax-exam-container-native</artifactId>
+       <scope>test</scope>
+     </dependency>
+     <dependency>
+       <groupId>org.ops4j.pax.exam</groupId>
+       <artifactId>pax-exam-junit4</artifactId>
+       <scope>test</scope>
+     </dependency>
+     <dependency>
+        <groupId>org.ops4j.pax.exam</groupId>
+        <artifactId>pax-exam-link-mvn</artifactId>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.ops4j.pax.url</groupId>
+        <artifactId>pax-url-aether</artifactId>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>log4j-over-slf4j</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-core</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-classic</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.dependencymanager.shell</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>eclipselink</groupId>
+        <artifactId>javax.resource</artifactId>
+      </dependency>
   </dependencies>
   <properties>
     <!-- Sonar jacoco plugin to get integration test coverage info -->

diff --git a/opendaylight/clustering/services/pom.xml b/opendaylight/clustering/services/pom.xml
index 2abd79493859e94c6d17f25e549e8de9259c4c29..7eede83638b0fd8eda5155c3d20a3773acbfc5c4 100644 (file)
--- a/opendaylight/clustering/services/pom.xml
+++ b/opendaylight/clustering/services/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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.controller</groupId>
@@ -18,6 +19,13 @@
   <version>0.4.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.jboss.spec.javax.transaction</groupId>
+      <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+    </dependency>
+  </dependencies>
+
   <build>
     <plugins>
       <plugin>

diff --git a/opendaylight/clustering/services_implementation/pom.xml b/opendaylight/clustering/services_implementation/pom.xml
index 72d00dd7cd8e4a661911b76627236b6ba8fe6285..60ee88c90d7836edbd7e1580b5255fb6974adcbc 100644 (file)
--- a/opendaylight/clustering/services_implementation/pom.xml
+++ b/opendaylight/clustering/services_implementation/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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.controller</groupId>
@@ -35,73 +36,73 @@
         </plugin>
       </plugins>
     </pluginManagement>
-  <plugins>
-    <plugin>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>maven-bundle-plugin</artifactId>
-      <version>${bundle.plugin.version}</version>
-      <extensions>true</extensions>
-      <configuration>
-        <instructions>
-          <Import-Package>
-            org.slf4j,
-            !org.apache.logging.log4j.*,
-            !bsh*,
-            !net.jcip.*,
-            !javax.swing,
-            !org.hornetq.*,
-            !org.jboss.*,
-            javax.transaction,
-            *,
-            org.opendaylight.controller.clustering.services,
-            org.opendaylight.controller.sal.core
-          </Import-Package>
-          <Bundle-Activator>
-            org.opendaylight.controller.clustering.services_implementation.internal.Activator
-          </Bundle-Activator>
-          <!-- Add in the DynamicImport-Package ONLY the packages that -->
-          <!-- contains types that MUST be unmarshalled by the -->
-          <!-- infinispan. They need to be wired at runtime even during -->
-          <!-- the bundle is already RESOLVED, but at the same time if -->
-          <!-- those are missing the bundle will still come up, this is -->
-          <!-- why those dependencies ends in the DynamicImport-Package -->
-          <!-- rather in the Import-Package -->
-          <DynamicImport-Package>
-            *
-          </DynamicImport-Package>
-          <Embed-Dependency>
-            infinispan-core,jgroups,jboss-marshalling-river,jboss-marshalling,jboss-logging,staxmapper,narayana-jta;type=!pom;inline=false
-          </Embed-Dependency>
-          <Embed-Transitive>
-            true
-          </Embed-Transitive>
-        </instructions>
-        <manifestLocation>${project.basedir}/META-INF</manifestLocation>
-      </configuration>
-    </plugin>
-    <plugin>
-      <groupId>org.jacoco</groupId>
-      <artifactId>jacoco-maven-plugin</artifactId>
-      <configuration>
-        <includes>org.opendaylight.controller.*</includes>
-      </configuration>
-      <executions>
-        <execution>
-          <id>pre-test</id>
-          <goals>
-            <goal>prepare-agent</goal>
-          </goals>
-        </execution>
-        <execution>
-          <id>post-test</id>
-          <phase>test</phase>
-          <goals>
-            <goal>report</goal>
-          </goals>
-        </execution>
-      </executions>
-    </plugin>
-    <plugin>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>${bundle.plugin.version}</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Import-Package>
+              org.slf4j,
+              !org.apache.logging.log4j.*,
+              !bsh*,
+              !net.jcip.*,
+              !javax.swing,
+              !org.hornetq.*,
+              !org.jboss.*,
+              javax.transaction,
+              *,
+              org.opendaylight.controller.clustering.services,
+              org.opendaylight.controller.sal.core
+            </Import-Package>
+            <Bundle-Activator>
+              org.opendaylight.controller.clustering.services_implementation.internal.Activator
+            </Bundle-Activator>
+            <!-- Add in the DynamicImport-Package ONLY the packages that -->
+            <!-- contains types that MUST be unmarshalled by the -->
+            <!-- infinispan. They need to be wired at runtime even during -->
+            <!-- the bundle is already RESOLVED, but at the same time if -->
+            <!-- those are missing the bundle will still come up, this is -->
+            <!-- why those dependencies ends in the DynamicImport-Package -->
+            <!-- rather in the Import-Package -->
+            <DynamicImport-Package>
+              *
+            </DynamicImport-Package>
+            <Embed-Dependency>
+              infinispan-core,jgroups,jboss-marshalling-river,jboss-marshalling,jboss-logging,staxmapper,narayana-jta;type=!pom;inline=false
+            </Embed-Dependency>
+            <Embed-Transitive>
+              true
+            </Embed-Transitive>
+          </instructions>
+          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <configuration>
+          <includes>org.opendaylight.controller.*</includes>
+        </configuration>
+        <executions>
+          <execution>
+            <id>pre-test</id>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>post-test</id>
+            <phase>test</phase>
+            <goals>
+              <goal>report</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
         <version>${enforcer.version}</version>
@@ -127,7 +128,7 @@
           </execution>
         </executions>
       </plugin>
-  </plugins>
+    </plugins>
   </build>
   <dependencies>
     <dependency>
@@ -150,5 +151,13 @@
       <artifactId>narayana-jta</artifactId>
       <version>4.17.7.Final</version>
     </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.apache.felix.gogo.runtime</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/clustering/stub/pom.xml b/opendaylight/clustering/stub/pom.xml
index 2bd7b2b06607fa3d61aceef6b78497d2d2a03529..607b48b3aa99d7d522e0ebae6276dbef8a80d00f 100644 (file)
--- a/opendaylight/clustering/stub/pom.xml
+++ b/opendaylight/clustering/stub/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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.controller</groupId>
@@ -54,5 +55,9 @@
       <artifactId>sal</artifactId>
       <version>0.5.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/clustering/test/pom.xml b/opendaylight/clustering/test/pom.xml
index 99879c77ddbffbbd56791cfccebb653ea6031502..4c00ba0db132feed4a3f6991c66e53d0b038114d 100644 (file)
--- a/opendaylight/clustering/test/pom.xml
+++ b/opendaylight/clustering/test/pom.xml
@@ -59,5 +59,38 @@
       <artifactId>sal</artifactId>
       <version>0.5.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.osgi.services</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.apache.felix.gogo.command</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.apache.felix.gogo.runtime</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.apache.felix.gogo.shell</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/commons/integrationtest/pom.xml b/opendaylight/commons/integrationtest/pom.xml
index 5308a09266cfc256d2797d7cd54919e8d1f6dcbc..811f11fce74d2f4562ca4fbd8170172e570dcb6a 100644 (file)
--- a/opendaylight/commons/integrationtest/pom.xml
+++ b/opendaylight/commons/integrationtest/pom.xml
@@ -54,6 +54,43 @@
       <artifactId>org.apache.felix.gogo.shell</artifactId>
       <version>0.8.0.v201110170705</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <!-- Add Pax Exam -->
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-container-native</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-junit4</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-link-mvn</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.url</groupId>
+      <artifactId>pax-url-aether</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+    </dependency>
+    <dependency>
+       <groupId>ch.qos.logback</groupId>
+       <artifactId>logback-core</artifactId>
+     </dependency>
+     <dependency>
+       <groupId>ch.qos.logback</groupId>
+       <artifactId>logback-classic</artifactId>
+     </dependency>
   </dependencies>
 
   <build>

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index d8c4ccebb1bc93acab0a62e68a79f0d5d1a122aa..60d42669430d1fab02c7a49a1fa7c4cf9db00c2d 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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>
@@ -22,6 +23,11 @@
   </scm>
 
   <properties>
+
+    <!-- Java Versions -->
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
+
     <propertymavenplugin.version>1.0-alpha-2</propertymavenplugin.version>
     <sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>
     <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
@@ -49,6 +55,7 @@
     <testvm.argLine>-Xmx1024m -XX:MaxPermSize=256m</testvm.argLine>
     <yang.version>0.5.8</yang.version>
     <guava.version>14.0.1</guava.version>
+    <osgi.core.version>5.0.0</osgi.core.version>
     <ietf-inet-types.version>2010.09.24.1</ietf-inet-types.version>
     <ietf-yang-types.version>2010.09.24.1</ietf-yang-types.version>
     <opendaylight-l2-types.version>2013.08.27.1</opendaylight-l2-types.version>
@@ -62,18 +69,591 @@
     <bundle.plugin.version>2.3.7</bundle.plugin.version>
     <junit.version>4.8.1</junit.version>
     <bgpcep.version>0.2.0-SNAPSHOT</bgpcep.version>
+    <yangtools.version>0.5.8</yangtools.version>
+    <!--versions for bits of the controller -->
+    <controller.version>0.4.1-SNAPSHOT</controller.version>
+    <config.version>0.2.1-SNAPSHOT</config.version>
+    <mdsal.version>1.0-SNAPSHOT</mdsal.version>
+    <containermanager.version>0.5.1-SNAPSHOT</containermanager.version>
+    <switchmanager.api.version>0.5.1-SNAPSHOT</switchmanager.api.version>
+    <connectionmanager.version>0.1.1-SNAPSHOT</connectionmanager.version>
+    <sal.version>0.5.1-SNAPSHOT</sal.version>
+    <sal.networkconfiguration.version>0.0.2-SNAPSHOT</sal.networkconfiguration.version>
+    <sal.connection.version>0.1.1-SNAPSHOT</sal.connection.version>
+    <networkconfig.bridgedomain.northbound.version>0.0.2-SNAPSHOT</networkconfig.bridgedomain.northbound.version>
+    <commons.httpclient.version>0.1.1-SNAPSHOT</commons.httpclient.version>
+    <concepts.version>0.5.1-SNAPSHOT</concepts.version>
   </properties>
 
- <dependencyManagement>
-     <dependencies>
-         <dependency>
-             <groupId>junit</groupId>
-              <artifactId>junit</artifactId>
-              <version>${junit.version}</version>
-              <scope>test</scope>
-         </dependency>
-     </dependencies>
- </dependencyManagement>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>${junit.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jcl-over-slf4j</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>org.osgi.core</artifactId>
+        <version>${osgi.core.version}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>${slf4j.version}</version>
+        <scope>compile</scope>
+      </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.codehaus.jackson</groupId>
+        <artifactId>jackson-mapper-asl</artifactId>
+        <version>${jackson.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.jackson</groupId>
+        <artifactId>jackson-core-asl</artifactId>
+        <version>${jackson.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.jackson</groupId>
+        <artifactId>jackson-jaxrs</artifactId>
+        <version>${jackson.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.jackson</groupId>
+        <artifactId>jackson-xc</artifactId>
+        <version>${jackson.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.jettison</groupId>
+        <artifactId>jettison</artifactId>
+        <version>1.3.3</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>${guava.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.javassist</groupId>
+        <artifactId>javassist</artifactId>
+        <version>${javassist.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>2.4</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-codec</groupId>
+        <artifactId>commons-codec</artifactId>
+        <version>1.7</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
+        <version>${commons.lang.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-fileupload</groupId>
+        <artifactId>commons-fileupload</artifactId>
+        <version>1.2.2</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-net</groupId>
+        <artifactId>commons-net</artifactId>
+        <version>3.0.1</version>
+      </dependency>
+      <dependency>
+        <groupId>equinoxSDK381</groupId>
+        <artifactId>javax.servlet</artifactId>
+        <version>3.0.0.v201112011016</version>
+      </dependency>
+      <dependency>
+        <groupId>equinoxSDK381</groupId>
+        <artifactId>javax.servlet.jsp</artifactId>
+        <version>2.2.0.v201112011158</version>
+      </dependency>
+      <dependency>
+        <groupId>equinoxSDK381</groupId>
+        <artifactId>org.eclipse.equinox.ds</artifactId>
+        <version>1.4.0.v20120522-1841</version>
+      </dependency>
+      <dependency>
+        <groupId>equinoxSDK381</groupId>
+        <artifactId>org.eclipse.equinox.util</artifactId>
+        <version>1.0.400.v20120522-2049</version>
+      </dependency>
+      <dependency>
+        <groupId>equinoxSDK381</groupId>
+        <artifactId>org.eclipse.osgi.services</artifactId>
+        <version>3.3.100.v20120522-1822</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.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>equinoxSDK381</groupId>
+        <artifactId>org.eclipse.equinox.cm</artifactId>
+        <version>1.0.400.v20120522-1841</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.eclipse.equinox.launcher</artifactId>
+        <version>1.3.0.v20120522-1813</version>
+      </dependency>
+      <!-- Gemini Web -->
+      <dependency>
+        <groupId>geminiweb</groupId>
+        <artifactId>org.eclipse.gemini.web.core</artifactId>
+        <version>${geminiweb.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>geminiweb</groupId>
+        <artifactId>org.eclipse.gemini.web.extender</artifactId>
+        <version>${geminiweb.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>geminiweb</groupId>
+        <artifactId>org.eclipse.gemini.web.tomcat</artifactId>
+        <version>${geminiweb.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>geminiweb</groupId>
+        <artifactId>org.eclipse.virgo.kernel.equinox.extensions</artifactId>
+        <version>${virgo.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>geminiweb</groupId>
+        <artifactId>org.eclipse.virgo.util.common</artifactId>
+        <version>${virgo.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>geminiweb</groupId>
+        <artifactId>org.eclipse.virgo.util.io</artifactId>
+        <version>${virgo.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>geminiweb</groupId>
+        <artifactId>org.eclipse.virgo.util.math</artifactId>
+        <version>${virgo.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>geminiweb</groupId>
+        <artifactId>org.eclipse.virgo.util.osgi</artifactId>
+        <version>${virgo.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>geminiweb</groupId>
+        <artifactId>org.eclipse.virgo.util.osgi.manifest</artifactId>
+        <version>${virgo.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>geminiweb</groupId>
+        <artifactId>org.eclipse.virgo.util.parser.manifest</artifactId>
+        <version>${virgo.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.dependencymanager</artifactId>
+        <version>3.1.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.dependencymanager.shell</artifactId>
+        <version>3.0.1</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.code.gson</groupId>
+        <artifactId>gson</artifactId>
+        <version>2.1</version>
+        <scope>compile</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.spec.javax.transaction</groupId>
+        <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+        <version>1.0.1.Final</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.fileinstall</artifactId>
+        <version>3.1.6</version>
+      </dependency>
+      <dependency>
+        <groupId>virgomirror</groupId>
+        <artifactId>org.eclipse.jdt.core.compiler.batch</artifactId>
+        <version>3.8.0.I20120518-2145</version>
+      </dependency>
+      <dependency>
+        <groupId>eclipselink</groupId>
+        <artifactId>javax.persistence</artifactId>
+        <version>2.0.4.v201112161009</version>
+      </dependency>
+      <dependency>
+        <groupId>orbit</groupId>
+        <artifactId>javax.activation</artifactId>
+        <version>1.1.0.v201211130549</version>
+      </dependency>
+      <dependency>
+        <groupId>orbit</groupId>
+        <artifactId>javax.annotation</artifactId>
+        <version>1.1.0.v201209060031</version>
+      </dependency>
+      <dependency>
+        <groupId>orbit</groupId>
+        <artifactId>javax.ejb</artifactId>
+        <version>3.1.1.v201204261316</version>
+      </dependency>
+      <dependency>
+        <groupId>orbit</groupId>
+        <artifactId>javax.el</artifactId>
+        <version>2.2.0.v201108011116</version>
+      </dependency>
+      <dependency>
+        <groupId>orbit</groupId>
+        <artifactId>javax.mail.glassfish</artifactId>
+        <version>1.4.1.v201108011116</version>
+      </dependency>
+      <dependency>
+        <groupId>orbit</groupId>
+        <artifactId>javax.xml.rpc</artifactId>
+        <version>1.1.0.v201005080400</version>
+      </dependency>
+      <dependency>
+        <groupId>orbit</groupId>
+        <artifactId>org.apache.catalina</artifactId>
+        <version>7.0.32.v201211201336</version>
+      </dependency>
+      <dependency>
+        <groupId>orbit</groupId>
+        <artifactId>org.apache.catalina.ha</artifactId>
+        <version>7.0.32.v201211201952</version>
+      </dependency>
+      <dependency>
+        <groupId>orbit</groupId>
+        <artifactId>org.apache.catalina.tribes</artifactId>
+        <version>7.0.32.v201211201952</version>
+      </dependency>
+      <dependency>
+        <groupId>orbit</groupId>
+        <artifactId>org.apache.coyote</artifactId>
+        <version>7.0.32.v201211201952</version>
+      </dependency>
+      <dependency>
+        <groupId>orbit</groupId>
+        <artifactId>org.apache.el</artifactId>
+        <version>7.0.32.v201211081135</version>
+      </dependency>
+      <dependency>
+        <groupId>orbit</groupId>
+        <artifactId>org.apache.jasper</artifactId>
+        <version>7.0.32.v201211201952</version>
+      </dependency>
+      <dependency>
+        <groupId>orbit</groupId>
+        <artifactId>org.apache.juli.extras</artifactId>
+        <version>7.0.32.v201211081135</version>
+      </dependency>
+      <dependency>
+        <groupId>orbit</groupId>
+        <artifactId>org.apache.tomcat.api</artifactId>
+        <version>7.0.32.v201211081135</version>
+      </dependency>
+      <dependency>
+        <groupId>orbit</groupId>
+        <artifactId>org.apache.tomcat.util</artifactId>
+        <version>7.0.32.v201211201952</version>
+      </dependency>
+      <dependency>
+        <groupId>orbit</groupId>
+        <artifactId>javax.servlet.jsp.jstl</artifactId>
+        <version>1.2.0.v201105211821</version>
+      </dependency>
+      <dependency>
+        <groupId>orbit</groupId>
+        <artifactId>javax.servlet.jsp.jstl.impl</artifactId>
+        <version>1.2.0.v201210211230</version>
+      </dependency>
+      <dependency>
+        <groupId>eclipselink</groupId>
+        <artifactId>javax.resource</artifactId>
+        <version>1.5.0.v200906010428</version>
+      </dependency>
+      <!-- Add Pax Exam -->
+      <dependency>
+        <groupId>org.ops4j.pax.exam</groupId>
+        <artifactId>pax-exam-container-native</artifactId>
+        <version>${exam.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.ops4j.pax.exam</groupId>
+        <artifactId>pax-exam-junit4</artifactId>
+        <version>${exam.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.ops4j.pax.exam</groupId>
+        <artifactId>pax-exam-link-mvn</artifactId>
+        <version>${exam.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.ops4j.pax.url</groupId>
+        <artifactId>pax-url-aether</artifactId>
+        <version>${url.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>org.springframework.asm</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>org.springframework.aop</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>org.springframework.context</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>org.springframework.context.support</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>org.springframework.core</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>org.springframework.beans</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>org.springframework.expression</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>org.springframework.web</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.aopalliance</groupId>
+        <artifactId>com.springsource.org.aopalliance</artifactId>
+        <version>1.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>org.springframework.web.servlet</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+      <!-- Spring security -->
+      <dependency>
+        <groupId>org.springframework.security</groupId>
+        <artifactId>spring-security-config</artifactId>
+        <version>${spring-security.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.security</groupId>
+        <artifactId>spring-security-core</artifactId>
+        <version>${spring-security.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.security</groupId>
+        <artifactId>spring-security-web</artifactId>
+        <version>${spring-security.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.security</groupId>
+        <artifactId>spring-security-taglibs</artifactId>
+        <version>${spring-security.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>org.springframework.transaction</artifactId>
+        <version>${spring-security.version}</version>
+      </dependency>
+      <!-- Visual VM hook -->
+      <dependency>
+        <groupId>org.ow2.chameleon.management</groupId>
+        <artifactId>chameleon-mbeans</artifactId>
+        <version>1.0.0</version>
+      </dependency>
+      <!-- Jersey for JAXRS -->
+      <dependency>
+        <groupId>com.sun.jersey</groupId>
+        <artifactId>jersey-core</artifactId>
+        <version>${jersey.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.sun.jersey</groupId>
+        <artifactId>jersey-server</artifactId>
+        <version>${jersey.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.sun.jersey</groupId>
+        <artifactId>jersey-client</artifactId>
+        <version>${jersey.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.sun.jersey</groupId>
+        <artifactId>jersey-json</artifactId>
+        <version>${jersey.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.ow2.asm</groupId>
+        <artifactId>asm-all</artifactId>
+        <version>4.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.persistence</groupId>
+        <artifactId>org.eclipse.persistence.moxy</artifactId>
+        <version>2.5.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.persistence</groupId>
+        <artifactId>org.eclipse.persistence.core</artifactId>
+        <version>2.5.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.persistence</groupId>
+        <artifactId>org.eclipse.persistence.antlr</artifactId>
+        <version>2.5.0</version>
+      </dependency>
+      <!-- Third parties from opendaylight released -->
+      <dependency>
+        <groupId>org.opendaylight.controller.thirdparty</groupId>
+        <artifactId>net.sf.jung2</artifactId>
+        <version>2.0.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.controller.thirdparty</groupId>
+        <artifactId>org.openflow.openflowj</artifactId>
+        <version>1.0.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.controller.thirdparty</groupId>
+        <artifactId>com.sun.jersey.jersey-servlet</artifactId>
+        <version>1.17</version>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.controller.thirdparty</groupId>
+        <artifactId>org.apache.catalina.filters.CorsFilter</artifactId>
+        <version>7.0.42</version>
+      </dependency>
+      <!-- yang model dependencies -->
+      <dependency>
+       <groupId>org.opendaylight.yangtools.model</groupId>
+       <artifactId>ietf-inet-types</artifactId>
+       <version>${ietf-inet-types.version}</version>
+      </dependency>
+      <dependency>
+       <groupId>org.opendaylight.yangtools.model</groupId>
+       <artifactId>ietf-yang-types</artifactId>
+       <version>${ietf-yang-types.version}</version>
+      </dependency>
+      <dependency>
+       <groupId>org.opendaylight.yangtools.model</groupId>
+       <artifactId>opendaylight-l2-types</artifactId>
+       <version>${opendaylight-l2-types.version}</version>
+      </dependency>
+      <dependency>
+       <groupId>org.opendaylight.yangtools.model</groupId>
+       <artifactId>yang-ext</artifactId>
+       <version>${yang-ext.version}</version>
+      </dependency>
+
+      <!-- bgppcep dependencies -->
+      <dependency>
+       <groupId>org.opendaylight.bgpcep</groupId>
+       <artifactId>concepts</artifactId>
+       <version>${bgpcep.version}</version>
+      </dependency>
+      <dependency>
+       <groupId>org.opendaylight.bgpcep</groupId>
+       <artifactId>util</artifactId>
+       <version>${bgpcep.version}</version>
+      </dependency>
+
+      <!-- yangtools dependencies -->
+      <dependency>
+       <groupId>org.opendaylight.yangtools</groupId>
+       <artifactId>yang-binding</artifactId>
+       <version>${yangtools.version}</version>
+      </dependency>
+      <dependency>
+       <groupId>org.opendaylight.yangtools</groupId>
+       <artifactId>yang-common</artifactId>
+       <version>${yangtools.version}</version>
+      </dependency>
+      <dependency>
+       <groupId>org.opendaylight.yangtools</groupId>
+       <artifactId>yang-data-api</artifactId>
+       <version>${yangtools.version}</version>
+      </dependency>
+      <dependency>
+       <groupId>org.opendaylight.yangtools</groupId>
+       <artifactId>yang-data-util</artifactId>
+       <version>${yangtools.version}</version>
+      </dependency>
+      <dependency>
+       <groupId>org.opendaylight.yangtools</groupId>
+       <artifactId>yang-model-api</artifactId>
+       <version>${yangtools.version}</version>
+      </dependency>
+
+    </dependencies>
+  </dependencyManagement>
 
   <pluginRepositories>
     <pluginRepository>
@@ -81,100 +661,19 @@
       <name>maven repo1</name>
       <url>http://repo1.maven.org/maven2</url>
     </pluginRepository>
+    <pluginRepository>
+      <id>opendaylight-release</id>
+      <name>opendaylight-release</name>
+      <url>${nexusproxy}/repositories/opendaylight.release/</url>
+    </pluginRepository>
+    <pluginRepository>
+      <id>opendaylight-snapshot</id>
+      <name>opendaylight-snapshot</name>
+      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+    </pluginRepository>
   </pluginRepositories>
 
   <profiles>
-    <profile>
-      <id>notduringrelease</id>
-      <activation>
-        <property>
-          <name>!DOINGRELEASE</name>
-        </property>
-      </activation>
-      <dependencies>
-        <!-- yangtools -->
-
-        <dependency>
-          <groupId>org.opendaylight.yangtools</groupId>
-          <artifactId>yang-binding</artifactId>
-          <version>${yang.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.yangtools</groupId>
-          <artifactId>yang-common</artifactId>
-          <version>${yang.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.yangtools</groupId>
-          <artifactId>yang-data-api</artifactId>
-          <version>${yang.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.yangtools</groupId>
-          <artifactId>yang-model-api</artifactId>
-          <version>${yang.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.yangtools</groupId>
-          <artifactId>yang-data-util</artifactId>
-          <version>${yang.version}</version>
-        </dependency>
-
-        <!-- Models -->
-
-        <dependency>
-          <groupId>org.opendaylight.yangtools.model</groupId>
-          <artifactId>ietf-inet-types</artifactId>
-          <version>${ietf-inet-types.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.yangtools.model</groupId>
-          <artifactId>ietf-yang-types</artifactId>
-          <version>${ietf-yang-types.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.yangtools.model</groupId>
-          <artifactId>ietf-yang-types</artifactId>
-          <version>${ietf-yang-types.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.yangtools.model</groupId>
-          <artifactId>opendaylight-l2-types</artifactId>
-          <version>${opendaylight-l2-types.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.yangtools.model</groupId>
-          <artifactId>yang-ext</artifactId>
-          <version>${yang-ext.version}</version>
-        </dependency>
-
-        <!-- Other MDSAL dependencies -->
-
-        <dependency>
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava</artifactId>
-          <version>${guava.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.javassist</groupId>
-          <artifactId>javassist</artifactId>
-          <version>${javassist.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.bgpcep</groupId>
-          <artifactId>concepts</artifactId>
-          <version>${bgpcep.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.bgpcep</groupId>
-          <artifactId>util</artifactId>
-          <version>${bgpcep.version}</version>
-        </dependency>
-      </dependencies>
-      <properties>
-        <build.suffix>${project.version}</build.suffix>
-      </properties>
-    </profile>
     <profile>
       <id>viewbuild</id>
       <activation>
@@ -252,7 +751,7 @@
         <enabled>false</enabled>
       </snapshots>
       <releases>
-          <enabled>true</enabled>
+        <enabled>true</enabled>
       </releases>
     </repository>
     <!-- Pax mirror -->
@@ -262,8 +761,8 @@
       <name>ops4j-releases</name>
       <url>${nexusproxy}/repositories/ops4j-releases/</url>
     </repository>
-    <!-- Third Packages hosted in local maven because not available in
-         other places -->
+    <!-- Third Packages hosted in local maven because not available in other
+      places -->
     <repository>
       <id>thirdparty</id>
       <name>thirdparty</name>
@@ -418,13 +917,13 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
         <version>${checkstyle.version}</version>
-          <dependencies>
-            <dependency>
-              <groupId>org.opendaylight.controller</groupId>
-              <artifactId>checkstyle</artifactId>
-              <version>0.0.2-SNAPSHOT</version>
-            </dependency>
-          </dependencies>
+        <dependencies>
+          <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>checkstyle</artifactId>
+            <version>0.0.2-SNAPSHOT</version>
+          </dependency>
+        </dependencies>
         <executions>
           <execution>
             <phase>process-sources</phase>
@@ -574,15 +1073,6 @@
             </execution>
           </executions>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>${compiler.version}</version>
-          <configuration>
-            <source>1.6</source>
-            <target>1.6</target>
-          </configuration>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
@@ -622,491 +1112,5 @@
   </build>
 
   <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-      <version>${slf4j.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</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.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-      <version>${jackson.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-core-asl</artifactId>
-      <version>${jackson.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-jaxrs</artifactId>
-      <version>${jackson.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-xc</artifactId>
-      <version>${jackson.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.jettison</groupId>
-      <artifactId>jettison</artifactId>
-      <version>1.3.3</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.4</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.7</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>${commons.lang.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
-      <version>1.2.2</version>
-    </dependency>
-    <dependency>
-        <groupId>commons-net</groupId>
-        <artifactId>commons-net</artifactId>
-        <version>3.0.1</version>
-    </dependency>
-    <dependency>
-      <groupId>equinoxSDK381</groupId>
-      <artifactId>javax.servlet</artifactId>
-      <version>3.0.0.v201112011016</version>
-    </dependency>
-    <dependency>
-      <groupId>equinoxSDK381</groupId>
-      <artifactId>javax.servlet.jsp</artifactId>
-      <version>2.2.0.v201112011158</version>
-    </dependency>
-    <dependency>
-      <groupId>equinoxSDK381</groupId>
-      <artifactId>org.eclipse.equinox.ds</artifactId>
-      <version>1.4.0.v20120522-1841</version>
-    </dependency>
-    <dependency>
-      <groupId>equinoxSDK381</groupId>
-      <artifactId>org.eclipse.equinox.util</artifactId>
-      <version>1.0.400.v20120522-2049</version>
-    </dependency>
-    <dependency>
-      <groupId>equinoxSDK381</groupId>
-      <artifactId>org.eclipse.osgi.services</artifactId>
-      <version>3.3.100.v20120522-1822</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.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>equinoxSDK381</groupId>
-      <artifactId>org.eclipse.equinox.cm</artifactId>
-      <version>1.0.400.v20120522-1841</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.eclipse.equinox.launcher</artifactId>
-      <version>1.3.0.v20120522-1813</version>
-    </dependency>
-    <!-- Gemini Web -->
-    <dependency>
-      <groupId>geminiweb</groupId>
-      <artifactId>org.eclipse.gemini.web.core</artifactId>
-      <version>${geminiweb.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>geminiweb</groupId>
-      <artifactId>org.eclipse.gemini.web.extender</artifactId>
-      <version>${geminiweb.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>geminiweb</groupId>
-      <artifactId>org.eclipse.gemini.web.tomcat</artifactId>
-      <version>${geminiweb.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>geminiweb</groupId>
-      <artifactId>org.eclipse.virgo.kernel.equinox.extensions</artifactId>
-      <version>${virgo.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>geminiweb</groupId>
-      <artifactId>org.eclipse.virgo.util.common</artifactId>
-      <version>${virgo.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>geminiweb</groupId>
-      <artifactId>org.eclipse.virgo.util.io</artifactId>
-      <version>${virgo.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>geminiweb</groupId>
-      <artifactId>org.eclipse.virgo.util.math</artifactId>
-      <version>${virgo.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>geminiweb</groupId>
-      <artifactId>org.eclipse.virgo.util.osgi</artifactId>
-      <version>${virgo.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>geminiweb</groupId>
-      <artifactId>org.eclipse.virgo.util.osgi.manifest</artifactId>
-      <version>${virgo.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>geminiweb</groupId>
-      <artifactId>org.eclipse.virgo.util.parser.manifest</artifactId>
-      <version>${virgo.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.dependencymanager</artifactId>
-      <version>3.1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.dependencymanager.shell</artifactId>
-      <version>3.0.1</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.spec.javax.transaction</groupId>
-      <artifactId>jboss-transaction-api_1.1_spec</artifactId>
-      <version>1.0.1.Final</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.fileinstall</artifactId>
-      <version>3.1.6</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>${commons.lang.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>virgomirror</groupId>
-      <artifactId>org.eclipse.jdt.core.compiler.batch</artifactId>
-      <version>3.8.0.I20120518-2145</version>
-    </dependency>
-    <dependency>
-      <groupId>eclipselink</groupId>
-      <artifactId>javax.persistence</artifactId>
-      <version>2.0.4.v201112161009</version>
-    </dependency>
-    <dependency>
-      <groupId>orbit</groupId>
-      <artifactId>javax.activation</artifactId>
-      <version>1.1.0.v201211130549</version>
-    </dependency>
-    <dependency>
-      <groupId>orbit</groupId>
-      <artifactId>javax.annotation</artifactId>
-      <version>1.1.0.v201209060031</version>
-    </dependency>
-    <dependency>
-      <groupId>orbit</groupId>
-      <artifactId>javax.ejb</artifactId>
-      <version>3.1.1.v201204261316</version>
-    </dependency>
-    <dependency>
-      <groupId>orbit</groupId>
-      <artifactId>javax.el</artifactId>
-      <version>2.2.0.v201108011116</version>
-    </dependency>
-    <dependency>
-      <groupId>orbit</groupId>
-      <artifactId>javax.mail.glassfish</artifactId>
-      <version>1.4.1.v201108011116</version>
-    </dependency>
-    <dependency>
-      <groupId>orbit</groupId>
-      <artifactId>javax.xml.rpc</artifactId>
-      <version>1.1.0.v201005080400</version>
-    </dependency>
-    <dependency>
-      <groupId>orbit</groupId>
-      <artifactId>org.apache.catalina</artifactId>
-      <version>7.0.32.v201211201336</version>
-    </dependency>
-    <dependency>
-      <groupId>orbit</groupId>
-      <artifactId>org.apache.catalina.ha</artifactId>
-      <version>7.0.32.v201211201952</version>
-    </dependency>
-    <dependency>
-      <groupId>orbit</groupId>
-      <artifactId>org.apache.catalina.tribes</artifactId>
-      <version>7.0.32.v201211201952</version>
-    </dependency>
-    <dependency>
-      <groupId>orbit</groupId>
-      <artifactId>org.apache.coyote</artifactId>
-      <version>7.0.32.v201211201952</version>
-    </dependency>
-    <dependency>
-      <groupId>orbit</groupId>
-      <artifactId>org.apache.el</artifactId>
-      <version>7.0.32.v201211081135</version>
-    </dependency>
-    <dependency>
-      <groupId>orbit</groupId>
-      <artifactId>org.apache.jasper</artifactId>
-      <version>7.0.32.v201211201952</version>
-    </dependency>
-    <dependency>
-      <groupId>orbit</groupId>
-      <artifactId>org.apache.juli.extras</artifactId>
-      <version>7.0.32.v201211081135</version>
-    </dependency>
-    <dependency>
-      <groupId>orbit</groupId>
-      <artifactId>org.apache.tomcat.api</artifactId>
-      <version>7.0.32.v201211081135</version>
-    </dependency>
-    <dependency>
-      <groupId>orbit</groupId>
-      <artifactId>org.apache.tomcat.util</artifactId>
-      <version>7.0.32.v201211201952</version>
-    </dependency>
-    <dependency>
-      <groupId>orbit</groupId>
-      <artifactId>javax.servlet.jsp.jstl</artifactId>
-      <version>1.2.0.v201105211821</version>
-    </dependency>
-    <dependency>
-      <groupId>orbit</groupId>
-      <artifactId>javax.servlet.jsp.jstl.impl</artifactId>
-      <version>1.2.0.v201210211230</version>
-    </dependency>
-    <dependency>
-      <groupId>eclipselink</groupId>
-      <artifactId>javax.resource</artifactId>
-      <version>1.5.0.v200906010428</version>
-    </dependency>
-    <!-- Add Pax Exam -->
-    <dependency>
-      <groupId>org.ops4j.pax.exam</groupId>
-      <artifactId>pax-exam-container-native</artifactId>
-      <version>${exam.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ops4j.pax.exam</groupId>
-      <artifactId>pax-exam-junit4</artifactId>
-      <version>${exam.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ops4j.pax.exam</groupId>
-      <artifactId>pax-exam-link-mvn</artifactId>
-      <version>${exam.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ops4j.pax.url</groupId>
-      <artifactId>pax-url-aether</artifactId>
-      <version>${url.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.asm</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.aop</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.context</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.context.support</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.core</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.beans</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.expression</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.web</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.aopalliance</groupId>
-      <artifactId>com.springsource.org.aopalliance</artifactId>
-      <version>1.0.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.web.servlet</artifactId>
-      <version>${spring.version}</version>
-    </dependency>
-    <!-- Spring security -->
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-config</artifactId>
-      <version>${spring-security.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-core</artifactId>
-      <version>${spring-security.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-web</artifactId>
-      <version>${spring-security.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-taglibs</artifactId>
-      <version>${spring-security.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>org.springframework.transaction</artifactId>
-      <version>${spring-security.version}</version>
-    </dependency>
-    <!-- Visual VM hook -->
-    <dependency>
-      <groupId>org.ow2.chameleon.management</groupId>
-      <artifactId>chameleon-mbeans</artifactId>
-      <version>1.0.0</version>
-    </dependency>
-    <!-- Jersey for JAXRS -->
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-core</artifactId>
-      <version>${jersey.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-server</artifactId>
-      <version>${jersey.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-client</artifactId>
-      <version>${jersey.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-json</artifactId>
-      <version>${jersey.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>org.ow2.asm</groupId>
-        <artifactId>asm-all</artifactId>
-        <version>4.1</version>
-    </dependency>
-    <dependency>
-        <groupId>org.eclipse.persistence</groupId>
-        <artifactId>org.eclipse.persistence.moxy</artifactId>
-        <version>2.5.0</version>
-    </dependency>
-    <dependency>
-        <groupId>org.eclipse.persistence</groupId>
-        <artifactId>org.eclipse.persistence.core</artifactId>
-        <version>2.5.0</version>
-    </dependency>
-    <dependency>
-        <groupId>org.eclipse.persistence</groupId>
-        <artifactId>org.eclipse.persistence.antlr</artifactId>
-        <version>2.5.0</version>
-    </dependency>
-    <!-- Third parties from opendaylight released -->
-    <dependency>
-      <groupId>org.opendaylight.controller.thirdparty</groupId>
-      <artifactId>net.sf.jung2</artifactId>
-      <version>2.0.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller.thirdparty</groupId>
-      <artifactId>org.openflow.openflowj</artifactId>
-      <version>1.0.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller.thirdparty</groupId>
-      <artifactId>com.sun.jersey.jersey-servlet</artifactId>
-      <version>1.17</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller.thirdparty</groupId>
-      <artifactId>org.apache.catalina.filters.CorsFilter</artifactId>
-      <version>7.0.42</version>
-    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/config/logback-config/pom.xml b/opendaylight/config/logback-config/pom.xml
index 6b79e7cd27d33a38d8c988cebe7c1cd8740dbeb4..697c3a258d4ebb921d8d9b901eadb2d347918209 100644 (file)
--- a/opendaylight/config/logback-config/pom.xml
+++ b/opendaylight/config/logback-config/pom.xml
@@ -77,6 +77,10 @@
             <version>0.2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-lang3</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml
index 3ebfad3f3062ef6895c00cb1a6b12479f99e2499..6484c3027451e85d61e779aced14da7280a777bb 100755 (executable)
--- a/opendaylight/config/pom.xml
+++ b/opendaylight/config/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>commons.opendaylight</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.1-SNAPSHOT</version>
         <relativePath>../commons/opendaylight</relativePath>
     </parent>
 
@@ -40,8 +40,9 @@
         <jacoco.version>0.6.2.201302030002</jacoco.version>
         <slf4j.version>1.7.2</slf4j.version>
         <jolokia.version>1.1.1</jolokia.version>
-        <opendaylight.yang.version>0.5.7-SNAPSHOT</opendaylight.yang.version>
-        <opendaylight.binding.version>0.5.7-SNAPSHOT</opendaylight.binding.version>
+        <osgi.core.version>5.0.0</osgi.core.version>
+        <opendaylight.yang.version>0.5.9-SNAPSHOT</opendaylight.yang.version>
+        <opendaylight.binding.version>0.6.0-SNAPSHOT</opendaylight.binding.version>
         <jmxGeneratorPath>${project.build.directory}/generated-sources/config</jmxGeneratorPath>
     </properties>
 

diff --git a/opendaylight/config/yang-jmx-generator-plugin/pom.xml b/opendaylight/config/yang-jmx-generator-plugin/pom.xml
index b69ce03144c5c7f47c8c2ed9856ec3516c375cae..1079ce9fd74449687b5c03dc9fe0e5d9e6e8483b 100644 (file)
--- a/opendaylight/config/yang-jmx-generator-plugin/pom.xml
+++ b/opendaylight/config/yang-jmx-generator-plugin/pom.xml
@@ -78,6 +78,10 @@
             <version>0.2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-lang3</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/opendaylight/config/yang-test/pom.xml b/opendaylight/config/yang-test/pom.xml
index 50c91883ee38cf13a4f63d8870345b6ff9ea302e..626032f195d9ec6289d0acd7c2283c20da030f51 100644 (file)
--- a/opendaylight/config/yang-test/pom.xml
+++ b/opendaylight/config/yang-test/pom.xml
@@ -23,6 +23,10 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+         <groupId>org.opendaylight.yangtools.model</groupId>
+         <artifactId>ietf-inet-types</artifactId>
+        </dependency>
     </dependencies>
 
     <name>${project.artifactId}</name>

diff --git a/opendaylight/configuration/implementation/pom.xml b/opendaylight/configuration/implementation/pom.xml
index fa617348d385dfe2c7805cfa94760611bfb52fdf..498b3d4e9335db0e8c7c0778f7672b1a7342ee00 100644 (file)
--- a/opendaylight/configuration/implementation/pom.xml
+++ b/opendaylight/configuration/implementation/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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.controller</groupId>
@@ -63,5 +64,9 @@
       <artifactId>sal</artifactId>
       <version>0.5.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/configuration/integrationtest/pom.xml b/opendaylight/configuration/integrationtest/pom.xml
index 5d1e9c03460861a30ad427d109fd086c9c685327..dc080cd03efa421da3de2f9703dcc9075007e838 100644 (file)
--- a/opendaylight/configuration/integrationtest/pom.xml
+++ b/opendaylight/configuration/integrationtest/pom.xml
@@ -92,5 +92,47 @@
       <artifactId>topologymanager</artifactId>
       <version>0.4.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <!-- Add Pax Exam -->
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-container-native</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-junit4</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-link-mvn</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.url</groupId>
+      <artifactId>pax-url-aether</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>eclipselink</groupId>
+      <artifactId>javax.resource</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/connectionmanager/implementation/pom.xml b/opendaylight/connectionmanager/implementation/pom.xml
index c3bd479afae5fc1af95cfae8a7cdc662151d63fd..58b21eccb89c27efeefe37c3e8393222b4333887 100644 (file)
--- a/opendaylight/connectionmanager/implementation/pom.xml
+++ b/opendaylight/connectionmanager/implementation/pom.xml
@@ -71,5 +71,9 @@
       <artifactId>sal.connection</artifactId>
       <version>0.1.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/containermanager/it.implementation/pom.xml b/opendaylight/containermanager/it.implementation/pom.xml
index fe2ef876d76a64010fc65991fa9d46593abcb0c8..3b86a797ca22ae3841823043a118ac7e07e043a3 100644 (file)
--- a/opendaylight/containermanager/it.implementation/pom.xml
+++ b/opendaylight/containermanager/it.implementation/pom.xml
@@ -69,5 +69,9 @@
       <artifactId>sal</artifactId>
       <version>0.5.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml
index cdba77ae29be27b369548f16a0a4282df364c7ea..0bb4088855798b02216f72e3f95e38fe1deff096 100644 (file)
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@ -25,120 +25,948 @@
           <name>!DOINGRELEASE</name>
         </property>
       </activation>
-      <modules>
-        <!-- MD-SAL bundles -->
-        <module>../../md-sal</module>
-        <module>../../config</module>
-      </modules>
+      <dependencies>
+
+        <!-- md-sal -->
+
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>sal-common</artifactId>
+          <version>${mdsal.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>sal-common-util</artifactId>
+          <version>${mdsal.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>sal-core-api</artifactId>
+          <version>${mdsal.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>sal-broker-impl</artifactId>
+          <version>${mdsal.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>sal-core-spi</artifactId>
+          <version>${mdsal.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>sal-binding-api</artifactId>
+          <version>${mdsal.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>sal-binding-broker-impl</artifactId>
+          <version>${mdsal.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>sal-compability</artifactId>
+          <version>${mdsal.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>sal-connector-api</artifactId>
+          <version>${mdsal.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>sal-rest-connector</artifactId>
+          <version>${mdsal.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller.model</groupId>
+          <artifactId>model-inventory</artifactId>
+          <version>${mdsal.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller.model</groupId>
+          <artifactId>model-flow-base</artifactId>
+          <version>${mdsal.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller.model</groupId>
+          <artifactId>model-flow-service</artifactId>
+          <version>${mdsal.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller.model</groupId>
+          <artifactId>model-flow-statistics</artifactId>
+          <version>${mdsal.version}</version>
+        </dependency>
+
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>concepts</artifactId>
+          <version>${concepts.version}</version>
+        </dependency>
+
+        <!-- config -->
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>config-api</artifactId>
+          <version>${config.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>config-manager</artifactId>
+          <version>${config.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>config-util</artifactId>
+          <version>${config.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>yang-jmx-generator</artifactId>
+          <version>${config.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>yang-jmx-generator-plugin</artifactId>
+          <version>${config.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>yang-jmx-generator-it</artifactId>
+          <version>${config.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>yang-store-api</artifactId>
+          <version>${config.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>yang-store-impl</artifactId>
+          <version>${config.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>yang-test</artifactId>
+          <version>${config.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>logback-config</artifactId>
+          <version>${config.version}</version>
+        </dependency>
+      </dependencies>
     </profile>
   </profiles>
 
   <artifactId>distribution.opendaylight</artifactId>
   <version>0.1.1-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <modules>
-    <module>../../forwarding/staticrouting</module>
-    <module>../../clustering/services</module>
-    <module>../../clustering/services_implementation</module>
-    <module>../../clustering/integrationtest</module>
-    <module>../../clustering/stub</module>
-    <module>../../clustering/test</module>
-    <module>../../configuration/api</module>
-    <module>../../configuration/implementation</module>
-    <module>../../configuration/integrationtest</module>
-    <module>../../routing/dijkstra_implementation</module>
-    <module>../../arphandler</module>
-    <module>../../forwardingrulesmanager/api</module>
-    <module>../../forwardingrulesmanager/implementation</module>
-    <module>../../forwardingrulesmanager/integrationtest</module>
-    <module>../../hosttracker/api</module>
-    <module>../../hosttracker/implementation</module>
-    <module>../../hosttracker/integrationtest</module>
-    <module>../../hosttracker_new/api</module>
-    <module>../../hosttracker_new/implementation</module>
-    <module>../../containermanager/api</module>
-    <module>../../containermanager/implementation</module>
-    <module>../../containermanager/it.implementation</module>
-    <module>../../appauth</module>
-    <module>../../switchmanager/api</module>
-    <module>../../switchmanager/implementation</module>
-    <module>../../switchmanager/integrationtest</module>
-    <module>../../statisticsmanager/api</module>
-    <module>../../statisticsmanager/implementation</module>
-    <module>../../statisticsmanager/integrationtest</module>
-    <module>../../topologymanager/implementation</module>
-    <module>../../topologymanager/integrationtest</module>
-    <module>../../usermanager/api</module>
-    <module>../../usermanager/implementation</module>
-    <module>../../connectionmanager/api</module>
-    <module>../../connectionmanager/implementation</module>
-    <module>../../security</module>
-
-    <!-- third-parties uncomment them if you need snapshot version of it -->
-    <!-- <module>../../../third-party/openflowj</module> -->
-    <!-- <module>../../../third-party/net.sf.jung2</module> -->
-    <!-- <module>../../../third-party/jersey-servlet</module> -->
-    <!-- <module>../../../third-party/org.apache.catalina.filters.CorsFilter</module> -->
-    <module>../../../third-party/commons/thirdparty</module>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>forwarding.staticrouting</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>clustering.services</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>clustering.services-implementation</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+      <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>configuration</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>configuration.implementation</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>routing.dijkstra_implementation</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+      <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>arphandler</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>hosttracker</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>hosttracker.implementation</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>containermanager</artifactId>
+      <version>${containermanager.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>containermanager.implementation</artifactId>
+      <version>${containermanager.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>appauth</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>switchmanager</artifactId>
+      <version>${switchmanager.api.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>switchmanager.implementation</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>statisticsmanager</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>statisticsmanager.implementation</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>topologymanager</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>usermanager</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>usermanager.implementation</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>connectionmanager</artifactId>
+      <version>${connectionmanager.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>connectionmanager.implementation</artifactId>
+      <version>${connectionmanager.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>security</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>forwardingrulesmanager</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>forwardingrulesmanager.implementation</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
 
     <!-- SAL bundles -->
-    <module>../../sal/api</module>
-    <module>../../sal/implementation</module>
 
-    <!-- SAL Extension bundles -->
-    <module>../../sal/connection/api</module>
-    <module>../../sal/connection/implementation</module>
-    <module>../../sal/networkconfiguration/api</module>
-    <module>../../sal/networkconfiguration/implementation</module>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+      <version>${sal.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal.implementation</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+
+  <!-- SAL Extension bundles -->
+
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal.connection</artifactId>
+      <version>${sal.connection.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal.connection.implementation</artifactId>
+      <version>${sal.connection.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal.networkconfiguration</artifactId>
+      <version>${sal.networkconfiguration.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal.networkconfiguration.implementation</artifactId>
+      <version>${sal.networkconfiguration.version}</version>
+    </dependency>
 
     <!--  Web bundles -->
-    <module>../../web/root</module>
-    <module>../../web/flows</module>
-    <module>../../web/devices</module>
-    <module>../../web/troubleshoot</module>
-    <module>../../web/topology</module>
+
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>web</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>flows.web</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>devices.web</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>troubleshoot.web</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>topology.web</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
 
     <!--  Neutron -->
-    <module>../../networkconfiguration/neutron</module>
-    <module>../../networkconfiguration/neutron/implementation</module>
-    <module>../../northbound/networkconfiguration/neutron</module>
+
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>networkconfig.neutron</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>networkconfig.neutron.implementation</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>networkconfig.neutron.northbound</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
 
     <!-- Northbound bundles -->
-    <module>../../northbound/commons</module>
-    <module>../../northbound/bundlescanner/api</module>
-    <module>../../northbound/bundlescanner/implementation</module>
-    <module>../../northbound/topology</module>
-    <module>../../northbound/staticrouting</module>
-    <module>../../northbound/statistics</module>
-    <module>../../northbound/flowprogrammer</module>
-    <module>../../northbound/hosttracker</module>
-    <module>../../northbound/subnets</module>
-    <module>../../northbound/switchmanager</module>
-    <module>../../northbound/containermanager</module>
-    <module>../../northbound/networkconfiguration/bridgedomain</module>
-
-    <!-- Northbound integration tests -->
-    <module>../../northbound/integrationtest</module>
+
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>commons.northbound</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>bundlescanner</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>bundlescanner.implementation</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>topology.northbound</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>forwarding.staticrouting.northbound</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>statistics.northbound</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>flowprogrammer.northbound</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>hosttracker.northbound</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>subnets.northbound</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>switchmanager.northbound</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>containermanager.northbound</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>networkconfig.bridgedomain.northbound</artifactId>
+      <version>${networkconfig.bridgedomain.northbound.version}</version>
+    </dependency>
+
     <!-- Debug and logging -->
-    <module>../../logging/bridge</module>
+
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>logging.bridge</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
 
     <!-- Southbound bundles -->
-    <module>../../protocol_plugins/openflow</module>
-    <module>../../protocol_plugins/stub</module>
-
-    <!-- Samples -->
-    <module>../../samples/simpleforwarding</module>
-    <module>../../samples/loadbalancer</module>
-    <module>../../samples/northbound/loadbalancer</module>
-
-    <!-- Parents -->
-    <module>../../commons/concepts</module>
-    <module>../../commons/httpclient</module>
-    <module>../../commons/integrationtest</module>
-    <module>../../commons/checkstyle</module>
-    <module>../../commons/opendaylight</module>
-    <module>../../commons/parent</module>
-  </modules>
+
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>protocol_plugins.openflow</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+
+    <!-- samples -->
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>samples.loadbalancer</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>samples.loadbalancer.northbound</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>samples.simpleforwarding</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+
+    <!-- Sanitytest
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sanitytest</artifactId>
+      <version>${controller.version}</version>
+    </dependency>
+
+    -->
+
+    <!-- Third party depedencies -->
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-mapper-asl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-core-asl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-jaxrs</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-xc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jettison</groupId>
+      <artifactId>jettison</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.javassist</groupId>
+      <artifactId>javassist</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>javax.servlet</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>javax.servlet.jsp</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.equinox.ds</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.equinox.util</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.osgi.services</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.apache.felix.gogo.command</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.apache.felix.gogo.runtime</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.apache.felix.gogo.shell</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.equinox.cm</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.equinox.console</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.equinox.launcher</artifactId>
+    </dependency>
+    <!-- Gemini Web -->
+    <dependency>
+      <groupId>geminiweb</groupId>
+      <artifactId>org.eclipse.gemini.web.core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>geminiweb</groupId>
+      <artifactId>org.eclipse.gemini.web.extender</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>geminiweb</groupId>
+      <artifactId>org.eclipse.gemini.web.tomcat</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>geminiweb</groupId>
+      <artifactId>org.eclipse.virgo.kernel.equinox.extensions</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>geminiweb</groupId>
+      <artifactId>org.eclipse.virgo.util.common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>geminiweb</groupId>
+      <artifactId>org.eclipse.virgo.util.io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>geminiweb</groupId>
+      <artifactId>org.eclipse.virgo.util.math</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>geminiweb</groupId>
+      <artifactId>org.eclipse.virgo.util.osgi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>geminiweb</groupId>
+      <artifactId>org.eclipse.virgo.util.osgi.manifest</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>geminiweb</groupId>
+      <artifactId>org.eclipse.virgo.util.parser.manifest</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.dependencymanager</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.dependencymanager.shell</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.spec.javax.transaction</groupId>
+      <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.fileinstall</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>virgomirror</groupId>
+      <artifactId>org.eclipse.jdt.core.compiler.batch</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>eclipselink</groupId>
+      <artifactId>javax.persistence</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>orbit</groupId>
+      <artifactId>javax.activation</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>orbit</groupId>
+      <artifactId>javax.annotation</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>orbit</groupId>
+      <artifactId>javax.ejb</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>orbit</groupId>
+      <artifactId>javax.el</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>orbit</groupId>
+      <artifactId>javax.mail.glassfish</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>orbit</groupId>
+      <artifactId>javax.xml.rpc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>orbit</groupId>
+      <artifactId>org.apache.catalina</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>orbit</groupId>
+      <artifactId>org.apache.catalina.ha</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>orbit</groupId>
+      <artifactId>org.apache.catalina.tribes</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>orbit</groupId>
+      <artifactId>org.apache.coyote</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>orbit</groupId>
+      <artifactId>org.apache.el</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>orbit</groupId>
+      <artifactId>org.apache.jasper</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>orbit</groupId>
+      <artifactId>org.apache.juli.extras</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>orbit</groupId>
+      <artifactId>org.apache.tomcat.api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>orbit</groupId>
+      <artifactId>org.apache.tomcat.util</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>orbit</groupId>
+      <artifactId>javax.servlet.jsp.jstl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>orbit</groupId>
+      <artifactId>javax.servlet.jsp.jstl.impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>eclipselink</groupId>
+      <artifactId>javax.resource</artifactId>
+    </dependency>
+    <!-- Add Pax Exam -->
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-container-native</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-junit4</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-link-mvn</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.url</groupId>
+      <artifactId>pax-url-aether</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>org.springframework.asm</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>org.springframework.aop</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>org.springframework.context</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>org.springframework.context.support</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>org.springframework.core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>org.springframework.beans</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>org.springframework.expression</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>org.springframework.web</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.aopalliance</groupId>
+      <artifactId>com.springsource.org.aopalliance</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>org.springframework.web.servlet</artifactId>
+    </dependency>
+    <!-- Spring security -->
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-taglibs</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>org.springframework.transaction</artifactId>
+    </dependency>
+    <!-- Visual VM hook -->
+    <dependency>
+      <groupId>org.ow2.chameleon.management</groupId>
+      <artifactId>chameleon-mbeans</artifactId>
+    </dependency>
+    <!-- Jersey for JAXRS -->
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-core</artifactId>
+      <version>${jersey.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-server</artifactId>
+      <version>${jersey.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-json</artifactId>
+      <version>${jersey.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-all</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.persistence</groupId>
+      <artifactId>org.eclipse.persistence.moxy</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.persistence</groupId>
+      <artifactId>org.eclipse.persistence.core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.persistence</groupId>
+      <artifactId>org.eclipse.persistence.antlr</artifactId>
+    </dependency>
+    <!-- Third parties from opendaylight released -->
+    <dependency>
+      <groupId>org.opendaylight.controller.thirdparty</groupId>
+      <artifactId>net.sf.jung2</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller.thirdparty</groupId>
+      <artifactId>org.openflow.openflowj</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller.thirdparty</groupId>
+      <artifactId>com.sun.jersey.jersey-servlet</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller.thirdparty</groupId>
+      <artifactId>org.apache.catalina.filters.CorsFilter</artifactId>
+    </dependency>
+    <!-- yang model dependencies -->
+    <dependency>
+     <groupId>org.opendaylight.yangtools.model</groupId>
+     <artifactId>ietf-inet-types</artifactId>
+    </dependency>
+    <dependency>
+     <groupId>org.opendaylight.yangtools.model</groupId>
+     <artifactId>ietf-yang-types</artifactId>
+    </dependency>
+    <dependency>
+     <groupId>org.opendaylight.yangtools.model</groupId>
+     <artifactId>opendaylight-l2-types</artifactId>
+    </dependency>
+    <dependency>
+     <groupId>org.opendaylight.yangtools.model</groupId>
+     <artifactId>yang-ext</artifactId>
+    </dependency>
+
+    <!-- bgppcep dependencies -->
+    <dependency>
+     <groupId>org.opendaylight.bgpcep</groupId>
+     <artifactId>concepts</artifactId>
+    </dependency>
+    <dependency>
+     <groupId>org.opendaylight.bgpcep</groupId>
+     <artifactId>util</artifactId>
+    </dependency>
+
+    <!-- testing dependencies I'm pretty sure we should trim -->
+    <dependency>
+     <groupId>org.opendaylight.controller</groupId>
+     <artifactId>clustering.test</artifactId>
+     <version>${controller.version}</version>
+    </dependency>
+    <dependency>
+     <groupId>org.opendaylight.controller</groupId>
+     <artifactId>commons.httpclient</artifactId>
+     <version>${commons.httpclient.version}</version>
+    </dependency>
+
+     <!-- toaster example I'm pretty sure we should trim -->
+
+    <dependency>
+     <groupId>org.opendaylight.controller.samples</groupId>
+     <artifactId>sample-toaster</artifactId>
+     <version>${mdsal.version}</version>
+    </dependency>
+    <dependency>
+     <groupId>org.opendaylight.controller.samples</groupId>
+     <artifactId>sample-toaster-consumer</artifactId>
+     <version>${mdsal.version}</version>
+    </dependency>
+    <dependency>
+     <groupId>org.opendaylight.controller.samples</groupId>
+     <artifactId>sample-toaster-provider</artifactId>
+     <version>${mdsal.version}</version>
+    </dependency>
+    <dependency>
+     <groupId>org.opendaylight.controller.samples</groupId>
+     <artifactId>sample-toaster-it</artifactId>
+     <version>${mdsal.version}</version>
+    </dependency>
+
+    <!-- yangtools dependencies I'm pretty sure we can trim -->
+    <dependency>
+     <groupId>org.opendaylight.yangtools</groupId>
+     <artifactId>yang-binding</artifactId>
+    </dependency>
+    <dependency>
+     <groupId>org.opendaylight.yangtools</groupId>
+     <artifactId>yang-common</artifactId>
+    </dependency>
+    <dependency>
+     <groupId>org.opendaylight.yangtools</groupId>
+     <artifactId>yang-data-api</artifactId>
+    </dependency>
+    <dependency>
+     <groupId>org.opendaylight.yangtools</groupId>
+     <artifactId>yang-data-util</artifactId>
+    </dependency>
+    <dependency>
+     <groupId>org.opendaylight.yangtools</groupId>
+     <artifactId>yang-model-api</artifactId>
+    </dependency>
+
+
+  </dependencies>
 
   <build>
     <plugins>
@@ -179,6 +1007,25 @@
           </execution>
         </executions>
       </plugin>
+      <!--
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.2.1</version>
+        <executions>
+          <execution>
+            <id>sanity-test</id>
+            <phase>package</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <executable>./run.sh</executable>
+        </configuration>
+      </plugin>
+      -->
     </plugins>
   </build>
 </project>

diff --git a/opendaylight/distribution/opendaylight/src/assemble/bin.xml b/opendaylight/distribution/opendaylight/src/assemble/bin.xml
index 92a718bac3e386c94b099ab3fdb35590ab851b81..8fea1756148cee4774de9a3586c7ea1056821e81 100644 (file)
--- a/opendaylight/distribution/opendaylight/src/assemble/bin.xml
+++ b/opendaylight/distribution/opendaylight/src/assemble/bin.xml
@@ -7,42 +7,6 @@
     <format>zip</format>
   </formats>
   <includeBaseDirectory>false</includeBaseDirectory>
-  <moduleSets>
-    <moduleSet>
-      <excludes>
-        <exclude>org.opendaylight.controller.thirdparty:org.openflow.openflowj</exclude>
-        <exclude>org.opendaylight.controller:clustering.stub</exclude>
-        <exclude>org.opendaylight.controller:logging.bridge</exclude>
-        <exclude>org.opendaylight.controller:protocol_plugins.stub</exclude>
-        <exclude>org.opendaylight.controller:*.integrationtest</exclude>
-        <exclude>org.opendaylight.controller:containermanager.it.implementation</exclude>
-        <exclude>org.opendaylight.controller:hosttracker_new</exclude>
-        <exclude>org.opendaylight.controller:hosttracker_new.implementation</exclude>
-        <exclude>org.opendaylight.controller:checkstyle</exclude>
-      </excludes>
-      <binaries>
-        <outputDirectory>opendaylight/plugins</outputDirectory>
-        <outputFileNameMapping>
-          ${module.groupId}.${module.artifactId}-${module.version}${dashClassifier?}.${module.extension}
-        </outputFileNameMapping>
-        <unpack>false</unpack>
-        <includeDependencies>false</includeDependencies>
-      </binaries>
-    </moduleSet>
-    <moduleSet>
-      <includes>
-        <include>org.opendaylight.controller:logging.bridge</include>
-      </includes>
-      <binaries>
-        <outputDirectory>opendaylight/lib</outputDirectory>
-        <outputFileNameMapping>
-          ${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}
-        </outputFileNameMapping>
-        <unpack>false</unpack>
-        <includeDependencies>false</includeDependencies>
-      </binaries>
-    </moduleSet>
-  </moduleSets>
   <dependencySets>
     <dependencySet>
       <outputDirectory>opendaylight/plugins</outputDirectory>
@@ -62,6 +26,8 @@
         <exclude>com.sun.jersey:jersey-core</exclude>
         <exclude>com.sun.jersey:jersey-json</exclude>
         <exclude>com.sun.jersey:jersey-server</exclude>
+        <exclude>org.opendaylight.controller:logging.bridge</exclude>
+        <exclude>org.opendaylight.controller:sanitytest</exclude>
       </excludes>
       <outputFileNameMapping>
         ${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}
@@ -88,6 +54,7 @@
         <include>com.sun.jersey:jersey-core</include>
         <include>com.sun.jersey:jersey-json</include>
         <include>com.sun.jersey:jersey-server</include>
+        <include>org.opendaylight.controller:logging.bridge</include>
       </includes>
       <useTransitiveDependencies>false</useTransitiveDependencies>
       <outputFileNameMapping>

diff --git a/opendaylight/distribution/sanitytest/pom.xml b/opendaylight/distribution/sanitytest/pom.xml
index a0001f6db50735d1d69e131db9023817211f5c85..142268cf99797ba95b6e295bf99f149666519688 100644 (file)
--- a/opendaylight/distribution/sanitytest/pom.xml
+++ b/opendaylight/distribution/sanitytest/pom.xml
@@ -17,7 +17,13 @@
   <artifactId>sanitytest</artifactId>
   <version>0.4.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
-
+  <dependencies>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
   <build>
     <plugins>
       <plugin>

diff --git a/opendaylight/forwardingrulesmanager/integrationtest/pom.xml b/opendaylight/forwardingrulesmanager/integrationtest/pom.xml
index 37c3a10afba693b3dcf6387cef926fe1adc385e4..5762fadf682abdde2548a86f41340a906cfc5bed 100644 (file)
--- a/opendaylight/forwardingrulesmanager/integrationtest/pom.xml
+++ b/opendaylight/forwardingrulesmanager/integrationtest/pom.xml
@@ -122,6 +122,39 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     </dependency>
+    <!-- Add Pax Exam -->
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-container-native</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-junit4</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-link-mvn</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.url</groupId>
+      <artifactId>pax-url-aether</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+    </dependency>
+    <dependency>
+       <groupId>ch.qos.logback</groupId>
+       <artifactId>logback-core</artifactId>
+     </dependency>
+     <dependency>
+       <groupId>ch.qos.logback</groupId>
+       <artifactId>logback-classic</artifactId>
+     </dependency>
   </dependencies>
   <properties>
     <!-- Sonar jacoco plugin to get integration test coverage info -->

diff --git a/opendaylight/hosttracker/api/pom.xml b/opendaylight/hosttracker/api/pom.xml
index 753d65c07267ce8341b79a12b02c9dcc29b52bb8..e8ccd1a7bc4dccc07d62f3198a571df2524a7945 100644 (file)
--- a/opendaylight/hosttracker/api/pom.xml
+++ b/opendaylight/hosttracker/api/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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.controller</groupId>
@@ -73,5 +74,9 @@
       <artifactId>sal</artifactId>
       <version>0.5.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/hosttracker/implementation/pom.xml b/opendaylight/hosttracker/implementation/pom.xml
index f7605afeea0536872b14bf5e154ca3ddefe84d4e..c3b25a014e0da774c75ed41a87c76f9c022c9c7f 100644 (file)
--- a/opendaylight/hosttracker/implementation/pom.xml
+++ b/opendaylight/hosttracker/implementation/pom.xml
@@ -144,5 +144,9 @@
       <artifactId>hosttracker</artifactId>
       <version>0.4.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/hosttracker/integrationtest/pom.xml b/opendaylight/hosttracker/integrationtest/pom.xml
index 834510536b60f7e2d5e43447f0fd4f8f96d92fc7..c308e720fc274261760993c49fe445799fd051a1 100644 (file)
--- a/opendaylight/hosttracker/integrationtest/pom.xml
+++ b/opendaylight/hosttracker/integrationtest/pom.xml
@@ -94,6 +94,43 @@
       <artifactId>topologymanager</artifactId>
       <version>0.4.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <!-- Add Pax Exam -->
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-container-native</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-junit4</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-link-mvn</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.url</groupId>
+      <artifactId>pax-url-aether</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+    </dependency>
+    <dependency>
+       <groupId>ch.qos.logback</groupId>
+       <artifactId>logback-core</artifactId>
+     </dependency>
+     <dependency>
+       <groupId>ch.qos.logback</groupId>
+       <artifactId>logback-classic</artifactId>
+     </dependency>
   </dependencies>
   <properties>
     <!-- Sonar jacoco plugin to get integration test coverage info -->

diff --git a/opendaylight/hosttracker_new/api/pom.xml b/opendaylight/hosttracker_new/api/pom.xml
index bfabd10e2292bf52a712dc4fee14cc6e2b14ad12..7fbcd9bc6786db407cb15eec9f1eb0ffaf27aff4 100644 (file)
--- a/opendaylight/hosttracker_new/api/pom.xml
+++ b/opendaylight/hosttracker_new/api/pom.xml
@@ -73,5 +73,9 @@
       <artifactId>sal</artifactId>
       <version>0.5.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/hosttracker_new/implementation/pom.xml b/opendaylight/hosttracker_new/implementation/pom.xml
index 62058b2d49c65e90fde5ccbe0920b1be32451887..5222ecf601618f80b64123168e62ccc00309d919 100644 (file)
--- a/opendaylight/hosttracker_new/implementation/pom.xml
+++ b/opendaylight/hosttracker_new/implementation/pom.xml
@@ -125,5 +125,9 @@
       <artifactId>hosttracker_new</artifactId>
       <version>0.4.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/logging/bridge/pom.xml b/opendaylight/logging/bridge/pom.xml
index 91ee4324c3a7fb8674138619357f781cda0e9f5e..3cdc01a409e34cbdad2434a5259d4b45a734fc74 100644 (file)
--- a/opendaylight/logging/bridge/pom.xml
+++ b/opendaylight/logging/bridge/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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.controller</groupId>
@@ -18,6 +19,17 @@
   <version>0.4.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
+    </dependency>
+  </dependencies>
+
   <build>
     <plugins>
       <plugin>

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index d1e3c2c89bdfb35402883a1cb0f71e22741b62b8..1ef55c6acc989fc6d289e21599009ef4a6b8df31 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -38,11 +38,11 @@
         <!-- Java Versions -->
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
-        
+
         <!-- Plugin Versions -->
         <bundle.plugin.version>2.4.0</bundle.plugin.version>
         <releaseplugin.version>2.3.2</releaseplugin.version>
-        
+
         <!-- Dependency Versions -->
         <slf4j.version>1.7.2</slf4j.version>
         <yang.version>0.5.8</yang.version>
@@ -85,10 +85,10 @@
             <name>opendaylight-snapshot</name>
             <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
         </repository>
-        <repository>           
-            <id>thirdparty</id>                
-            <name>thirdparty</name>            
-            <url>${nexusproxy}/repositories/thirdparty/</url>          
+        <repository>
+            <id>thirdparty</id>
+            <name>thirdparty</name>
+            <url>${nexusproxy}/repositories/thirdparty/</url>
         </repository>
         <repository>
             <id>central</id>

diff --git a/opendaylight/md-sal/sal-binding-api/pom.xml b/opendaylight/md-sal/sal-binding-api/pom.xml
index 1dae28fbb4fa59b3ab2a0df7a5a5dd6e78936ebb..4c154c5d144f4b8447b0efbba67a080e04537543 100644 (file)
--- a/opendaylight/md-sal/sal-binding-api/pom.xml
+++ b/opendaylight/md-sal/sal-binding-api/pom.xml
@@ -9,9 +9,9 @@
     <artifactId>sal-binding-api</artifactId>
     <packaging>bundle</packaging>
     <scm>
-      <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
-      <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-      <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
+        <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+        <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
     </scm>
 
     <dependencies>
@@ -28,6 +28,7 @@
             <artifactId>sal-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>

diff --git a/opendaylight/md-sal/sal-common-api/pom.xml b/opendaylight/md-sal/sal-common-api/pom.xml
new file mode 100644 (file)
index 0000000..2111dd7
--- /dev/null
+++ b/opendaylight/md-sal/sal-common-api/pom.xml
@@ -0,0 +1,38 @@
+<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.controller</groupId>
+        <artifactId>sal-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>sal-common-api</artifactId>
+    <scm>
+      <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+      <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+      <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
+    </scm>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>concepts</artifactId>
+            <version>0.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-common</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-common</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <version>5.0.0</version>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/opendaylight/networkconfiguration/neutron/implementation/pom.xml b/opendaylight/networkconfiguration/neutron/implementation/pom.xml
index 123eb2d3690908347366b81b3dd57b6d978dd16e..3b335463d97b34c8faf0f69825c5fa814f9fb4e4 100644 (file)
--- a/opendaylight/networkconfiguration/neutron/implementation/pom.xml
+++ b/opendaylight/networkconfiguration/neutron/implementation/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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.controller</groupId>
@@ -6,10 +7,10 @@
     <version>1.4.1-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
-      <properties>
-        <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
-        <enunciate.version>1.26.2</enunciate.version>
-    </properties>
+  <properties>
+    <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
+    <enunciate.version>1.26.2</enunciate.version>
+  </properties>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
@@ -17,71 +18,75 @@
     <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>
+  <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>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>networkconfig.neutron.implementation</artifactId>
   <version>0.4.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.3.6</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>
-                            org.opendaylight.controller.clustering.services,
-                            org.opendaylight.controller.sal.core,
-                            org.opendaylight.controller.sal.utils,
-                            org.apache.felix.dm,
-                            org.apache.commons.net.util,
-                            org.osgi.service.component,
-                            org.opendaylight.controller.networkconfig.neutron,
-                            org.slf4j,
-                            javax.xml.bind.annotation
-                        </Import-Package>
-                        <Bundle-Activator>
-                            org.opendaylight.controller.networkconfig.neutron.implementation.Activator
-                        </Bundle-Activator>
-                    </instructions>
-                    <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>clustering.services</artifactId>
-            <version>0.4.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>networkconfig.neutron</artifactId>
-            <version>0.4.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal</artifactId>
-            <version>0.5.1-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.6</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Import-Package>
+              org.opendaylight.controller.clustering.services,
+              org.opendaylight.controller.sal.core,
+              org.opendaylight.controller.sal.utils,
+              org.apache.felix.dm,
+              org.apache.commons.net.util,
+              org.osgi.service.component,
+              org.opendaylight.controller.networkconfig.neutron,
+              org.slf4j,
+              javax.xml.bind.annotation
+            </Import-Package>
+            <Bundle-Activator>
+              org.opendaylight.controller.networkconfig.neutron.implementation.Activator
+            </Bundle-Activator>
+          </instructions>
+          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>clustering.services</artifactId>
+      <version>0.4.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>networkconfig.neutron</artifactId>
+      <version>0.4.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+      <version>0.5.1-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
 </project>

diff --git a/opendaylight/networkconfiguration/neutron/pom.xml b/opendaylight/networkconfiguration/neutron/pom.xml
index aac8e1e87367ea4f7319b6655b2ac43e858c4411..588a61653ab6bfac66c0886d01aa69746ecd7e64 100644 (file)
--- a/opendaylight/networkconfiguration/neutron/pom.xml
+++ b/opendaylight/networkconfiguration/neutron/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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.controller</groupId>
@@ -6,72 +7,76 @@
     <version>1.4.1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
-      <properties>
-        <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
-        <enunciate.version>1.26.2</enunciate.version>
-    </properties>
+  <properties>
+    <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
+    <enunciate.version>1.26.2</enunciate.version>
+  </properties>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
     <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>
+  <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>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>networkconfig.neutron</artifactId>
   <version>0.4.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.3.6</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>
-                            org.opendaylight.controller.clustering.services,
-                            org.opendaylight.controller.sal.core,
-                            org.opendaylight.controller.sal.utils,
-                            org.apache.felix.dm,
-                            org.apache.commons.net.util,
-                            org.osgi.service.component,
-                            org.slf4j,
-                            javax.xml.bind.annotation
-                        </Import-Package>
-                    </instructions>
-                    <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>clustering.services</artifactId>
-            <version>0.4.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal</artifactId>
-            <version>0.5.1-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.3.6</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Import-Package>
+              org.opendaylight.controller.clustering.services,
+              org.opendaylight.controller.sal.core,
+              org.opendaylight.controller.sal.utils,
+              org.apache.felix.dm,
+              org.apache.commons.net.util,
+              org.osgi.service.component,
+              org.slf4j,
+              javax.xml.bind.annotation
+            </Import-Package>
+          </instructions>
+          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>clustering.services</artifactId>
+      <version>0.4.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+      <version>0.5.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+    </dependency>
+  </dependencies>
 </project>

diff --git a/opendaylight/northbound/bundlescanner/api/pom.xml b/opendaylight/northbound/bundlescanner/api/pom.xml
index 69672be1265a010c3ff157add81ace5b0b517e82..44b48cb2eb801863743bc56679b79c19afae01c0 100644 (file)
--- a/opendaylight/northbound/bundlescanner/api/pom.xml
+++ b/opendaylight/northbound/bundlescanner/api/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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.controller</groupId>
@@ -20,7 +21,7 @@
 
   <build>
     <plugins>
-       <plugin>
+      <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <version>${bundle.plugin.version}</version>
@@ -36,7 +37,7 @@
               javax.xml.bind,
             </Import-Package>
             <Export-Package>
-                org.opendaylight.controller.northbound.bundlescanner
+              org.opendaylight.controller.northbound.bundlescanner
             </Export-Package>
           </instructions>
         </configuration>
@@ -44,4 +45,10 @@
     </plugins>
   </build>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+    </dependency>
+  </dependencies>
 </project>

diff --git a/opendaylight/northbound/bundlescanner/implementation/pom.xml b/opendaylight/northbound/bundlescanner/implementation/pom.xml
index 0f86dd94d34621b63d1cd0f277fba55da366b0f2..3f795889ddb09262ca1fda6c54459f02eac00a00 100644 (file)
--- a/opendaylight/northbound/bundlescanner/implementation/pom.xml
+++ b/opendaylight/northbound/bundlescanner/implementation/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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.controller</groupId>
@@ -20,7 +21,7 @@
 
   <build>
     <plugins>
-       <plugin>
+      <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <version>${bundle.plugin.version}</version>
@@ -40,7 +41,7 @@
               javax.xml.bind,
             </Import-Package>
             <Bundle-Activator>
-                org.opendaylight.controller.northbound.bundlescanner.internal.Activator
+              org.opendaylight.controller.northbound.bundlescanner.internal.Activator
             </Bundle-Activator>
           </instructions>
         </configuration>
@@ -49,26 +50,30 @@
   </build>
 
   <dependencies>
-      <dependency>
-          <groupId>org.ow2.asm</groupId>
-          <artifactId>asm-all</artifactId>
-          <version>4.1</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework.osgi</groupId>
-        <artifactId>spring-osgi-mock</artifactId>
-        <version>1.2.1</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>bundlescanner</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal</artifactId>
-        <version>0.5.1-SNAPSHOT</version>
-      </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm-all</artifactId>
+      <version>4.1</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.osgi</groupId>
+      <artifactId>spring-osgi-mock</artifactId>
+      <version>1.2.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>bundlescanner</artifactId>
+      <version>0.4.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+      <version>0.5.1-SNAPSHOT</version>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/northbound/commons/pom.xml b/opendaylight/northbound/commons/pom.xml
index 84c3ff2e0267618e833d56a6682886dae0bd80fc..e6a2d155e9285c691ca3700d214bc98ed6524548 100644 (file)
--- a/opendaylight/northbound/commons/pom.xml
+++ b/opendaylight/northbound/commons/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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.controller</groupId>
@@ -68,7 +69,7 @@
       <artifactId>switchmanager</artifactId>
       <version>0.5.1-SNAPSHOT</version>
     </dependency>
-      <dependency>
+    <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal</artifactId>
       <version>0.5.1-SNAPSHOT</version>
@@ -79,9 +80,50 @@
       <version>0.4.1-SNAPSHOT</version>
     </dependency>
     <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>bundlescanner</artifactId>
-        <version>0.4.1-SNAPSHOT</version>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>bundlescanner</artifactId>
+      <version>0.4.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-core-asl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-mapper-asl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-jaxrs</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <!-- Jersey for JAXRS -->
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-core</artifactId>
+      <version>${jersey.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-server</artifactId>
+      <version>${jersey.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-client</artifactId>
+      <version>${jersey.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-json</artifactId>
+      <version>${jersey.version}</version>
     </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/northbound/flowprogrammer/pom.xml b/opendaylight/northbound/flowprogrammer/pom.xml
index 549f3393c9af4e0fc5bd8cda45885849bbb38dcf..645b1b6ac6ad01620e4e8a3a39384a4bda7964ef 100644 (file)
--- a/opendaylight/northbound/flowprogrammer/pom.xml
+++ b/opendaylight/northbound/flowprogrammer/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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.controller</groupId>
@@ -96,9 +97,13 @@
       <version>${enunciate.version}</version>
     </dependency>
     <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>commons.northbound</artifactId>
-          <version>0.4.1-SNAPSHOT</version>
-        </dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>commons.northbound</artifactId>
+      <version>0.4.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/northbound/hosttracker/pom.xml b/opendaylight/northbound/hosttracker/pom.xml
index 4792fbaa06b9097e81cf2a98ac3f213472f27ad5..160bceaa58329720cd6afdfa1a605eb7d3f6f81c 100644 (file)
--- a/opendaylight/northbound/hosttracker/pom.xml
+++ b/opendaylight/northbound/hosttracker/pom.xml
@@ -101,5 +101,9 @@
       <artifactId>enunciate-core-annotations</artifactId>
       <version>${enunciate.version}</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/northbound/integrationtest/pom.xml b/opendaylight/northbound/integrationtest/pom.xml
index aaa50e482d289555087d7fac34709a9919ed4670..120036566d1e62496f97fa78553754b46f7112f0 100644 (file)
--- a/opendaylight/northbound/integrationtest/pom.xml
+++ b/opendaylight/northbound/integrationtest/pom.xml
@@ -678,6 +678,17 @@
       <artifactId>jersey-json</artifactId>
       <version>${jersey.version}</version>
     </dependency>
-
+    <dependency>
+      <groupId>eclipselink</groupId>
+      <artifactId>javax.resource</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller.thirdparty</groupId>
+      <artifactId>com.sun.jersey.jersey-servlet</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller.thirdparty</groupId>
+      <artifactId>org.apache.catalina.filters.CorsFilter</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/northbound/networkconfiguration/neutron/pom.xml b/opendaylight/northbound/networkconfiguration/neutron/pom.xml
index c40966b43820b681a8698400e2f23684089312cf..9a82afbb1a5c028d3771d921e3835e5a25830901 100644 (file)
--- a/opendaylight/northbound/networkconfiguration/neutron/pom.xml
+++ b/opendaylight/northbound/networkconfiguration/neutron/pom.xml
@@ -116,5 +116,9 @@
             <artifactId>org.eclipse.persistence.antlr</artifactId>
             <version>2.5.0</version>
         </dependency>
+        <dependency>
+          <groupId>com.sun.jersey</groupId>
+          <artifactId>jersey-core</artifactId>
+        </dependency>
     </dependencies>
 </project>

diff --git a/opendaylight/northbound/staticrouting/pom.xml b/opendaylight/northbound/staticrouting/pom.xml
index 525831f7e95e330c4b7ed48dc7a3c302745cfb7a..a869519c58bb62e316f852d663d03c35d85d6091 100644 (file)
--- a/opendaylight/northbound/staticrouting/pom.xml
+++ b/opendaylight/northbound/staticrouting/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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.controller</groupId>
@@ -22,7 +23,6 @@
       <plugin>
         <groupId>org.codehaus.enunciate</groupId>
         <artifactId>maven-enunciate-plugin</artifactId>
-        <version>${enunciate.version}</version>
         <dependencies>
           <dependency>
             <groupId>org.opendaylight.controller</groupId>
@@ -96,5 +96,9 @@
       <artifactId>commons.northbound</artifactId>
       <version>0.4.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/northbound/statistics/pom.xml b/opendaylight/northbound/statistics/pom.xml
index 084da6eb02ffca5cd4409ef17420b807a5df5378..8df02c976b63db49ed411fc962a79593c82f3a4b 100644 (file)
--- a/opendaylight/northbound/statistics/pom.xml
+++ b/opendaylight/northbound/statistics/pom.xml
@@ -104,5 +104,9 @@
       <artifactId>enunciate-core-annotations</artifactId>
       <version>${enunciate.version}</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/northbound/subnets/pom.xml b/opendaylight/northbound/subnets/pom.xml
index 75530e48a9245b3d9bcebcd94dc7834fedf6fdef..1ad3075b54deed9e5e1bd0f3e75ff41faf0ee1cf 100644 (file)
--- a/opendaylight/northbound/subnets/pom.xml
+++ b/opendaylight/northbound/subnets/pom.xml
@@ -111,5 +111,11 @@
       <artifactId>enunciate-core-annotations</artifactId>
       <version>${enunciate.version}</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/northbound/switchmanager/pom.xml b/opendaylight/northbound/switchmanager/pom.xml
index 1b9c8344a8a349e3810478a04c26f1b290517f50..bb3ca4bd42b5ab21daa0907fd09dfddfc9d24633 100644 (file)
--- a/opendaylight/northbound/switchmanager/pom.xml
+++ b/opendaylight/northbound/switchmanager/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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.controller</groupId>
@@ -106,5 +107,10 @@
       <artifactId>enunciate-core-annotations</artifactId>
       <version>${enunciate.version}</version>
     </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/northbound/topology/pom.xml b/opendaylight/northbound/topology/pom.xml
index 56d2928838f6e357d2191450cf907ca7d5d57f85..3b3abc34368f7937e01bf736770a08c20078576c 100644 (file)
--- a/opendaylight/northbound/topology/pom.xml
+++ b/opendaylight/northbound/topology/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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.controller</groupId>
@@ -19,7 +20,7 @@
   <packaging>bundle</packaging>
 
   <build>
-     <plugins>
+    <plugins>
       <plugin>
         <groupId>org.codehaus.enunciate</groupId>
         <artifactId>maven-enunciate-plugin</artifactId>
@@ -33,11 +34,11 @@
         </dependencies>
       </plugin>
       <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <version>${bundle.plugin.version}</version>
-          <extensions>true</extensions>
-          <configuration>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>${bundle.plugin.version}</version>
+        <extensions>true</extensions>
+        <configuration>
           <instructions>
             <Export-Package>
             </Export-Package>
@@ -99,5 +100,9 @@
       <artifactId>topologymanager</artifactId>
       <version>0.4.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/protocol_plugins/openflow/pom.xml b/opendaylight/protocol_plugins/openflow/pom.xml
index 5e0d8dae03ff83ebe18dc564ced10e55cc278c32..c7522c977f81527adf1acc63696d5a0dda49f38f 100644 (file)
--- a/opendaylight/protocol_plugins/openflow/pom.xml
+++ b/opendaylight/protocol_plugins/openflow/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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.controller</groupId>
@@ -80,5 +81,13 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller.thirdparty</groupId>
+      <artifactId>org.openflow.openflowj</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/routing/dijkstra_implementation/pom.xml b/opendaylight/routing/dijkstra_implementation/pom.xml
index 3689d9f124d9c977bda847d633dfe2e7af8328e2..0d77ec9fa55d0b53fb14d2980c8b49235d5f6331 100644 (file)
--- a/opendaylight/routing/dijkstra_implementation/pom.xml
+++ b/opendaylight/routing/dijkstra_implementation/pom.xml
@@ -75,5 +75,13 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller.thirdparty</groupId>
+      <artifactId>net.sf.jung2</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.apache.felix.gogo.runtime</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/sal/api/pom.xml b/opendaylight/sal/api/pom.xml
index 87059531d294130d090cdd9188ace90ccecadc20..1ac4e325aff13894fc02edc43709de0d18d01d28 100644 (file)
--- a/opendaylight/sal/api/pom.xml
+++ b/opendaylight/sal/api/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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.controller</groupId>
@@ -62,5 +63,22 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.dependencymanager</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/sal/implementation/pom.xml b/opendaylight/sal/implementation/pom.xml
index 10e89a7c9eb2d1b70e01c1d7a2900d894f3bd6b2..f260f315e082368066413f35a1704db205ad889e 100644 (file)
--- a/opendaylight/sal/implementation/pom.xml
+++ b/opendaylight/sal/implementation/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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.controller</groupId>
@@ -60,5 +61,14 @@
       <artifactId>sal</artifactId>
       <version>0.5.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/samples/loadbalancer/pom.xml b/opendaylight/samples/loadbalancer/pom.xml
index 5ca6cc190e34677e8c7ab2dd7c54a3df3fad57bb..bbef8935052b26213bbae9aa59dee9a1f87a7ec9 100644 (file)
--- a/opendaylight/samples/loadbalancer/pom.xml
+++ b/opendaylight/samples/loadbalancer/pom.xml
@@ -98,5 +98,9 @@
       <artifactId>sal</artifactId>
       <version>0.5.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/security/pom.xml b/opendaylight/security/pom.xml
index 3b9e29c0555ae6e39e31371a2c49757e63caa3ab..2e7466daf000255e915fca10252e9295bbb5349c 100644 (file)
--- a/opendaylight/security/pom.xml
+++ b/opendaylight/security/pom.xml
@@ -60,5 +60,9 @@
       <artifactId>sal</artifactId>
       <version>0.5.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+        <groupId>orbit</groupId>
+        <artifactId>org.apache.catalina</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/statisticsmanager/implementation/pom.xml b/opendaylight/statisticsmanager/implementation/pom.xml
index b77eb75be0fa863036740c08d63a8a21d472c110..b79051ce58c38dc85a1d23709aa94d51292a7be8 100644 (file)
--- a/opendaylight/statisticsmanager/implementation/pom.xml
+++ b/opendaylight/statisticsmanager/implementation/pom.xml
@@ -117,5 +117,9 @@
       <artifactId>clustering.services</artifactId>
       <version>0.4.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/statisticsmanager/integrationtest/pom.xml b/opendaylight/statisticsmanager/integrationtest/pom.xml
index ca2ec4eedcc93e0652cc8642b703b06375061ec0..acba080a99dd3a7cb5ffe0507edda4d521927b22 100644 (file)
--- a/opendaylight/statisticsmanager/integrationtest/pom.xml
+++ b/opendaylight/statisticsmanager/integrationtest/pom.xml
@@ -98,6 +98,43 @@
       <artifactId>topologymanager</artifactId>
       <version>0.4.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <!-- Add Pax Exam -->
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-container-native</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-junit4</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-link-mvn</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.url</groupId>
+      <artifactId>pax-url-aether</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+    </dependency>
+    <dependency>
+       <groupId>ch.qos.logback</groupId>
+       <artifactId>logback-core</artifactId>
+     </dependency>
+     <dependency>
+       <groupId>ch.qos.logback</groupId>
+       <artifactId>logback-classic</artifactId>
+     </dependency>
   </dependencies>
   <properties>
     <!-- Sonar jacoco plugin to get integration test coverage info -->

diff --git a/opendaylight/switchmanager/api/pom.xml b/opendaylight/switchmanager/api/pom.xml
index 6b84e156ba5021485599a4e6b07615caf04f76c3..8452c38218a1a63790ba306a2a516f24d7bfc0da 100644 (file)
--- a/opendaylight/switchmanager/api/pom.xml
+++ b/opendaylight/switchmanager/api/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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.controller</groupId>
@@ -105,5 +106,10 @@
       <artifactId>sal</artifactId>
       <version>0.5.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/switchmanager/implementation/pom.xml b/opendaylight/switchmanager/implementation/pom.xml
index 302652aa62716a587a2203bbdce09000ddb1f489..f701bf0bd30ffa62e18271240073e47f9d520bbf 100644 (file)
--- a/opendaylight/switchmanager/implementation/pom.xml
+++ b/opendaylight/switchmanager/implementation/pom.xml
@@ -121,5 +121,13 @@
       <artifactId>statisticsmanager</artifactId>
       <version>0.4.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>equinoxSDK381</groupId>
+        <artifactId>org.apache.felix.gogo.runtime</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/switchmanager/integrationtest/pom.xml b/opendaylight/switchmanager/integrationtest/pom.xml
index c3997a41888d3b3cccdd6a0e07df540e74993e02..37f68260bc051e3d1d32072c77968b4543189699 100644 (file)
--- a/opendaylight/switchmanager/integrationtest/pom.xml
+++ b/opendaylight/switchmanager/integrationtest/pom.xml
@@ -73,6 +73,43 @@
       <artifactId>protocol_plugins.stub</artifactId>
       <version>0.4.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <!-- Add Pax Exam -->
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-container-native</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-junit4</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.exam</groupId>
+      <artifactId>pax-exam-link-mvn</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.url</groupId>
+      <artifactId>pax-url-aether</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+    </dependency>
+    <dependency>
+       <groupId>ch.qos.logback</groupId>
+       <artifactId>logback-core</artifactId>
+     </dependency>
+     <dependency>
+       <groupId>ch.qos.logback</groupId>
+       <artifactId>logback-classic</artifactId>
+     </dependency>
   </dependencies>
   <properties>
     <!-- Sonar jacoco plugin to get integration test coverage info -->

diff --git a/opendaylight/topologymanager/implementation/pom.xml b/opendaylight/topologymanager/implementation/pom.xml
index f4f4924e44174b57361670e3ae7370abea6c7cfb..a2fc91c29ce7c6d112503256e6a1c877f8c77826 100755 (executable)
--- a/opendaylight/topologymanager/implementation/pom.xml
+++ b/opendaylight/topologymanager/implementation/pom.xml
@@ -1,5 +1,6 @@
 <?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">
+<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.controller</groupId>
@@ -77,5 +78,14 @@
       <artifactId>switchmanager</artifactId>
       <version>0.5.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/usermanager/api/pom.xml b/opendaylight/usermanager/api/pom.xml
index 97121b348c4417fc18c4d27e83f23c24cff7e77d..c301f8da2c4f0720548e65ac128d7409ef0c5528 100644 (file)
--- a/opendaylight/usermanager/api/pom.xml
+++ b/opendaylight/usermanager/api/pom.xml
@@ -87,5 +87,44 @@
       <artifactId>sal</artifactId>
       <version>0.5.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>javax.servlet</artifactId>
+      <version>3.0.0.v201112011016</version>
+    </dependency>
+    <!-- Spring security -->
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-config</artifactId>
+      <version>${spring-security.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-core</artifactId>
+      <version>${spring-security.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+      <version>${spring-security.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-taglibs</artifactId>
+      <version>${spring-security.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>org.springframework.transaction</artifactId>
+      <version>${spring-security.version}</version>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/usermanager/implementation/pom.xml b/opendaylight/usermanager/implementation/pom.xml
index 9c9014e7a360f79193c67df9b37a8e0a4bfe6c37..4eedf7eda99f42bb70d011dd7daba2d81d2d4ae0 100644 (file)
--- a/opendaylight/usermanager/implementation/pom.xml
+++ b/opendaylight/usermanager/implementation/pom.xml
@@ -91,5 +91,21 @@
       <artifactId>sal</artifactId>
       <version>0.5.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-web</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/web/devices/pom.xml b/opendaylight/web/devices/pom.xml
index cabc9b5242071dacc177a08bb9b10a5bc3df4a32..d894fd7d477a022be1a62993cf8867d6c4b3352d 100644 (file)
--- a/opendaylight/web/devices/pom.xml
+++ b/opendaylight/web/devices/pom.xml
@@ -120,5 +120,9 @@
       <artifactId>forwarding.staticrouting</artifactId>
       <version>0.4.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-mapper-asl</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/web/root/pom.xml b/opendaylight/web/root/pom.xml
index 1ff86722a21e1f4a5ea62430cd3d2c8d6f4a45a8..fa755801021f79f411f17996ab955aa85d8b0d83 100644 (file)
--- a/opendaylight/web/root/pom.xml
+++ b/opendaylight/web/root/pom.xml
@@ -130,6 +130,18 @@
       <artifactId>switchmanager</artifactId>
       <version>0.5.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>org.springframework.web</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>javax.servlet</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/opendaylight/web/topology/pom.xml b/opendaylight/web/topology/pom.xml
index 9a8c98929e4e386c6a320a8b6b0300e83537d2dd..83d5c4547d097e7ca8d4bd0e11c3ce77be45ac78 100644 (file)
--- a/opendaylight/web/topology/pom.xml
+++ b/opendaylight/web/topology/pom.xml
@@ -123,5 +123,14 @@
       <artifactId>web</artifactId>
       <version>0.4.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller.thirdparty</groupId>
+      <artifactId>net.sf.jung2</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/web/troubleshoot/pom.xml b/opendaylight/web/troubleshoot/pom.xml
index c4d9d6b978d57fa52453e693373cdd5e68d2a9f2..95941a307647506174b067b7ac68a7ce4df9babb 100644 (file)
--- a/opendaylight/web/troubleshoot/pom.xml
+++ b/opendaylight/web/troubleshoot/pom.xml
@@ -121,5 +121,10 @@
       <artifactId>web</artifactId>
       <version>0.4.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-mapper-asl</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
   </dependencies>
 </project>

diff --git a/pom.xml b/pom.xml
index 7de8fc4c8cddf4b0440fbc46f9713c041963f063..d1b65d590233509bf4ec092fcc9faa380eb8871c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,5 +23,115 @@
   <modules>
     <module>opendaylight/distribution/opendaylight</module>
     <module>opendaylight/archetypes</module>
+    <module>opendaylight/forwarding/staticrouting</module>
+    <module>opendaylight/clustering/services</module>
+    <module>opendaylight/clustering/services_implementation</module>
+    <module>opendaylight/clustering/integrationtest</module>
+    <module>opendaylight/clustering/stub</module>
+    <module>opendaylight/clustering/test</module>
+    <module>opendaylight/configuration/api</module>
+    <module>opendaylight/configuration/implementation</module>
+    <module>opendaylight/configuration/integrationtest</module>
+    <module>opendaylight/routing/dijkstra_implementation</module>
+    <module>opendaylight/arphandler</module>
+    <module>opendaylight/forwardingrulesmanager/api</module>
+    <module>opendaylight/forwardingrulesmanager/implementation</module>
+    <module>opendaylight/forwardingrulesmanager/integrationtest</module>
+    <module>opendaylight/hosttracker/api</module>
+    <module>opendaylight/hosttracker/implementation</module>
+    <module>opendaylight/hosttracker/integrationtest</module>
+    <module>opendaylight/hosttracker_new/api</module>
+    <module>opendaylight/hosttracker_new/implementation</module>
+    <module>opendaylight/containermanager/api</module>
+    <module>opendaylight/containermanager/implementation</module>
+    <module>opendaylight/containermanager/it.implementation</module>
+    <module>opendaylight/appauth</module>
+    <module>opendaylight/switchmanager/api</module>
+    <module>opendaylight/switchmanager/implementation</module>
+    <module>opendaylight/switchmanager/integrationtest</module>
+    <module>opendaylight/statisticsmanager/api</module>
+    <module>opendaylight/statisticsmanager/implementation</module>
+    <module>opendaylight/statisticsmanager/integrationtest</module>
+    <module>opendaylight/topologymanager/implementation</module>
+    <module>opendaylight/topologymanager/integrationtest</module>
+    <module>opendaylight/usermanager/api</module>
+    <module>opendaylight/usermanager/implementation</module>
+    <module>opendaylight/connectionmanager/api</module>
+    <module>opendaylight/connectionmanager/implementation</module>
+    <module>opendaylight/security</module>
+
+    <!-- third-parties uncomment them if you need snapshot version of it -->
+    <!-- <module>third-party/openflowj</module> -->
+    <!-- <module>third-party/net.sf.jung2</module> -->
+    <!-- <module>third-party/jersey-servlet</module> -->
+    <!-- <module>third-party/org.apache.catalina.filters.CorsFilter</module> -->
+
+    <module>third-party/commons/thirdparty</module>
+
+    <!-- SAL bundles -->
+    <module>opendaylight/sal/api</module>
+    <module>opendaylight/sal/implementation</module>
+
+    <!-- SAL Extension bundles -->
+    <module>opendaylight/sal/connection/api</module>
+    <module>opendaylight/sal/connection/implementation</module>
+    <module>opendaylight/sal/networkconfiguration/api</module>
+    <module>opendaylight/sal/networkconfiguration/implementation</module>
+
+    <!-- md-sal -->
+    <module>opendaylight/md-sal</module>
+    <module>opendaylight/config</module>
+    <!-- config -->
+
+    <!--  Web bundles -->
+    <module>opendaylight/web/root</module>
+    <module>opendaylight/web/flows</module>
+    <module>opendaylight/web/devices</module>
+    <module>opendaylight/web/troubleshoot</module>
+    <module>opendaylight/web/topology</module>
+
+    <!--  Neutron -->
+    <module>opendaylight/networkconfiguration/neutron</module>
+    <module>opendaylight/networkconfiguration/neutron/implementation</module>
+    <module>opendaylight/northbound/networkconfiguration/neutron</module>
+
+    <!-- Northbound bundles -->
+    <module>opendaylight/northbound/commons</module>
+    <module>opendaylight/northbound/bundlescanner/api</module>
+    <module>opendaylight/northbound/bundlescanner/implementation</module>
+    <module>opendaylight/northbound/topology</module>
+    <module>opendaylight/northbound/staticrouting</module>
+    <module>opendaylight/northbound/statistics</module>
+    <module>opendaylight/northbound/flowprogrammer</module>
+    <module>opendaylight/northbound/hosttracker</module>
+    <module>opendaylight/northbound/subnets</module>
+    <module>opendaylight/northbound/switchmanager</module>
+    <module>opendaylight/northbound/containermanager</module>
+    <module>opendaylight/northbound/networkconfiguration/bridgedomain</module>
+
+    <!-- Northbound integration tests -->
+    <module>opendaylight/northbound/integrationtest</module>
+    <!-- Debug and logging -->
+    <module>opendaylight/logging/bridge</module>
+
+    <!-- Southbound bundles -->
+    <module>opendaylight/protocol_plugins/openflow</module>
+    <module>opendaylight/protocol_plugins/stub</module>
+
+    <!-- Samples -->
+    <module>opendaylight/samples/simpleforwarding</module>
+    <module>opendaylight/samples/loadbalancer</module>
+    <module>opendaylight/samples/northbound/loadbalancer</module>
+
+    <!-- sanity test
+    <module>opendaylight/distribution/sanitytest/</module>
+    -->
+    <!-- Parents -->
+    <module>opendaylight/commons/concepts</module>
+    <module>opendaylight/commons/httpclient</module>
+    <module>opendaylight/commons/integrationtest</module>
+    <module>opendaylight/commons/checkstyle</module>
+    <module>opendaylight/commons/opendaylight</module>
+    <module>opendaylight/commons/parent</module>
   </modules>
 </project>