Merge "Bring some reliability in the eclipse and maven mixed builds"

diff --git a/.gitignore b/.gitignore
index 1f0563ac05660ff15bbde44d5b2e481c8b87a884..bb3e26faf5ee24f0f3080cbd311a87c55f7430b2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ repository
 workspace
 *~
 target
+target-ide
 .classpath
 .project
 .settings

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 2a818067cec223101b907c90a79d4a4f84cea622..8feb1600b5f9c84e444f3a060d84ae418e1015f9 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -781,6 +781,18 @@
   </pluginRepositories>
 
   <profiles>
+    <profile>
+      <id>IDE</id>
+      <activation>
+        <property>
+          <name>m2e.version</name>
+        </property>
+      </activation>
+      <build>
+        <!-- Put the IDE's build output in a folder other than target, so that IDE builds don't interact with Maven builds -->
+        <directory>target-ide</directory>
+      </build>
+    </profile>
     <profile>
       <id>viewbuild</id>
       <activation>
@@ -1226,7 +1238,4 @@
       </plugins>
     </pluginManagement>
   </build>
-
-  <dependencies>
-  </dependencies>
 </project>

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index 1ff7f2dc302e1218f8a494cdb0b4f0c9811a7548..99ce4933b5483a8f2eaccd0c09332ea63b1d2ae8 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -64,6 +64,18 @@
                 <module>test</module>
             </modules>
         </profile>
+        <profile>
+          <id>IDE</id>
+          <activation>
+            <property>
+              <name>m2e.version</name>
+            </property>
+          </activation>
+          <build>
+            <!-- Put the IDE's build output in a folder other than target, so that IDE builds don't interact with Maven builds -->
+            <directory>target-ide</directory>
+          </build>
+        </profile>
     </profiles>
 
     <properties>