X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fyang-test%2Fpom.xml;h=d5bdd1d99eeb924f3671c831824b3a783b98b3c6;hp=18daa44567028afee2dae44fb252084e3acf4670;hb=fac268302e4261bb8b42143476692563cbdf149b;hpb=41f4bafacfb8aed5949bf102934010afe7a3c350;ds=sidebyside

diff --git a/opendaylight/config/yang-test/pom.xml b/opendaylight/config/yang-test/pom.xml
index 18daa44567..d5bdd1d99e 100644
--- a/opendaylight/config/yang-test/pom.xml
+++ b/opendaylight/config/yang-test/pom.xml
@@ -12,7 +12,6 @@
   <artifactId>yang-test</artifactId>
   <packaging>bundle</packaging>
   <name>${project.artifactId}</name>
-
   <description>Artifact that contains only generated code from yang files. Suitable for testing.</description>
 
   <dependencies>
@@ -87,73 +86,49 @@
     </pluginManagement>
 
     <plugins>
-
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions></instructions>
-        </configuration>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>${checkstyle.version}</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>checkstyle</artifactId>
+            <version>${odl.checkstyle.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-license</artifactId>
+            <version>0.2.0-SNAPSHOT</version>
+          </dependency>
+        </dependencies>
+        <executions>
+          <execution>
+            <id>check-license</id>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <phase>process-sources</phase>
+            <configuration>
+              <configLocation>check-license.xml</configLocation>
+              <includeResources>false</includeResources>
+              <includeTestResources>false</includeTestResources>
+              <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+              <excludes>
+                org/opendaylight/yang/gen/**,
+                **/protobuff/messages/**,
+                **/thrift/gen/*.java,
+                **/config/yang/test/**
+              </excludes>
+              <failsOnError>false</failsOnError>
+              <consoleOutput>true</consoleOutput>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
-
-
-        <plugin>
-          <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>${checkstyle.version}</version>
-          <dependencies>
-            <dependency>
-              <groupId>org.opendaylight.odlparent</groupId>
-              <artifactId>checkstyle</artifactId>
-              <version>${odl.checkstyle.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>org.opendaylight.odlparent</groupId>
-              <artifactId>odl-license</artifactId>
-              <version>0.2.0-SNAPSHOT</version>
-            </dependency>
-          </dependencies>
-          <configuration>
-            <configLocation>odl_checks.xml</configLocation>
-            <!-- <sourceDirectory> is needed so that checkstyle ignores the
-                 generated sources directory -->
-            <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-            <excludes>
-              org/opendaylight/yang/gen/**,
-              **/protobuff/messages/**,
-              **/thrift/gen/*.java
-            </excludes>
-            <failsOnError>false</failsOnError>
-            <consoleOutput>true</consoleOutput>
-          </configuration>
-          <executions>
-            <execution>
-              <id>check-license</id>
-              <goals>
-                <goal>check</goal>
-              </goals>
-              <phase>process-sources</phase>
-              <configuration>
-                <configLocation>check-license.xml</configLocation>
-                <includeResources>false</includeResources>
-                <includeTestResources>false</includeTestResources>
-                <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-                <excludes>
-                  org/opendaylight/yang/gen/**,
-                  **/protobuff/messages/**,
-                  **/thrift/gen/*.java,
-                  **/config/yang/test/**
-                </excludes>
-                <failsOnError>false</failsOnError>
-                <consoleOutput>true</consoleOutput>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-
       <plugin>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>yang-test-plugin</artifactId>
-        <version>${config.version}</version>
+        <version>0.6.0-SNAPSHOT</version>
         <executions>
           <execution>
             <goals>
@@ -164,10 +139,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yang-maven-plugin</artifactId>
-      </plugin>
     </plugins>
   </build>
 </project>