From: Tony Tkacik <ttkacik@cisco.com>
Date: Tue, 25 Feb 2014 11:54:25 +0000 (+0000)
Subject: Merge changes I1b834def,Iece78be2
X-Git-Tag: autorelease-tag-v20140601202136_82eb3f9~390
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=1a3336307cfe9d4d7cf3ee3b44dd1664c35b1114;hp=d669645b1a5b421a40e49ff8fb531972783156d3

Merge changes I1b834def,Iece78be2

* changes:
  Removed duplicated dependency declaration: ietf-netconf-monitoring,ietf-netconf-monitoring-extension from commons.opendaylight.
  Move xtend dependency definition from md-sal pom to commons.opendaylight
---

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 43b69e4d87..43e254c88d 100644
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -113,6 +113,8 @@
     <java.version.target>1.7</java.version.target>
     <!-- enforcer version -->
     <enforcer.version>1.3.1</enforcer.version>
+    <xtend.version>2.4.3</xtend.version>
+    <xtend.dstdir>${project.build.directory}/generated-sources/xtend-gen</xtend.dstdir>
   </properties>
 
   <dependencyManagement>
@@ -1164,6 +1166,11 @@
       </dependency>
 
         <!-- md-sal -->
+        <dependency>
+            <groupId>org.eclipse.xtend</groupId>
+            <artifactId>org.eclipse.xtend.lib</artifactId>
+            <version>${xtend.version}</version>
+        </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>sal-common</artifactId>
@@ -1442,16 +1449,6 @@
           <artifactId>config-persister-impl</artifactId>
           <version>${netconf.version}</version>
         </dependency>
-        <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>ietf-netconf-monitoring</artifactId>
-          <version>${netconf.version}</version>
-        </dependency>
-        <dependency>
-          <groupId>${project.groupId}</groupId>
-          <artifactId>ietf-netconf-monitoring-extension</artifactId>
-          <version>${netconf.version}</version>
-        </dependency>
 
          <!-- threadpool -->
           <dependency>
@@ -1991,6 +1988,21 @@
             <testTarget>${java.version.target}</testTarget>
           </configuration>
        </plugin>
+          <plugin>
+              <groupId>org.eclipse.xtend</groupId>
+              <artifactId>xtend-maven-plugin</artifactId>
+              <version>${xtend.version}</version>
+              <executions>
+                  <execution>
+                      <goals>
+                          <goal>compile</goal>
+                      </goals>
+                      <configuration>
+                          <outputDirectory>${xtend.dstdir}</outputDirectory>
+                      </configuration>
+                  </execution>
+              </executions>
+          </plugin>
       </plugins>
     </pluginManagement>
   </build>
diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index f900c0b18c..562db98301 100644
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -109,7 +109,7 @@
 
         <!-- Dependency Versions -->
         <mockito.version>1.9.5</mockito.version>
-        <xtend.version>2.4.3</xtend.version>
+
 
         <!-- Sonar properties using jacoco to retrieve integration test results -->
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -170,11 +170,7 @@
                 <artifactId>slf4j-api</artifactId>
                 <version>${slf4j.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.eclipse.xtend</groupId>
-                <artifactId>org.eclipse.xtend.lib</artifactId>
-                <version>${xtend.version}</version>
-            </dependency>
+
             <dependency>
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.core</artifactId>