Use version 0.6.0-SNAPSHOT of yangtools everywhere in controller.

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

diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml
index 5acdec834da3f56d66c9954e5bd4c47deb83fedf..17d484a88cbd0c8fa38550073aef33ce80f85481 100644 (file)
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@ -168,10 +168,14 @@
           <artifactId>concepts</artifactId>
           <version>${concepts.version}</version>
         </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>protocol-framework</artifactId>
+        </dependency>
         <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>concepts</artifactId>
-          <version>0.1.1-SNAPSHOT</version>
+          <version>${yangtools.version}</version>
         </dependency>
 
         <dependency>
@@ -414,27 +418,27 @@
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>binding-generator-spi</artifactId>
-          <version>${yangtools.binding.version}</version>
+          <version>${yangtools.version}</version>
          </dependency>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>binding-generator-api</artifactId>
-          <version>${yangtools.binding.version}</version>
+          <version>${yangtools.version}</version>
          </dependency>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>binding-generator-impl</artifactId>
-          <version>${yangtools.binding.version}</version>
+          <version>${yangtools.version}</version>
          </dependency>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>binding-generator-util</artifactId>
-          <version>${yangtools.binding.version}</version>
+          <version>${yangtools.version}</version>
          </dependency>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>binding-model-api</artifactId>
-          <version>${yangtools.binding.version}</version>
+          <version>${yangtools.version}</version>
          </dependency>
          <dependency>
            <groupId>commons-lang</groupId>
@@ -478,7 +482,6 @@
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>yang-data-impl</artifactId>
-          <version>0.5.9-SNAPSHOT</version>
          </dependency>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
@@ -1364,20 +1367,6 @@
      <artifactId>opendaylight-l2-types</artifactId>
     </dependency>
 
-    <!-- bgppcep dependencies -->
-    <dependency>
-     <groupId>org.opendaylight.bgpcep</groupId>
-     <artifactId>concepts</artifactId>
-    </dependency>
-    <dependency>
-     <groupId>org.opendaylight.bgpcep</groupId>
-     <artifactId>util</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.bgpcep</groupId>
-      <artifactId>framework</artifactId>
-    </dependency>
-
     <!--Netty-->
     <dependency>
       <groupId>io.netty</groupId>
@@ -1462,6 +1451,16 @@
           </execution>
         </executions>
       </plugin>
+
+        <!--Make checkstyle ignore initial xml configuration files by overriding its configuration from parent-->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>${checkstyle.version}</version>
+        <configuration>
+            <excludes>**\/target\/,**\/bin\/,**\/target-ide\/,**\/configuration\/initial\/</excludes>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>