From: Alessandro Boch <aboch@cisco.com>
Date: Tue, 25 Feb 2014 23:51:11 +0000 (+0000)
Subject: Merge "Add reverse() method in Edge and Path classes"
X-Git-Tag: autorelease-tag-v20140601202136_82eb3f9~377
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=2c146f582dee58e36dc22505b4c6bedb4641342f;hp=-c

Merge "Add reverse() method in Edge and Path classes"
---

2c146f582dee58e36dc22505b4c6bedb4641342f
diff --combined opendaylight/commons/opendaylight/pom.xml
index 43e254c88d,6e178ca2c9..acda40035f
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@@ -84,7 -84,7 +84,7 @@@
      <containermanager.it.version>0.5.2-SNAPSHOT</containermanager.it.version>
      <switchmanager.api.version>0.7.1-SNAPSHOT</switchmanager.api.version>
      <connectionmanager.version>0.1.2-SNAPSHOT</connectionmanager.version>
-     <sal.version>0.7.1-SNAPSHOT</sal.version>
+     <sal.version>0.8.1-SNAPSHOT</sal.version>
      <sal.networkconfiguration.version>0.0.3-SNAPSHOT</sal.networkconfiguration.version>
      <sal.connection.version>0.1.2-SNAPSHOT</sal.connection.version>
      <networkconfig.bridgedomain.northbound.version>0.0.3-SNAPSHOT</networkconfig.bridgedomain.northbound.version>
@@@ -113,8 -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>
@@@ -1166,11 -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>
@@@ -1449,6 -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>
@@@ -1988,21 -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 --combined opendaylight/md-sal/pom.xml
index 562db98301,e4190fbd7f..6cc06ba705
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@@ -109,7 -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>
@@@ -120,7 -120,7 +120,7 @@@
          <sonar.branch>${user.name}-private-view</sonar.branch>
          <sonar.language>java</sonar.language>
          <exam.version>3.0.0</exam.version>
-         <sal.version>0.7.1-SNAPSHOT</sal.version>
+         <sal.version>0.8.1-SNAPSHOT</sal.version>
      </properties>
  
      <dependencyManagement>
@@@ -170,7 -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>