X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fdistribution%2Fopendaylight%2Fpom.xml;h=eac5a705f95c625e0b81efc1e8ba8ee958e85970;hp=86725e9d05b388a10a4ee8b29e90ac922650133e;hb=9fb64948564e252018f9b1e13e7cea2c92f991aa;hpb=e9db4b6d9c7b10b878157a428a6690c831556dfa

diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml
index 86725e9d05..eac5a705f9 100644
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@ -1,33 +1,40 @@
 <?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>
   </prerequisites>
-
   <scm>
-    <connection>scm:git:https://git.opendaylight.org/gerrit/p/controller.git</connection>
+    <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>
+      <activation>
+        <property>
+          <name>!DOINGRELEASE</name>
+        </property>
+      </activation>
+      <modules>
+        <!-- MD-SAL bundles -->
+        <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>
@@ -38,6 +45,7 @@
     <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>
@@ -46,27 +54,43 @@
     <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</module>
-    <module>../../usermanager</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>
 
     <!-- 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>
+
     <!--  Web bundles -->
     <module>../../web/root</module>
     <module>../../web/flows</module>
@@ -74,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>
@@ -83,6 +114,8 @@
     <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>
@@ -97,7 +130,13 @@
     <module>../../samples/simpleforwarding</module>
     <module>../../samples/loadbalancer</module>
     <module>../../samples/northbound/loadbalancer</module>
+
+    <!-- Parents -->
     <module>../../commons/concepts</module>
+    <module>../../commons/integrationtest</module>
+    <module>../../commons/checkstyle</module>
+    <module>../../commons/opendaylight</module>
+    <module>../../commons/parent</module>
   </modules>
 
   <build>
@@ -117,28 +156,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>
@@ -154,7 +173,7 @@
               <descriptors>
                 <descriptor>src/assemble/bin.xml</descriptor>
               </descriptors>
-              <finalName>${project.artifactId}-${build.suffix}</finalName>
+              <finalName>${project.artifactId}</finalName>
             </configuration>
           </execution>
         </executions>