Move integration tests to top-level directory

[lispflowmapping.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 6c1612a091da258972eacf313db493e32d837a50..a7eadb27b951ba3a2795d8a7b93a25a2c208c80d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,10 +1,11 @@
 <?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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 <?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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>

+

   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>lispflowmapping-commons</artifactId>
   <parent>
     <groupId>org.opendaylight.lispflowmapping</groupId>
     <artifactId>lispflowmapping-commons</artifactId>

-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>

     <relativePath>commons/parent</relativePath>
   </parent>
 
     <relativePath>commons/parent</relativePath>
   </parent>
 


@@ -13,123 +14,36 @@
   <!-- Used by Sonar to set project name -->
   <name>lispflowmapping</name>
 
   <!-- Used by Sonar to set project name -->
   <name>lispflowmapping</name>
 

+  <prerequisites>
+    <maven>3.1.1</maven>
+  </prerequisites>
+

   <modules>
     <module>commons/parent</module>
     <module>commons/build_tools</module>
     <module>commons/unittest_tools</module>
   <modules>
     <module>commons/parent</module>
     <module>commons/build_tools</module>
     <module>commons/unittest_tools</module>

+    <module>artifacts</module>

     <module>mappingservice</module>
     <module>mappingservice</module>

-    <module>distribution</module>
+    <module>ui</module>

     <module>features</module>
     <module>distribution-karaf</module>
     <module>features</module>
     <module>distribution-karaf</module>

+    <module>integrationtest</module>

   </modules>
 
   <build>
   </modules>
 
   <build>

-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <!-- we are overriding the default version of this plugin here... not sure why. -->
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.8</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>

     <plugins>
     <plugins>

-      <plugin>
-        <!-- In this project we want to automatically sort all poms, thus we
+<!--       <plugin>
+        In this project we want to automatically sort all poms, thus we

              add the invocation of this plugin to the root parent. Configuration is in
              add the invocation of this plugin to the root parent. Configuration is in

-             the ODL parent. -->
+             odlparent.

         <groupId>com.google.code.sortpom</groupId>
         <artifactId>maven-sortpom-plugin</artifactId>
         <groupId>com.google.code.sortpom</groupId>
         <artifactId>maven-sortpom-plugin</artifactId>

-      </plugin>
+      </plugin> -->

       <plugin>
       <plugin>

-        <!-- Check for coding style violations.  Configuration in the parent pom. -->
+        <!-- Check for coding style violations.  Configuration in odlparent. -->

         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
       </plugin>
     </plugins>
   </build>

-
-  <repositories>
-    <!-- NOTE: The repositories and plugin repositories sections need fully
-         qualified URLs to the nexus because it has to download the parent. There
-         seems to be a bug where you need to parent before any properties can be substituted
-         in. You can override this URL by using the "mirror" section of your settings.xml
-         configuration file. See http://maven.apache.org/guides/mini/guide-mirror-settings.html -->
-    <!-- OpenDayLight Repo Mirror -->
-    <repository>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <id>opendaylight-mirror</id>
-      <name>opendaylight-mirror</name>
-      <url>http://nexus.opendaylight.org/content/groups/public/</url>
-    </repository>
-    <!-- OpenDayLight Snapshot artifact -->
-    <repository>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <id>opendaylight-snapshot</id>
-      <name>opendaylight-snapshot</name>
-      <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-    </repository>
-    <repository>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <id>opendaylight-snapshot-release</id>
-      <name>opendaylight-snapshot-release</name>
-      <url>http://nexus.opendaylight.org/content/repositories/opendaylight.release/</url>
-    </repository>
-    <repository>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </snapshots>
-      <id>maven-restlet</id>
-      <name>Public online Restlet repository</name>
-      <url>http://maven.restlet.org</url>
-    </repository>
-  </repositories>
-
-  <pluginRepositories>
-    <!-- see above note about mirrors and hard coded URLs. -->
-    <!-- OpenDayLight Repo Mirror -->
-    <pluginRepository>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <id>opendaylight-mirror</id>
-      <name>opendaylight-mirror</name>
-      <url>http://nexus.opendaylight.org/content/groups/public/</url>
-    </pluginRepository>
-    <!-- OpenDayLight Snapshot artifact -->
-    <pluginRepository>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <id>opendaylight-snapshot</id>
-      <name>opendaylight-snapshot</name>
-      <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-    </pluginRepository>
-  </pluginRepositories>
-

 </project>
 </project>