Merge "Remove dependency on Exificient due to licensing incompatibility" jenkins-controller-bulk-release-prepare-only-2-4
authorGiovanni Meo <gmeo@cisco.com>
Fri, 24 Jan 2014 15:50:47 +0000 (15:50 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 24 Jan 2014 15:50:47 +0000 (15:50 +0000)
1  2 
opendaylight/commons/opendaylight/pom.xml

index 406868c32bd7f6c89d8b37eef14369280e6a5750,eb7800fd5bbd9b2f5d9451f6d591cf4e62a7586a..0f4577bbf6ea5a7142f84e335829170190f6a31b
@@@ -56,6 -56,7 +56,6 @@@
      <jolokia.version>1.1.4</jolokia.version>
      <checkstyle.version>2.10</checkstyle.version>
      <testvm.argLine>-Xmx1024m -XX:MaxPermSize=256m</testvm.argLine>
 -    <yang.version>0.5.9-SNAPSHOT</yang.version>
      <guava.version>14.0.1</guava.version>
      <osgi.core.version>5.0.0</osgi.core.version>
      <ietf-inet-types.version>2010.09.24.2-SNAPSHOT</ietf-inet-types.version>
      <java.version.target>1.7</java.version.target>
      <!-- enforcer version -->
      <enforcer.version>1.3.1</enforcer.version>
-     <exi.version>0.9.2-SNAPSHOT</exi.version>
    </properties>
  
    <dependencyManagement>
          <artifactId>org.openflow.openflowj</artifactId>
          <version>1.0.2</version>
        </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller.thirdparty</groupId>
-         <artifactId>exificient</artifactId>
-         <version>${exi.version}</version>
-       </dependency>
        <dependency>
          <groupId>org.opendaylight.controller.thirdparty</groupId>
          <artifactId>com.sun.jersey.jersey-servlet</artifactId>
        <dependency>
          <groupId>org.opendaylight.yangtools</groupId>
          <artifactId>mockito-configuration</artifactId>
 -        <version>0.6.0-SNAPSHOT</version>
 +        <version>${yangtools.version}</version>
          <scope>test</scope>
        </dependency>
        <!-- yang model dependencies -->