X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fdistribution%2Fopendaylight%2Fpom.xml;h=92e91f49e88ab21c955dc5b805dcec536603bfec;hb=d78e985bc4ed590407c8c7800ba796d5ea55aa6c;hp=427d63f49d1238ae79767ebd9671455109c0c25c;hpb=6f4513207969e32b59dd456f43dfa9137e04d563;p=controller.git

diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml
index 427d63f49d..92e91f49e8 100644
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@ -17,15 +17,6 @@
     <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>
@@ -37,6 +28,7 @@
       <modules>
         <!-- MD-SAL bundles -->
         <module>../../md-sal</module>
+        <module>../../config</module>
       </modules>
     </profile>
   </profiles>
@@ -75,17 +67,19 @@
     <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>
 
-    <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>
@@ -139,10 +133,14 @@
 
     <!-- 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>
+
+
+    <module>../sanitytest</module>
   </modules>
 
   <build>
@@ -162,28 +160,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>
@@ -199,11 +177,28 @@
               <descriptors>
                 <descriptor>src/assemble/bin.xml</descriptor>
               </descriptors>
-              <finalName>${project.artifactId}-${build.suffix}</finalName>
+              <finalName>${project.artifactId}</finalName>
             </configuration>
           </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>