Remove target-ide override

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

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 12facdb4a368cf02a5c278cff13e0d0e257dea10..a794385218a13432cd846736b1b5e396ad24b7d4 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -153,7 +153,7 @@
     <web.version>0.7.0-SNAPSHOT</web.version>
     <yang-ext.version>2013.09.07.9-SNAPSHOT</yang-ext.version>
     <yang-jmx-generator.version>1.3.0-SNAPSHOT</yang-jmx-generator.version>
-    <yangtools.version>0.9.0-SNAPSHOT</yangtools.version>
+    <yangtools.version>1.0.0-SNAPSHOT</yangtools.version>
     <jmh.version>0.9.7</jmh.version>
   </properties>
 
@@ -223,12 +223,6 @@
         <version>${codahale.metrics.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>com.lmax</groupId>
-        <artifactId>disruptor</artifactId>
-        <version>3.3.0</version>
-      </dependency>
-
       <!-- 3rd party dependencies needed by config-->
       <dependency>
         <groupId>org.apache.maven</groupId>
@@ -1119,7 +1113,7 @@
             <dependency>
               <groupId>org.opendaylight.mdsal</groupId>
               <artifactId>maven-sal-api-gen-plugin</artifactId>
-              <version>0.9.0-SNAPSHOT</version>
+              <version>${mdsal.model.version}</version>
               <type>jar</type>
             </dependency>
             <dependency>
@@ -1351,18 +1345,6 @@
   </distributionManagement>
 
   <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>