Add HTTP Client library and refactor Northbound IntegrationTest

[controller.git] / opendaylight / distribution / opendaylight / pom.xml

diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml
index 56ca0c951be5a0c2a0664a70e7f6ac5aa4ada061..cdba77ae29be27b369548f16a0a4282df364c7ea 100644 (file)
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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>
@@ -9,23 +8,15 @@
     <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>
   <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>
 
-  <repositories>
-    <!-- To get SVNKit -->
-    <repository>
-      <id>svnkit-snapshots</id>
-      <name>svnkit-snapshots</name>
-      <url>${nexusproxy}/repositories/svnkit-snapshots/</url>
-    </repository>
-  </repositories>
-
   <profiles>
     <profile>
       <id>notduringrelease</id>
@@ -36,13 +27,14 @@
       </activation>
       <modules>
         <!-- MD-SAL bundles -->
-        <module>../../sal/yang-prototype</module>
+        <module>../../md-sal</module>
+        <module>../../config</module>
       </modules>
     </profile>
   </profiles>
 
   <artifactId>distribution.opendaylight</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>0.1.1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules>
     <module>../../forwarding/staticrouting</module>
@@ -74,18 +66,20 @@
     <module>../../statisticsmanager/api</module>
     <module>../../statisticsmanager/implementation</module>
     <module>../../statisticsmanager/integrationtest</module>
-    <module>../../topologymanager</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>
 
-    <module>../../../third-party/openflowj</module>
-    <module>../../../third-party/net.sf.jung2</module>
-    <module>../../../third-party/jersey-servlet</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>
-    <module>../../../third-party/org.apache.catalina.filters.CorsFilter</module>
 
     <!-- SAL bundles -->
     <module>../../sal/api</module>
@@ -104,8 +98,15 @@
     <module>../../web/troubleshoot</module>
     <module>../../web/topology</module>
 
+    <!--  Neutron -->
+    <module>../../networkconfiguration/neutron</module>
+    <module>../../networkconfiguration/neutron/implementation</module>
+    <module>../../northbound/networkconfiguration/neutron</module>
+
     <!-- 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>
@@ -132,6 +133,7 @@
 
     <!-- Parents -->
     <module>../../commons/concepts</module>
+    <module>../../commons/httpclient</module>
     <module>../../commons/integrationtest</module>
     <module>../../commons/checkstyle</module>
     <module>../../commons/opendaylight</module>
@@ -155,28 +157,8 @@
         <configuration>
           <doCheck>false</doCheck>
           <doUpdate>false</doUpdate>
-          <providerImplementations>
-            <svn>javasvn</svn>
-          </providerImplementations>
           <revisionOnScmFailure>VersionUnknown</revisionOnScmFailure>
         </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>com.google.code.maven-scm-provider-svnjava</groupId>
-            <artifactId>maven-scm-provider-svnjava</artifactId>
-            <version>2.0.5</version>
-          </dependency>
-          <dependency>
-            <groupId>org.tmatesoft.svnkit</groupId>
-            <artifactId>svnkit</artifactId>
-            <version>1.7.4-v1</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.maven.scm</groupId>
-            <artifactId>maven-scm-provider-svn-commons</artifactId>
-            <version>1.7</version>
-          </dependency>
-        </dependencies>
       </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -192,7 +174,7 @@
               <descriptors>
                 <descriptor>src/assemble/bin.xml</descriptor>
               </descriptors>
-              <finalName>${project.artifactId}-${build.suffix}</finalName>
+              <finalName>${project.artifactId}</finalName>
             </configuration>
           </execution>
         </executions>